From 28401a36dd6a2a82864214c4c50a4ddae7c5e603 Mon Sep 17 00:00:00 2001 From: yxw Date: Thu, 19 Sep 2024 14:48:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=81=E7=89=87=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/MesWorkOrderCutController.java | 1 + .../serviceimpl/base/MesWorkOrderCutService.java | 9 +++-- .../serviceimpl/base/MesWorkOrderService.java | 4 +- .../strategy/CutWorkOrderNoPrintStrategy.java | 44 +++++++++------------- 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderCutController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderCutController.java index e5c781b..9c24ee2 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderCutController.java +++ b/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; 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 d444101..c52bdab 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 @@ -117,6 +117,7 @@ public class MesWorkOrderCutService extends BaseMesService 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 impl } for (MesWorkOrder mesWorkOrder : workOrderList) { - if (mesWorkOrder.getWorkOrderStatus() != MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue()) { - MesException.throwMesBusiException("工单状态不为【%s】", MesExtEnumUtil.ORDER_STATUS.valueOfDescription(mesWorkOrder.getWorkOrderStatus())); + if (mesWorkOrder.getWorkOrderStatus() != MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue() || mesWorkOrder.getWorkOrderStatus() != MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()) { + MesException.throwMesBusiException("工单【%s】状态【%s】无法生成裁片工单", mesWorkOrder.getWorkOrderNo(), MesExtEnumUtil.ORDER_TYPE.valueOfDescription(mesWorkOrder.getWorkOrderStatus())); } } return workOrderList; @@ -284,6 +285,8 @@ public class MesWorkOrderCutService extends BaseMesService 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 impl for (Map.Entry entry : cutSchemeMapByTemplate.entrySet()) { MesCutScheme cutScheme = entry.getValue(); - List workOrderCutList = workOrderCutMapByCutCode.get(entry.getKey()); + List workOrderCutList = workOrderCutMapByCutCode.get(cutScheme.getCutCode()); MesLabelTemplate labelTemplate = getLabelTemplate(cutScheme.getTemplateCode(), organizeCode); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 210409e..888afc8 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/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 implements DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(bean.getCustPartNo(), "custPartNo", packBean); DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), "workCenterCode", packBean); - if (StringUtil.isEmpty(bean.getWorkOrderStatusQuery())) { - DdlPreparedPack.getInPackList(Arrays.asList(bean.getWorkOrderStatusQuery().split(MesExtConstWords.COMMA)), "workOrderStatus", packBean); + if (!StringUtil.isEmpty(bean.getWorkOrderStatusQuery())) { + 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); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java index 28a34dd..76eef34 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java +++ b/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,35 +119,26 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic List equipParamValueList = new ArrayList<>(); List cutSchemeEquipmentDetails = mesCutSchemeEquipment == null ? new ArrayList<>() : cutSchemeEquipmentDetailMapByPid.get(mesCutSchemeEquipment.getId()); - for (int i = 0; i < EQUIP_PARAM_TITLE_NUM; i++) { - if (cutSchemeEquipmentDetails.size() > i) { - equipParamNameList.add(cutSchemeEquipmentDetails.get(i).getValue()); - equipParamValueList.add(cutSchemeEquipmentDetails.get(i).getName()); - } else { - equipParamNameList.add(""); - equipParamValueList.add(""); + for (int i = 0; i < EQUIP_NUM; i++) { + //设备参数值标题 + resultMap.put(MesExtConstWords.EQUIPMENT_NAME+(i+1), mesCutSchemeEquipment == null ? "" : mesCutSchemeEquipment.getEquipmentName()); + 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(""); + //设备参数值标题1 + resultMap.put(MesExtConstWords.EQUIP_PARAM_NAME+(l+1), ""); + //设备参数值1 + resultMap.put(MesExtConstWords.EQUIP_PARAM_VALUE+(l+1), ""); + } } } - //设备参数值标题 - resultMap.put(MesExtConstWords.EQUIPMENT_NAME+1, mesCutSchemeEquipment == null ? "" : mesCutSchemeEquipment.getEquipmentName()); - //设备参数值标题1 - resultMap.put(MesExtConstWords.EQUIP_PARAM_NAME+1, equipParamNameList.get(0)); - //设备参数值标题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)); - //设备参数值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)) { BigDecimal[] bigDecimals = divideAndRemainder(mesCutSchemeFgList.get(0).getQty(), mesCutSchemeFgList.get(0).getPackageQty());