From 0443ecfd60eb05cabe354f58d2a3cdd4cde46ab5 Mon Sep 17 00:00:00 2001
From: Leon <3066758958@qq.com>
Date: Tue, 17 Aug 2021 16:47:17 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dispatch/src/main/resources/mapper/SfcDispatchMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
index 70447aa6..8f5b6437 100644
--- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
+++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
@@ -681,7 +681,7 @@
                     CASE WHEN IM.LOT_SIZE = 1 THEN N'是' ELSE N'否' END IS_MAJOR, CASE WHEN SD.TURN_OPERATION = 'true' THEN N'是' ELSE N'否' END TURN_OPERATION, SD.BLANKING_SIZE,
                     WR.WORK_CENTER RESOURCE_WORK_CENTER
             FROM Z_SFC_DISPATCH SD
-            INNER JOIN RESRCE RS ON SD.SITE = RS.SITE AND SD.RESRCE = RS.RESRCE
+            LEFT JOIN RESRCE RS ON SD.SITE = RS.SITE AND SD.RESRCE = RS.RESRCE
             INNER JOIN SHOP_ORDER SO ON SO.SITE = SD.SITE AND SO.SHOP_ORDER = SD.SHOP_ORDER
             LEFT JOIN CUSTOM_FIELDS C1 ON C1.HANDLE = SO.HANDLE AND C1."ATTRIBUTE" = 'WORK_ORDER'
             LEFT JOIN CUSTOM_FIELDS C2 ON C2.HANDLE = SO.HANDLE AND C2."ATTRIBUTE" = 'ITEM_NUMBER'

From dd01cb8dda1ddc3a0c1256114ff67610a496a6cc Mon Sep 17 00:00:00 2001
From: Leon <3066758958@qq.com>
Date: Tue, 17 Aug 2021 18:59:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dispatch/service/impl/SfcDispatchServiceImpl.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
index e2217a51..61e9b61c 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
@@ -397,8 +397,10 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
                 }
 
                 //时间
-                sfcDispatchDto.setEarliestStartDate(sfcDispatchDto.getPlannedStartDate());
-                sfcDispatchDto.setLatestEndDate(sfcDispatchDto.getPlannedCompDate());
+                if (Constants.USER_GROUP_ZJH.equals(sfcDispatchDto.getRole())) {
+                    sfcDispatchDto.setEarliestStartDate(sfcDispatchDto.getPlannedStartDate());
+                    sfcDispatchDto.setLatestEndDate(sfcDispatchDto.getPlannedCompDate());
+                }
             }
 
             //派工导入

From 50d5fd5f306a9ca299012ffff0c57878639249d9 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 17 Aug 2021 19:07:48 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ResourceRepairTaskMapper.xml       | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml
index a46a6686..b2f3482e 100644
--- a/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml
+++ b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml
@@ -924,21 +924,29 @@
     </select>
         <!--根据维修任务HANDLE获取维修任务详细数据-->
     <select id="findResourceRepairTaskByHandleAndSite" resultType="com.foreverwin.mesnac.equip.model.ResourceRepairTask">
-        SELECT RRT.*,R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO,
-        NCT.DESCRIPTION AS NC_CODE_DESCRIPTION,
-        WCMA.WORK_CENTER_BO AS WORK_CENTER_BO,WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION
+        SELECT DISTINCT  RRT.*,R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO,
+                        WCMA.WORK_CENTER_BO AS WORK_CENTER_BO,WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION
         FROM
-        WIP.Z_RESOURCE_REPAIR_TASK RRT
-        LEFT JOIN WIP.RESRCE R ON R.RESRCE = RRT.RESOURCE_NO AND R.SITE = RRT.SITE
-        LEFT JOIN WIP.NC_CODE NC ON NC.NC_CODE = RRT.NC_CODE_NO AND NC.SITE = RRT.SITE
-        LEFT JOIN WIP.NC_CODE_T NCT ON NCT.NC_CODE_BO = NC.HANDLE
-        LEFT JOIN WIP.WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
-        LEFT JOIN WIP.WORK_CENTER_MEMBER WCMA ON WCMA.WORK_CENTER_OR_RESOURCE_GBO = WCM.WORK_CENTER_BO
-        LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCMA.WORK_CENTER_BO
-        INNER JOIN WIP.RESOURCE_TYPE_RESOURCE RTR ON RTR.RESOURCE_BO = R.HANDLE
+            WIP.Z_RESOURCE_REPAIR_TASK RRT
+                LEFT JOIN WIP.RESRCE R ON R.RESRCE = RRT.RESOURCE_NO AND R.SITE = RRT.SITE
+                LEFT JOIN WIP.WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
+                LEFT JOIN WIP.WORK_CENTER_MEMBER WCMA ON WCMA.WORK_CENTER_OR_RESOURCE_GBO = WCM.WORK_CENTER_BO
+                LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCMA.WORK_CENTER_BO
+                INNER JOIN WIP.RESOURCE_TYPE_RESOURCE RTR ON RTR.RESOURCE_BO = R.HANDLE
         WHERE RRT.SITE = #{site} AND RRT.HANDLE = #{handle}
     </select>
-
+   <!-- SELECT RRT.*,R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO,
+    NCT.DESCRIPTION AS NC_CODE_DESCRIPTION,
+    WCMA.WORK_CENTER_BO AS WORK_CENTER_BO,WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION
+    FROM WIP.Z_RESOURCE_REPAIR_TASK RRT
+    LEFT JOIN WIP.RESRCE R ON R.RESRCE = RRT.RESOURCE_NO AND R.SITE = RRT.SITE
+    LEFT JOIN WIP.NC_CODE NC ON NC.NC_CODE = RRT.NC_CODE_NO AND NC.SITE = RRT.SITE
+    LEFT JOIN WIP.NC_CODE_T NCT ON NCT.NC_CODE_BO = NC.HANDLE
+    LEFT JOIN WIP.WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
+    LEFT JOIN WIP.WORK_CENTER_MEMBER WCMA ON WCMA.WORK_CENTER_OR_RESOURCE_GBO = WCM.WORK_CENTER_BO
+    LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCMA.WORK_CENTER_BO
+    INNER JOIN WIP.RESOURCE_TYPE_RESOURCE RTR ON RTR.RESOURCE_BO = R.HANDLE
+    WHERE RRT.SITE = #{site} AND RRT.HANDLE = #{handle}-->
     <!--查询日志表中是否已有记录-->
     <select id="selRepairTaskLogByHandle" resultType="java.lang.Integer">
         SELECT COUNT(*) FROM WIP.Z_RESOURCE_REPAIR_TASK_LOG WHERE HANDLE = #{handle}

From fe2004826413dbcddcf8de3155f13b5bda0ec9f1 Mon Sep 17 00:00:00 2001
From: Leon <3066758958@qq.com>
Date: Tue, 17 Aug 2021 20:35:21 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/dispatch/model/CallItem.java        | 18 ++++++++++++++++++
 .../main/resources/mapper/CallItemMapper.xml   |  8 +++++---
 .../resources/mapper/SfcDispatchMapper.xml     |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java
index 2102550d..aebe76ec 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java
@@ -168,6 +168,8 @@ public class CallItem extends Model<CallItem> {
    @TableField(exist = false)
    private String resourceType;
    @TableField(exist = false)
+   private String resourceDescription;
+   @TableField(exist = false)
    private String blankingSize;
    @TableField(exist = false)
    private String operationDescription;
@@ -484,6 +486,22 @@ public class CallItem extends Model<CallItem> {
       this.resourceType = resourceType;
    }
 
+   public String getWorkCenterDescription() {
+      return workCenterDescription;
+   }
+
+   public void setWorkCenterDescription(String workCenterDescription) {
+      this.workCenterDescription = workCenterDescription;
+   }
+
+   public String getResourceDescription() {
+      return resourceDescription;
+   }
+
+   public void setResourceDescription(String resourceDescription) {
+      this.resourceDescription = resourceDescription;
+   }
+
    public String getBlankingSize() {
       return blankingSize;
    }
diff --git a/dispatch/src/main/resources/mapper/CallItemMapper.xml b/dispatch/src/main/resources/mapper/CallItemMapper.xml
index 3139ef12..ace168d0 100644
--- a/dispatch/src/main/resources/mapper/CallItemMapper.xml
+++ b/dispatch/src/main/resources/mapper/CallItemMapper.xml
@@ -41,6 +41,7 @@
         <result column="DISPATCH_QTY" property="dispatchQty" />
         <result column="RESOURCE_TYPE" property="resourceType" />
         <result column="BLANKING_SIZE" property="blankingSize" />
+        <result column="RESOURCE_DESCRIPTION" property="resourceDescription" />
         <result column="OPERATION_DESCRIPTION" property="operationDescription" />
         <result column="PLANNED_START_DATE" property="plannedStartDate" />
         <result column="REMARK" property="remark" />
@@ -881,10 +882,11 @@
     </select>
 
     <select id="finsIssueItemListToResource" resultMap="FullResultMap">
-        SELECT VIP.SITE, VIP.WORK_ORDER, VIP.CALL_TYPE, VIP.ITEM_GROUP, VIP.ITEM_BO, VIP.ITEM, VIP.ITEM_DESCRIPTION, VIP.REQUIRED_QTY, VIP.BLANKING_SIZE, VIP.RESRCE, SIP.SOURCE_RESOURCE
+        SELECT VIP.SITE, VIP.WORK_ORDER, VIP.CALL_TYPE, VIP.ITEM_GROUP, VIP.ITEM_BO, VIP.ITEM, VIP.ITEM_DESCRIPTION, VIP.REQUIRED_QTY, VIP.BLANKING_SIZE, VIP.RESRCE, VIP.RESOURCE_DESCRIPTION, SIP.SOURCE_RESOURCE
         FROM (
-            SELECT L.SITE, CF.VALUE WORK_ORDER, L.CALL_TYPE, IG.ITEM_GROUP, CP.HANDLE ITEM_BO, CP.ITEM, CT.DESCRIPTION ITEM_DESCRIPTION, SUM(L.REQUIRED_QTY)-SUM(NVL(L.ISSUE_QTY,0)) REQUIRED_QTY, W.BLANKING_SIZE, W.RESRCE
+            SELECT L.SITE, CF.VALUE WORK_ORDER, L.CALL_TYPE, IG.ITEM_GROUP, CP.HANDLE ITEM_BO, CP.ITEM, CT.DESCRIPTION ITEM_DESCRIPTION, SUM(L.REQUIRED_QTY)-SUM(NVL(L.ISSUE_QTY,0)) REQUIRED_QTY, W.BLANKING_SIZE, W.RESRCE, RS.DESCRIPTION RESOURCE_DESCRIPTION
             FROM Z_CALL_ITEM L
+            INNER JOIN RESRCE RS ON L.SITE = RS.SITE AND L.RESRCE = RS.RESRCE
             INNER JOIN Z_SFC_DISPATCH W ON L.SFC_DISPATCH_BO = W.HANDLE
             INNER JOIN ITEM CP ON CP.HANDLE = L.COMPONENT_BO
             LEFT JOIN ITEM_T CT ON CT.ITEM_BO = CP.HANDLE AND CT.LOCALE = 'zh'
@@ -911,7 +913,7 @@
             <if test="requiredToDT != null">
                 AND L.REQUIRED_DATE_TIME &lt;= #{requiredToDT}
             </if>
-            GROUP BY L.SITE, CF.VALUE, L.CALL_TYPE, IG.ITEM_GROUP, CP.HANDLE, CP.ITEM, CT.DESCRIPTION, W.BLANKING_SIZE, W.RESRCE
+            GROUP BY L.SITE, CF.VALUE, L.CALL_TYPE, IG.ITEM_GROUP, CP.HANDLE, CP.ITEM, CT.DESCRIPTION, W.BLANKING_SIZE, W.RESRCE, RS.DESCRIPTION
         ) VIP
         LEFT JOIN (
             SELECT L.SITE, L.ITEM_BO, ZD.RESRCE SOURCE_RESOURCE
diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
index 8f5b6437..277143b9 100644
--- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
+++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
@@ -696,7 +696,7 @@
             LEFT JOIN WORK_CENTER WR ON WR.HANDLE = WCM.WORK_CENTER_BO
             WHERE SD.SITE = #{site}
             <if test="workCenter != null and workCenter != ''">
-                AND SD.WORK_CENTER = #{workCenter}
+                AND SD.OPERATION LIKE #{workCenter}||'%'
             </if>
             <if test="dispatchStatus != null and dispatchStatus != ''">
                 AND SD.DISPATCH_STATUS = #{dispatchStatus}