裁片功能-》弹框展示成品列表Function

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<MesWorkOrderCut> impl
 
         Map<String, List<MesWorkOrder>> workOrderListMapByPartNo = workOrderList.stream().collect(Collectors.groupingBy(MesWorkOrder::getPartNo));
 
+        MesCutScheme cutScheme = getCutScheme(cutCode, organizeCode);
+
+        if (cutScheme == null)
+            MesException.throwMesBusiException("裁片方案【%s】无效", cutCode);
+
         List<MesCutSchemeMaterial> cutSchemeMaterialList = getCutSchemeMaterialList(cutCode, organizeCode);
 
         if (CollectionUtils.isEmpty(cutSchemeMaterialList)) MesException.throwMesBusiException("裁片方案【%s】缺少原材料配置", cutCode);
@@ -116,9 +121,12 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
 
             MesWorkOrder workOrder = workOrders.get(0);
 
-            if (cutSchemeFg.getQty().compareTo(workOrder.getUnCompleteQty()) > 0) {
+            if (!workOrder.getWorkCenterCode().equals(cutScheme.getWorkCenterCode()))
-                MesException.throwMesBusiException("零件号【%s】工单未完成数量【%s】不满足产成总数【%s】", cutSchemeFg.getPartNo(), workOrder.getUnCompleteQty(), cutSchemeFg.getQty());
+                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<MesWorkOrderCut> impl
 
         }
 
-        MesCutScheme cutScheme = getCutScheme(cutCode, organizeCode);
-
         MesWorkOrderCut workOrderCut = new MesWorkOrderCut();
         ConvertBean.serviceModelInitialize(workOrderCut, userName);
         workOrderCut.setCutCode(cutScheme.getCutCode());