From f599e63dde77878527cd7e384da809f23a04e40a Mon Sep 17 00:00:00 2001
From: yangwl <1726150332@qq.com>
Date: Fri, 10 Dec 2021 10:55:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E8=B4=9F=E8=8D=B7=E7=8E=87=E6=8A=A5=E8=A1=A8=E3=80=81=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B=E8=B4=9F=E8=8D=B7=E7=8E=87=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/resources/mapper/ReportDataMapper.xml       | 6 ++++--
 .../dispatch/service/impl/ShopOrderReleaseServiceImpl.java  | 4 ----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml
index bbc10a4b..8a823871 100644
--- a/common/src/main/resources/mapper/ReportDataMapper.xml
+++ b/common/src/main/resources/mapper/ReportDataMapper.xml
@@ -84,7 +84,8 @@
         LEFT JOIN Z_REPORT_DATE_TIME ZRDT  ON ZRDT.SITE = R.SITE
         LEFT JOIN RESOURCE_TYPE_RESOURCE RTR ON  RTR.RESOURCE_BO = R.HANDLE
         LEFT JOIN RESOURCE_TYPE RT ON RT.HANDLE = RTR.RESOURCE_TYPE_BO
-        WHERE R.SITE = #{site}
+        LEFT JOIN STATUS STU ON R.STATUS_BO=STU.HANDLE
+        WHERE R.SITE = #{site} AND STU.STATUS='301'
         <if test="center != null and center != ''" >
             AND WCA.WORK_CENTER = #{center}
         </if>
@@ -204,7 +205,8 @@
         LEFT JOIN Z_REPORT_DATE_TIME ZRDT  ON ZRDT.SITE = R.SITE
         LEFT JOIN RESOURCE_TYPE_RESOURCE RTR ON  RTR.RESOURCE_BO = R.HANDLE
         LEFT JOIN RESOURCE_TYPE RT ON RT.HANDLE = RTR.RESOURCE_TYPE_BO
-        WHERE R.SITE = #{site}
+        LEFT JOIN STATUS STU ON R.STATUS_BO=STU.HANDLE
+        WHERE R.SITE = #{site} AND STU.STATUS='301'
         <if test="workCenter != null and workCenter != ''" >
             AND WCB.WORK_CENTER = #{workCenter}
         </if>
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java
index 3f07cda5..5a1c20eb 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java
@@ -224,10 +224,6 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
 
             List<ReleasedSfc> sfcList = response.getReleasedSfcList();
             if (sfcList == null || sfcList.size() <= 0) {
-//                flag =false;
-//                message.append(seq++ % 3 == 0 ? "\n" : "|   |");
-//                message.append("工单下达失败：获取生产批次清单为空");
-//                continue;
                 throw new BaseException("工单下达失败：获取生产批次清单为空");
             }
 

From 5a01c90837b14cdb22cf292063eefe633b4ab557 Mon Sep 17 00:00:00 2001
From: yangwl <1726150332@qq.com>
Date: Fri, 10 Dec 2021 11:01:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=BD=A6=E9=97=B4=E6=9C=80=E6=97=A9=E3=80=81?=
 =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=9C=80=E6=99=9A=E6=97=B6=E9=97=B4=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8f6bd8a4..f26d04a7 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
@@ -556,7 +556,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
                     message.append("派工单[" + dispatchNo + "]的资源没有维护，不允许发布");
                     continue;
                 }
-                if (sfcDispatchDto.getPlannedStartDate() == null || sfcDispatchDto.getPlannedCompDate() == null || sfcDispatchDto.getEarliestStartDate() == null || sfcDispatchDto.getLatestEndDate() == null) {
+                if (sfcDispatchDto.getPlannedStartDate() == null || sfcDispatchDto.getPlannedCompDate() == null) {
                     flag = false;
                     message.append(seq++%3 == 0 ? "\n" : "|   |");
                     message.append("派工单[" + dispatchNo + "]的计划开始或完成时间没维护，不允许发布");