Merge remote-tracking branch 'origin/master'

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>

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java

@@ -397,9 +397,11 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
                 }
 
                 //时间
+                if (Constants.USER_GROUP_ZJH.equals(sfcDispatchDto.getRole())) {
                     sfcDispatchDto.setEarliestStartDate(sfcDispatchDto.getPlannedStartDate());
                     sfcDispatchDto.setLatestEndDate(sfcDispatchDto.getPlannedCompDate());
                 }
+            }
 
             //派工导入
             if (DispatchStatusEnum.IMPORT.getCode().equals(type)) {

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'