裁片功能优化

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderCutController.java

@@ -9,6 +9,7 @@ import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
+import cn.hutool.core.collection.ListUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java

@@ -117,6 +117,7 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
 
             workOrderCut.setCutWorkOrderNo(cutWorkOrderNo);
             workOrderCut.setOrganizeCode(organizeCode);
+            workOrderCuttList.add(workOrderCut);
             
             for (MesCutSchemeMaterial cutSchemeMaterial : cutSchemeMaterialList) {
                 MesWorkOrderCutMaterial workOrderCutMaterial = new MesWorkOrderCutMaterial();
@@ -203,8 +204,8 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
         }
 
         for (MesWorkOrder mesWorkOrder : workOrderList) {
-            if (mesWorkOrder.getWorkOrderStatus() != MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue()) {
+            if (mesWorkOrder.getWorkOrderStatus() != MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue() || mesWorkOrder.getWorkOrderStatus() != MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()) {
-                MesException.throwMesBusiException("工单状态不为【%s】", MesExtEnumUtil.ORDER_STATUS.valueOfDescription(mesWorkOrder.getWorkOrderStatus()));
+                MesException.throwMesBusiException("工单【%s】状态【%s】无法生成裁片工单", mesWorkOrder.getWorkOrderNo(), MesExtEnumUtil.ORDER_TYPE.valueOfDescription(mesWorkOrder.getWorkOrderStatus()));
             }
         }
         return workOrderList;
@@ -284,6 +285,8 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
 
         if (CollectionUtils.isEmpty(cutWorkOrderNoDbList)) MesException.throwMesBusiException("裁片工单不存在");
 
+        cutWorkOrderNos = new ArrayList<>(cutWorkOrderNos);
+
         cutWorkOrderNos.removeAll(cutWorkOrderNoDbList);
 
         if (!CollectionUtils.isEmpty(cutWorkOrderNos))
@@ -313,7 +316,7 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
         for (Map.Entry<String, MesCutScheme> entry : cutSchemeMapByTemplate.entrySet()) {
 
             MesCutScheme cutScheme = entry.getValue();
-            List<MesWorkOrderCut> workOrderCutList = workOrderCutMapByCutCode.get(entry.getKey());
+            List<MesWorkOrderCut> workOrderCutList = workOrderCutMapByCutCode.get(cutScheme.getCutCode());
 
             MesLabelTemplate labelTemplate = getLabelTemplate(cutScheme.getTemplateCode(), organizeCode);
 

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java

@@ -224,8 +224,8 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCustPartNo(), "custPartNo", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
-        if (StringUtil.isEmpty(bean.getWorkOrderStatusQuery())) {
+        if (!StringUtil.isEmpty(bean.getWorkOrderStatusQuery())) {
-            DdlPreparedPack.getInPackList(Arrays.asList(bean.getWorkOrderStatusQuery().split(MesExtConstWords.COMMA)), "workOrderStatus", packBean);
+            DdlPreparedPack.getInPackList(Arrays.stream(bean.getWorkOrderStatusQuery().split(MesExtConstWords.COMMA)).map(Integer::parseInt).collect(Collectors.toList()), "workOrderStatus", packBean);
         } else DdlPreparedPack.getNumEqualPack(bean.getWorkOrderStatus(), "workOrderStatus", packBean);
         DdlPreparedPack.getNumEqualPack(bean.getWorkOrderType(), "workOrderType", packBean);
         DdlPreparedPack.getStringBiggerPack(bean.getCreateDateTimeStart(), "createDatetime", packBean);

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java

@@ -41,6 +41,7 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic
     @Autowired
     private MesCutSchemeEquipmentDetailRepository cutSchemeEquipmentDetailRepository;
 
+    public static final int EQUIP_NUM = 1;
     public static final int EQUIP_PARAM_TITLE_NUM = 4;
 
     @Override
@@ -118,34 +119,25 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic
             List<String> equipParamValueList = new ArrayList<>();
             List<MesCutSchemeEquipmentDetail> cutSchemeEquipmentDetails = mesCutSchemeEquipment == null ? new ArrayList<>() : cutSchemeEquipmentDetailMapByPid.get(mesCutSchemeEquipment.getId());
 
-            for (int i = 0; i < EQUIP_PARAM_TITLE_NUM; i++) {
+            for (int i = 0; i < EQUIP_NUM; i++) {
-                if (cutSchemeEquipmentDetails.size() > i) {
+                //设备参数值标题
-                    equipParamNameList.add(cutSchemeEquipmentDetails.get(i).getValue());
+                resultMap.put(MesExtConstWords.EQUIPMENT_NAME+(i+1), mesCutSchemeEquipment == null ? "" : mesCutSchemeEquipment.getEquipmentName());
-                    equipParamValueList.add(cutSchemeEquipmentDetails.get(i).getName());
+                for (int l = 0; l < EQUIP_PARAM_TITLE_NUM; l++) {
+                    if (cutSchemeEquipmentDetails.size() > l) {
+                        //设备参数值标题1
+                        resultMap.put(MesExtConstWords.EQUIP_PARAM_NAME+(l+1), cutSchemeEquipmentDetails.get(l).getValue());
+                        //设备参数值1
+                        resultMap.put(MesExtConstWords.EQUIP_PARAM_VALUE+(l+1), cutSchemeEquipmentDetails.get(l).getName());
                     } else {
                         equipParamNameList.add("");
                         equipParamValueList.add("");
-                }
-            }
-
-            //设备参数值标题
-            resultMap.put(MesExtConstWords.EQUIPMENT_NAME+1, mesCutSchemeEquipment == null ? "" : mesCutSchemeEquipment.getEquipmentName());
                         //设备参数值标题1
-            resultMap.put(MesExtConstWords.EQUIP_PARAM_NAME+1, equipParamNameList.get(0));
+                        resultMap.put(MesExtConstWords.EQUIP_PARAM_NAME+(l+1), "");
-            //设备参数值标题2
-            resultMap.put(MesExtConstWords.EQUIP_PARAM_NAME+2, equipParamNameList.get(1));
-            //设备参数值标题3
-            resultMap.put(MesExtConstWords.EQUIP_PARAM_NAME+3, equipParamNameList.get(2));
-            //设备参数值标题4
-            resultMap.put(MesExtConstWords.EQUIP_PARAM_NAME+4, equipParamNameList.get(3));
                         //设备参数值1
-            resultMap.put(MesExtConstWords.EQUIP_PARAM_VALUE+1, equipParamValueList.get(0));
+                        resultMap.put(MesExtConstWords.EQUIP_PARAM_VALUE+(l+1), "");
-            //设备参数值2
+                    }
-            resultMap.put(MesExtConstWords.EQUIP_PARAM_VALUE+2, equipParamValueList.get(1));
+                }
-            //设备参数值3
+            }
-            resultMap.put(MesExtConstWords.EQUIP_PARAM_VALUE+3, equipParamValueList.get(2));
-            //设备参数值4
-            resultMap.put(MesExtConstWords.EQUIP_PARAM_VALUE+4, equipParamValueList.get(3));
 
             String partValue = "";
             if (!CollectionUtils.isEmpty(mesCutSchemeFgList)) {