From bd3453a776b277cda683d73a44cded17c1973862 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 21 Feb 2023 17:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=A7=E5=89=8D=E5=87=86?=
 =?UTF-8?q?=E5=A4=87=E6=89=93=E5=8D=B0=E8=AE=A2=E5=8D=95=E6=80=BB=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E3=80=81=E5=88=87=E5=89=8A=E6=97=B6=E9=97=B4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A2=9E=E5=8A=A0=E3=80=81=E6=A3=80=E9=AA=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=BB=A3=E5=8A=9E=E4=BA=8B=E9=A1=B9=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProdReadyTaskServiceImpl.java        |  3 +++
 .../resources/mapper/SfcDispatchMapper.xml    | 19 ++++++++++++-------
 .../mesnac/equip/model/ResourceRunTime.java   |  6 +++---
 .../impl/ResourceRunTimeServiceImpl.java      | 10 ++--------
 .../impl/InspectionTaskManageServiceImpl.java |  2 --
 .../mapper/InspectionTaskManageMapper.xml     |  2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
index d4718284..5b0067b5 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
@@ -486,6 +486,9 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
                 labelPrintDto.setTexture(Texturemap.get("TEXTURE").toString());
             }
             labelPrintDto.setDrawingVersion(drawingRevision);
+            /** 订单数量*/
+            labelPrintDto.setSfcQty(new BigDecimal(sfcDispatchDto.getQtyToBuild()));
+            /** SFC数量*/
             labelPrintDto.setQty(new BigDecimal(sfcServiceById.getQty()));
             String workOrder = customFieldsService.getCustomFieldsValue(sfcServiceById.getShopOrderBo(), CustomFieldConstant.SO_WORK_ORDER);
             String itemNumber = customFieldsService.getCustomFieldsValue(sfcServiceById.getShopOrderBo(), CustomFieldConstant.SO_ITEM_NUMBER);
diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
index e9aa1a8c..4f277a62 100644
--- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
+++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
@@ -960,13 +960,18 @@
     </select>
 
     <select id="findSfcDispatchBySfc" resultType="com.foreverwin.mesnac.common.dto.SfcDispatchDto">
-        SELECT *
-        FROM Z_SFC_DISPATCH zsd where site=#{site}
-        <if test="dto.sfc!=null">AND SFC=#{dto.sfc}</if>
-        <if test="dto.stepId!=null">AND STEP_ID=#{dto.stepId}</if>
-        <if test="dto.operation!=null">AND OPERATION=#{dto.operation}</if>
-        <if test="dto.resrce!=null">AND RESRCE=#{dto.resrce}</if>
-        <if test="dto.handle!=null">AND HANDLE=#{dto.handle}</if>
+        SELECT
+        zsd.*,SO.QTY_TO_BUILD
+        FROM
+        Z_SFC_DISPATCH zsd
+        LEFT JOIN SHOP_ORDER SO ON zsd.SHOP_ORDER = SO.SHOP_ORDER
+        WHERE
+        zsd.site = '1000'
+        <if test="dto.sfc!=null">AND zsd.SFC=#{dto.sfc}</if>
+        <if test="dto.stepId!=null">AND zsd.STEP_ID=#{dto.stepId}</if>
+        <if test="dto.operation!=null">AND zsd.OPERATION=#{dto.operation}</if>
+        <if test="dto.resrce!=null">AND zsd.RESRCE=#{dto.resrce}</if>
+        <if test="dto.handle!=null">AND zsd.HANDLE=#{dto.handle}</if>
     </select>
 
 
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRunTime.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRunTime.java
index be7b7a7b..ed5e4902 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRunTime.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRunTime.java
@@ -36,7 +36,7 @@ public class ResourceRunTime extends Model<ResourceRunTime> {
    @TableField("RUN_TIME")
    private Double runTime;
    @TableField("UP_TIME")
-   private LocalDateTime upTime;
+   private Double upTime;
    @TableField("CREATED_USER")
    private String createdUser;
    @TableField("CREATED_DATA_TIME")
@@ -87,11 +87,11 @@ public class ResourceRunTime extends Model<ResourceRunTime> {
       this.runTime = runTime;
    }
 
-   public LocalDateTime getUpTime() {
+   public Double getUpTime() {
       return upTime;
    }
 
-   public void setUpTime(LocalDateTime upTime) {
+   public void setUpTime(Double upTime) {
       this.upTime = upTime;
    }
 
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java
index c3b7065d..b8740810 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java
@@ -81,20 +81,14 @@ public class ResourceRunTimeServiceImpl extends ServiceImpl<ResourceRunTimeMappe
 
             JSONObject jsonObj = (JSONObject) jsonArray.get(i);
             String runTime = jsonObj.getString("RUN_TIME");
+            String upTime = jsonObj.getString("UP_TIME");
             String resource = jsonObj.getString("RESOURCE");
             resourceRunTime.setRunTime(Double.valueOf(runTime));
+            resourceRunTime.setUpTime(Double.valueOf(upTime));
             resourceRunTime.setResrce(resource);
-            String upTime = jsonObj.getString("UP_TIME");
-            if (upTime != null && !upTime.equals("")){
-                LocalDateTime upDate = LocalDateTime.parse(upTime,dataFormatter);
-                resourceRunTime.setUpTime(upDate);
-            }
             resourceRunTime.setHandle(UUID.randomUUID().toString());
             list.add(resourceRunTime);
         }
         resourceRunTimeService.saveBatch(list);
-
     }
-
-
 }
\ No newline at end of file
diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java
index 5d8d55b9..ce3c2374 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java
+++ b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java
@@ -193,8 +193,6 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ
 
                 this.CreateLogisticsTask(request);
 
-
-
             }
 
 
diff --git a/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml b/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml
index 47f1dae3..90e32aba 100644
--- a/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml
+++ b/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml
@@ -42,7 +42,7 @@
     <select id="findInspectionTask" resultMap="BaseResultMap">
         SELECT  B.HANDLE, B.SITE, B.CATEGORY, B.TASK_NO, B.DESCRIPTION, B.STATUS, B.INSPECTION_ITEM_BO, B.WORK_CENTER, B.SHOP_ORDER, B.SFC,B.STEP_ID, B.OPERATION, B.STEP_ID, B.RESRCE, B.RESULT,B.QUESTION_C, B.COMMENTS, B.CREATE_USER, B.CREATED_DATE_TIME, B.MODIFY_USER, B.MODIFIED_DATE_TIME,
                 M.ITEM,M.HANDLE ITEM_BO, Z.DESCRIPTION  ITEM_DESCRIPTION,ZNU.FULL_NAME FULL_NAME,RS.DESCRIPTION RESRCE_DESCRIPTION,
-               O.OPERATION OPERATION,OT.DESCRIPTION OPERATION_DESCRIPTION,S.QTY SFC_QTY,B.COMMENTS COMMENTS,
+               O.OPERATION OPERATION,OT.DESCRIPTION OPERATION_DESCRIPTION,ZSD.DISPATCH_QTY SFC_QTY,B.COMMENTS COMMENTS,
                ZSD.EMPLOYEE_DESCRIPTION DISPATCH_USER,P.SHOP_ORDER,NVL(ZAB.NC_QTY, 0)       NC_QTY,B.SFC_DISPATCH_BO,CF.VALUE MAIN_CHECK_USER,
         CASE WHEN B.STATUS = 'COMPLETE' THEN TO_CHAR(ZNU2.FULL_NAME) ELSE '' END CHECK_USER,
         CASE WHEN B.STATUS = 'COMPLETE' THEN TO_CHAR(B.MODIFIED_DATE_TIME,'yyyy-mm-dd hh24:mi:ss') ELSE '' END CHECK_DATE_TIME