From c362d55b4aa1079410746ab8c32ad46da2978d07 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Mon, 6 Sep 2021 15:32:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=91=98=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=B4=BE=E5=B7=A5=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E4=B8=8B=E8=BE=BE=E5=92=8C=E5=BC=80=E5=A7=8B=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meapi/src/main/resources/mapper/SfcMapper.xml | 2 +- .../mesnac/production/service/impl/PodTemplateServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml index 744632cf..e736a156 100644 --- a/meapi/src/main/resources/mapper/SfcMapper.xml +++ b/meapi/src/main/resources/mapper/SfcMapper.xml @@ -679,7 +679,7 @@ JOIN SFC_ROUTING SR ON SR.SFC_BO=S.HANDLE JOIN SFC_ROUTER SR2 ON SR.HANDLE =SR2.SFC_ROUTING_BO AND SR2.IN_USE = 'true' LEFT JOIN SFC_STEP SS ON SR2.HANDLE =SS.SFC_ROUTER_BO AND (SS.QTY_IN_QUEUE>0 or SS.QTY_IN_WORK>0) - WHERE S.SITE=#{ew.entity.site} AND ZSD.RESRCE=#{ew.entity.resrce} AND ZSD.DISPATCH_STATUS!='CANCEL' AND ZSD.DISPATCH_STATUS!='COMPLETE' + WHERE S.SITE=#{ew.entity.site} AND ZSD.RESRCE=#{ew.entity.resrce} AND (ZSD.DISPATCH_STATUS='RELEASE' AND ZSD.DISPATCH_STATUS='START') AND S.STATUS_BO IN ('StatusBO:'||#{ew.entity.site}||',401','StatusBO:'||#{ew.entity.site}||',402','StatusBO:'||#{ew.entity.site}||',403','StatusBO:'||#{ew.entity.site}||',404') AND zprt.STATUS='FINISH' AND ZPRT."RESULT"='OK' diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java index 161371c8..4a77a180 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java @@ -137,6 +137,9 @@ public class PodTemplateServiceImpl implements PodTemplateService { if (StringUtil.isBlank(sfcDispatchStatus)) { throw new BaseException("产品条码与当前设备工序确认的派工单不匹配"); } + if (!sfcDispatchStatus.equals(DispatchStatusEnum.RELEASE.getCode())&&!sfcDispatchStatus.equals(DispatchStatusEnum.START.getCode())) { + throw new BaseException("派工单状态不可用"); + } //构造前台所需要的数据 Map resultMap = sfcCrossMapper.querySfcData(site, locale, sfcDto);