Merge remote-tracking branch 'origin/master'

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>

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 + "]的计划开始或完成时间没维护，不允许发布");

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("工单下达失败：获取生产批次清单为空");
             }