裁片箱条码打印

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

@@ -49,6 +49,12 @@ public class CutWorkOrderPackageSnPrintStrategy implements IPrintTemplateStrateg
             resultMap.put(MesPcnExtConstWords.QTY, model.getQty());
             resultMap.put(MesPcnExtConstWords.CUT_WORK_ORDER_NO, model.getCutWorkOrderNo());
             resultMap.put(MesPcnExtConstWords.PACKAGE_SN, model.getPackageNo());
+            // 二维码
+            resultMap.put(MesPcnExtConstWords.BAR_CODE, model.getPackageNo());
+            // 二维码
+            resultMap.put(MesPcnExtConstWords.QR_CODE, new StringJoiner(MesPcnExtConstWords.VERTIVAL_BAR).add("YFWHU")
+                    .add(model.getPackageNo()).add(model.getOrganizeCode()).add(model.getQty().toString())
+                    .add("EA").toString());
             printDataMapList.add(resultMap);
         }
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java

@@ -106,6 +106,8 @@ public class MesWorkOrderCutPackagePrintStepService extends BaseStepService {
             resultMap = printModel.getPrintContextList();
         }
 
+        List<String> cutWorkOrderNoList = workOrderCutFgDataContext.stream().map(MesWorkOrderCutDetailModel::getCutWorkOrderNo).collect(Collectors.toList());
+
         // 裁片方案代码
         // 根据裁片方案代码查询裁片方案成品配置
         //返回打印标识 给前端

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackageSnSaveStepService.java

@@ -151,6 +151,7 @@ public class MesWorkOrderCutPackageSnSaveStepService extends BaseStepService {
         newWorkOrderCutDetailModel.setPrinter(mesPartContext.getPrinter());
         newWorkOrderCutDetailModel.setCustPartNo(mesPartContext == null ? "" : mesPartContext.getCustPartNo());
         newWorkOrderCutDetailModel.setLabelTemplate(mesPartContext.getLabelTemplate());
+        newWorkOrderCutDetailModel.setOrganizeCode(mesPartContext.getOrganizeCode());
 
         workOrderCutPackages.add(cutPackage);
         newWorkOrderCutFgDataContextList.add(newWorkOrderCutDetailModel);

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesWorkOrderCutDetailModel.java

@@ -15,6 +15,9 @@ import lombok.Data;
 @Api("裁片工单明细MODEL")
 public class MesWorkOrderCutDetailModel {
 
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
     @ApiParam("裁片工单号")
     private String cutWorkOrderNo;
 

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

@@ -484,4 +484,6 @@ public class MesPcnExtConstWords {
     public static final String QR_CODE = "qrCode";
     //条形码
     public static final String BAR_CODE = "barCode";
+    //竖杠
+    public static final String VERTIVAL_BAR = "|";
 }