From 09bd36362de4dfca5b6a67275273a8938777d3cd Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 18 Sep 2025 10:19:22 +0800 Subject: [PATCH] =?UTF-8?q?2025-09-18=20=20=E7=94=9F=E4=BA=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/dto/ProductionRoutingItemDto.java | 4 +- .../impl/ProductionRoutingServiceImpl.java | 2 + .../resources/mapper/oa/SoRoutingMapper.xml | 64 +++++++++---------- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/gaotao/modules/oa/dto/ProductionRoutingItemDto.java b/src/main/java/com/gaotao/modules/oa/dto/ProductionRoutingItemDto.java index 8cc9779..27b93bb 100644 --- a/src/main/java/com/gaotao/modules/oa/dto/ProductionRoutingItemDto.java +++ b/src/main/java/com/gaotao/modules/oa/dto/ProductionRoutingItemDto.java @@ -96,13 +96,13 @@ public class ProductionRoutingItemDto { /** * 计划开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date planStartTime; /** * 计划完成时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date planFinishTime; /** diff --git a/src/main/java/com/gaotao/modules/oa/service/impl/ProductionRoutingServiceImpl.java b/src/main/java/com/gaotao/modules/oa/service/impl/ProductionRoutingServiceImpl.java index ea7c5dd..a976b62 100644 --- a/src/main/java/com/gaotao/modules/oa/service/impl/ProductionRoutingServiceImpl.java +++ b/src/main/java/com/gaotao/modules/oa/service/impl/ProductionRoutingServiceImpl.java @@ -50,6 +50,8 @@ public class ProductionRoutingServiceImpl implements ProductionRoutingService { processUpdateRouting(item); break; case "2": // 关闭（标记删除） + processUpdateRouting(item); + break; case "3": // 删除 processDeleteRouting(item); break; diff --git a/src/main/resources/mapper/oa/SoRoutingMapper.xml b/src/main/resources/mapper/oa/SoRoutingMapper.xml index 9f01622..858d9c5 100644 --- a/src/main/resources/mapper/oa/SoRoutingMapper.xml +++ b/src/main/resources/mapper/oa/SoRoutingMapper.xml @@ -45,36 +45,36 @@ ) VALUES ( #{site}, #{orderNo}, - #{itemNo}, + #{itemNo,jdbcType=DOUBLE}, #{operationDesc}, #{workCenterNo}, - #{machSetupTime}, - #{machRunFactor}, + #{machSetupTime, jdbcType=DOUBLE}, + #{machRunFactor, jdbcType=DOUBLE}, #{factorUnitDb}, #{factorUnit}, - #{qtyRequired}, - #{qtyReported}, - #{qtyApprove}, - #{timeRequired}, - #{timeReported}, - #{efficiency}, + #{qtyRequired, jdbcType=DOUBLE}, + #{qtyReported, jdbcType=DOUBLE}, + #{qtyApprove, jdbcType=DOUBLE}, + #{timeRequired, jdbcType=DOUBLE}, + #{timeReported, jdbcType=DOUBLE}, + #{efficiency, jdbcType=DOUBLE}, #{planStartTime}, #{planFinishTime}, #{barcodeID}, #{remark}, #{partNo}, - #{crewsize}, + #{crewsize, jdbcType=DOUBLE}, #{closedFlag}, #{actionNotes}, - #{qtyScrapt}, + #{qtyScrapt, jdbcType=DOUBLE}, #{outWorkFlag}, #{outWorkPartNo}, - #{qtyOnPR}, - #{qtyOnPO}, - #{preItemNo}, - #{nextItemNo}, + #{qtyOnPR, jdbcType=DOUBLE}, + #{qtyOnPO, jdbcType=DOUBLE}, + #{preItemNo, jdbcType=DOUBLE}, + #{nextItemNo, jdbcType=DOUBLE}, #{scheduledFlag}, - #{qtyScheduled}, + #{qtyScheduled, jdbcType=DOUBLE}, #{sScheduledDate}, #{sResourceID}, #{sScheduledSeqNo}, @@ -87,40 +87,40 @@ UPDATE SORouting SET OperationDesc = #{operationDesc}, WorkCenterNo = #{workCenterNo}, - MachSetupTime = #{machSetupTime}, - MachRunFactor = #{machRunFactor}, + MachSetupTime = #{machSetupTime, jdbcType=DOUBLE}, + MachRunFactor = #{machRunFactor, jdbcType=DOUBLE}, FactorUnit_DB = #{factorUnitDb}, FactorUnit = #{factorUnit}, - QtyRequired = #{qtyRequired}, - QtyReported = #{qtyReported}, - QtyApprove = #{qtyApprove}, - TimeRequired = #{timeRequired}, - TimeReported = #{timeReported}, - Efficiency = #{efficiency}, + QtyRequired = #{qtyRequired, jdbcType=DOUBLE}, + QtyReported = #{qtyReported, jdbcType=DOUBLE}, + QtyApprove = #{qtyApprove, jdbcType=DOUBLE}, + TimeRequired = #{timeRequired, jdbcType=DOUBLE}, + TimeReported = #{timeReported, jdbcType=DOUBLE}, + Efficiency = #{efficiency, jdbcType=DOUBLE}, PlanStartTime = #{planStartTime}, PlanFinishTime = #{planFinishTime}, BarcodeID = #{barcodeID}, Remark = #{remark}, PartNo = #{partNo}, - Crewsize = #{crewsize}, + Crewsize = #{crewsize, jdbcType=DOUBLE}, ClosedFlag = #{closedFlag}, ActionNotes = #{actionNotes}, - QtyScrapt = #{qtyScrapt}, + QtyScrapt = #{qtyScrapt, jdbcType=DOUBLE}, OutWorkFlag = #{outWorkFlag}, OutWorkPartNo = #{outWorkPartNo}, - QtyOnPR = #{qtyOnPR}, - QtyOnPO = #{qtyOnPO}, - PreItemNo = #{preItemNo}, - NextItemNo = #{nextItemNo}, + QtyOnPR = #{qtyOnPR, jdbcType=DOUBLE}, + QtyOnPO = #{qtyOnPO, jdbcType=DOUBLE}, + PreItemNo = #{preItemNo, jdbcType=DOUBLE}, + NextItemNo = #{nextItemNo, jdbcType=DOUBLE}, ScheduledFlag = #{scheduledFlag}, - QtyScheduled = #{qtyScheduled}, + QtyScheduled = #{qtyScheduled, jdbcType=DOUBLE}, S_ScheduledDate = #{sScheduledDate}, S_ResourceID = #{sResourceID}, S_ScheduledSeqNo = #{sScheduledSeqNo}, S_ShiftNo = #{sShiftNo} WHERE Site = #{site} AND OrderNo = #{orderNo} - AND ItemNo = #{itemNo} + AND ItemNo = #{itemNo, jdbcType=DOUBLE}