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' AND WCA.WORK_CENTER = #{center} @@ -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' AND WCB.WORK_CENTER = #{workCenter} 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 sfcList = response.getReleasedSfcList(); if (sfcList == null || sfcList.size() <= 0) { -// flag =false; -// message.append(seq++ % 3 == 0 ? "\n" : "| |"); -// message.append("工单下达失败:获取生产批次清单为空"); -// continue; throw new BaseException("工单下达失败:获取生产批次清单为空"); }