From 50066b2ab5da47a728b66266d75ff53c5263ea40 Mon Sep 17 00:00:00 2001 From: yxw Date: Sat, 14 Sep 2024 09:01:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=81=E7=89=87=E5=8A=9F=E8=83=BD-=E3=80=8B?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E5=B1=95=E7=A4=BA=E6=88=90=E5=93=81=E5=88=97?= =?UTF-8?q?=E8=A1=A8Function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesWorkOrderCutService.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java index b5b5029..633dea6 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java @@ -89,6 +89,11 @@ public class MesWorkOrderCutService extends BaseMesService impl Map> workOrderListMapByPartNo = workOrderList.stream().collect(Collectors.groupingBy(MesWorkOrder::getPartNo)); + MesCutScheme cutScheme = getCutScheme(cutCode, organizeCode); + + if (cutScheme == null) + MesException.throwMesBusiException("裁片方案【%s】无效", cutCode); + List cutSchemeMaterialList = getCutSchemeMaterialList(cutCode, organizeCode); if (CollectionUtils.isEmpty(cutSchemeMaterialList)) MesException.throwMesBusiException("裁片方案【%s】缺少原材料配置", cutCode); @@ -116,9 +121,12 @@ public class MesWorkOrderCutService extends BaseMesService impl MesWorkOrder workOrder = workOrders.get(0); - if (cutSchemeFg.getQty().compareTo(workOrder.getUnCompleteQty()) > 0) { - MesException.throwMesBusiException("零件号【%s】工单未完成数量【%s】不满足产成总数【%s】", cutSchemeFg.getPartNo(), workOrder.getUnCompleteQty(), cutSchemeFg.getQty()); - } + if (!workOrder.getWorkCenterCode().equals(cutScheme.getWorkCenterCode())) + MesException.throwMesBusiException("工单【%s】关联产线【%】与裁片方案【%】关联产线不一致!", workOrder.getWorkCenterCode(), cutScheme.getWorkCenterCode()); + + if (cutSchemeFg.getQty().compareTo(workOrder.getUnCompleteQty()) > 0) + MesException.throwMesBusiException("零件号【%s】工单未完成数量【%s】不满足产成总数【%s】", + cutSchemeFg.getPartNo(), workOrder.getUnCompleteQty(), cutSchemeFg.getQty()); Double unCompleteQty = workOrder.getUnCompleteQty(); @@ -136,8 +144,6 @@ public class MesWorkOrderCutService extends BaseMesService impl } - MesCutScheme cutScheme = getCutScheme(cutCode, organizeCode); - MesWorkOrderCut workOrderCut = new MesWorkOrderCut(); ConvertBean.serviceModelInitialize(workOrderCut, userName); workOrderCut.setCutCode(cutScheme.getCutCode());