From f55811f1baad6f5e5939746d153c8f17ecaa258c Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 20 Jun 2024 17:27:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E4=B9=98-=E4=BB=AA=E8=A1=A8=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=A8=A1=E6=9D=BF=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesInputDefectRecordService.java | 1 + .../apiservice/serviceimpl/busi/MesNcProcessingService.java | 1 + .../serviceimpl/busi/MesProduceSnPrintServiceImpl.java | 11 ++++++++--- .../ext/mes/pcn/pojo/model/MesProduceSnPrintDataModel.java | 3 +++ .../i3plus/ext/mes/pcn/pojo/model/MesProduceSnPrintModel.java | 3 +++ 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java index 9eba218..bc8508c 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java @@ -613,6 +613,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService move.setPostTime(TimeTool.getTimeShortWithColon()); move.setPartInspectionId(model.getPartInspection().getId()); move.setMoveType(MesExtEnumUtil.MOVE_TYPE.SUSPICIOUS_MOVE.getValue()); + move.setProductSn(model.getSn()); ConvertBean.serviceModelInitialize(move, AuthUtil.getSessionUser().getUserName()); return move; } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java index 5d3a3dd..089b191 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java @@ -477,6 +477,7 @@ public class MesNcProcessingService implements IMesNcProcessingService { move.setPostTime(TimeTool.getTimeShortWithColon()); move.setMoveType(moveType.getValue()); move.setPartInspectionId(model.getPartInspection().getId()); + move.setProductSn(model.getSn()); ConvertBean.serviceModelInitialize(move, AuthUtil.getSessionUser().getUserName()); return move; } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintServiceImpl.java index 453d1fe..6b83d24 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintServiceImpl.java @@ -122,7 +122,7 @@ public class MesProduceSnPrintServiceImpl implements IMesProduceSnPrintService { MesProduceSn produceSn = generateMesProduceSn(mesPart, reportSn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty()); mesMesProduceSnList.add(produceSn); //封装打印信息 - mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(getModel(produceSn, no, organizeName)); + mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(getModel(produceSn, no, mesProduceSnPrintModel.getCustPartNo(),organizeName)); } mesProduceSnRDao.saveAll(mesMesProduceSnList); //条码补打 @@ -131,12 +131,15 @@ public class MesProduceSnPrintServiceImpl implements IMesProduceSnPrintService { mesProduceSnPrintModel.setPrintTemplate(mesPart.getProductLabelTemplate()); MesProduceSn mesProduceSn = findMesProduceSn(mesProduceSnPrintModel); String no = ""; + String custPartNo = ""; if (MesPcnEnumUtil.PRINT_TEMPLATE.GQXNY.getCode().equals(mesProduceSnPrintModel.getPrintTemplate()) && !Objects.isNull(mesProduceSn.getProductSn()) && mesProduceSn.getProductSn().length() >= 40) { + //获取客户零件号 + custPartNo = getMesCustomerPart(mesProduceSnPrintModel).getCustPartNo(); no = mesProduceSn.getProductSn().substring(36, 40); } - mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(getModel(mesProduceSn, no, organizeName)); + mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(getModel(mesProduceSn, no,custPartNo ,organizeName)); } //获取打印模板信息 mesProduceSnPrintModel.setMesLabelTemplate(mesTemplateService.getMesLabelTemplate(mesProduceSnPrintModel.getPrintTemplate())); @@ -149,19 +152,21 @@ public class MesProduceSnPrintServiceImpl implements IMesProduceSnPrintService { if (MesPcnEnumUtil.PRINT_TEMPLATE.GQXNY.getCode().equals(mesProduceSnPrintModel.getPrintTemplate())) { //获取客户零件号 MesCustomerPart mesCustomerPart = getMesCustomerPart(mesProduceSnPrintModel); + mesProduceSnPrintModel.setCustPartNo(mesCustomerPart.getCustPartNo()); //零件号（17）+扩展位（2）+供应商代码（7）+扩展位（3）+产线（1）+年月日（6位）+流水号（4）+扩展位（4）+"+" template.append(stringFormat(mesCustomerPart.getCustPartNo(), 17)).append("00").append(stringFormat("VD501", 7)).append("000").append("1").append(TimeTool.getNowTime("yyMMdd")).append("serialNo").append("0000").append("+"); } return template; } - private MesProduceSnPrintDataModel getModel(MesProduceSn produceSn, String no, String factoryName) { + private MesProduceSnPrintDataModel getModel(MesProduceSn produceSn, String no,String custPartNo, String factoryName) { MesProduceSnPrintDataModel mesProduceSnPrintDataModel = new MesProduceSnPrintDataModel(); mesProduceSnPrintDataModel.setFactoryName(factoryName); mesProduceSnPrintDataModel.setPartNo(produceSn.getPartNo()); mesProduceSnPrintDataModel.setPartName(produceSn.getPartName()); mesProduceSnPrintDataModel.setNo(no); mesProduceSnPrintDataModel.setBarcode(produceSn.getProductSn()); + mesProduceSnPrintDataModel.setCustPartNo(custPartNo); mesProduceSnPrintDataModel.setProductDate(TimeTool.getDateTimeShort()); return mesProduceSnPrintDataModel; } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesProduceSnPrintDataModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesProduceSnPrintDataModel.java index e582b02..d370237 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesProduceSnPrintDataModel.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesProduceSnPrintDataModel.java @@ -36,4 +36,7 @@ public class MesProduceSnPrintDataModel { @ApiParam("供应商代码") private String supplierCode; + @ApiParam("客户物料号") + private String custPartNo; + } \ No newline at end of file diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesProduceSnPrintModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesProduceSnPrintModel.java index e69a4cc..2450766 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesProduceSnPrintModel.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesProduceSnPrintModel.java @@ -51,6 +51,9 @@ public class MesProduceSnPrintModel { @ApiParam(value = "打印机") private String printer; + @ApiParam("客户物料号") + private String custPartNo; + @ApiParam(name = "包装定义维护") List mesPackingDefineList;