From 7477087af80114f2bd3445c6ca346b51e92392b0 Mon Sep 17 00:00:00 2001 From: "logic.fang" Date: Thu, 13 Mar 2025 16:06:11 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"45623=20PCN-=E9=BE=99=E5=85=B4?= =?UTF-8?q?=E8=A3=85=E9=85=8D=E7=9B=AE=E8=A7=86=E5=8D=95=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E8=B0=83=E6=95=B4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit dca737d9c87915d5e9815c1cfc7e9246d5cff16f. --- .../strategy/AssemblyVisualListPrintStrategy.java | 35 +++++++--------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java index 79862e4..0304cdc 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java @@ -4,22 +4,20 @@ import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateSt import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintModel; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.platform.common.tool.TimeTool; -import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.*; -import cn.estsh.i3plus.pojo.mes.bean.shipping.MesCustSortInfo; import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel; import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import cn.estsh.i3plus.pojo.mes.model.StepResult; -import cn.estsh.i3plus.pojo.mes.repository.MesCustSoftInfoRepository; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -33,9 +31,6 @@ import java.util.stream.Collectors; @Slf4j public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategyService { - @Autowired - private MesCustSoftInfoRepository mesCustSoftInfoRepository; - @Override public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel model, MesNumberRule numberRule , StepResult stepResult, StationRequestBean reqBean, Boolean isStep) { @@ -61,20 +56,10 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe resultMap.put(MesPcnExtConstWords.WORK_CENTER_NAME, workOrder.getWorkCenterName()); // 车型名称 resultMap.put(MesPcnExtConstWords.CAR_MODEL_NAME, customerCarModel == null ? "" : customerCarModel.getCarModelName()); - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(workOrder.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(workOrder.getVinCode(), "vinCode", ddlPackBean); - DdlPreparedPack.getStringEqualPack(workOrder.getCustPartNo(), "custPartNo", ddlPackBean); - MesCustSortInfo mesCustSortInfo = mesCustSoftInfoRepository.getByProperty(ddlPackBean); - if (!Objects.isNull(mesCustSortInfo)) { - // vinCode（取值修改-45623 PCN-龙兴装配目视单模板取值调整：mes_cust_sort_info 表的 info_point_code + cust_info_seq） - resultMap.put(MesPcnExtConstWords.VIN_CODE, (mesCustSortInfo.getInfoPointCode() + mesCustSortInfo.getCustInfoSeq())); - // vinCode 后四位（取值修改-45623 PCN-龙兴装配目视单模板取值调整：mes_cust_sort_info 的 cust_info_seq 的后四位，即工单表中的 workOrderSeq 字段） - resultMap.put(MesPcnExtConstWords.VIN_CODE_AFTER_FOUR, - !StringUtils.isEmpty(mesCustSortInfo.getCustInfoSeq()) && - mesCustSortInfo.getCustInfoSeq().toString().length() > MesPcnExtConstWords.FOUR ? - mesCustSortInfo.getCustInfoSeq().toString().substring(mesCustSortInfo.getCustInfoSeq().toString().length() - MesPcnExtConstWords.FOUR) : - mesCustSortInfo.getCustInfoSeq()); - } + // vinCode + resultMap.put(MesPcnExtConstWords.VIN_CODE, workOrder.getVinCode()); + // vinCode 后四位 + resultMap.put(MesPcnExtConstWords.VIN_CODE_AFTER_FOUR, !StringUtils.isEmpty(workOrder.getVinCode()) && workOrder.getVinCode().length() > MesPcnExtConstWords.FOUR ? workOrder.getVinCode().substring(workOrder.getVinCode().length() - MesPcnExtConstWords.FOUR) : workOrder.getVinCode()); // 总成零件号 resultMap.put(MesPcnExtConstWords.PART_NO, workOrder.getPartNo()); // 工单标识 @@ -85,8 +70,8 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe resultMap.put(MesPcnExtConstWords.CUST_PART_NO, workOrder.getCustPartNo()); // 客户条码 resultMap.put(MesPcnExtConstWords.SN, workOrder.getCustSn()); - // 工单备注（取值修改-45623 PCN-龙兴装配目视单模板取值调整：取工单表中的 remark） - resultMap.put(MesPcnExtConstWords.REMARK, workOrder.getRemark()); + // 工单备注 + resultMap.put(MesPcnExtConstWords.REMARK, workOrder.getDescription()); // 重打印 resultMap.put(MesPcnExtConstWords.REPRINT, ""); // EDI接口时间 取工单plan_start_time