广乘-仪表打印模板增加客户物料字段

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;
     }

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;
     }

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;
     }

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;
+
 }

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<MesPackingDefine> mesPackingDefineList;