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/3] =?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 921811fa4fada0aef6601e15153d098f4c6f4ecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Tue, 17 Aug 2021 18:35:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index 57d9454a..ed396bbb 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -959,7 +959,7 @@
                     AND zab.REPORT_FROM = #{abnormalBill.reportFrom}
                 </if>
                 <if test="abnormalBill.workOrder != null and abnormalBill.workOrder != ''">
-                    AND CF.VALUE = #{abnormalBill.workOrder}
+                    AND CF.VALUE LIKE '%${abnormalBill.workOrder}%'
                 </if>
             </if>
         </where>

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 3/3] =?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());
+                }
             }
 
             //派工导入