Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan

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

@@ -45,10 +45,17 @@ public class CutWorkOrderPackageSnPrintStrategy implements IPrintTemplateStrateg
             }
 
             resultMap.put(MesPcnExtConstWords.LOT_NO, lotNo);
+            resultMap.put(MesPcnExtConstWords.TIME, model.getCreateDatetime());
             resultMap.put(MesPcnExtConstWords.PACKAGE_QTY, model.getPackageQty());
             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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
 
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderCutService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesPartContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPartContext;
@@ -8,16 +9,22 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintModel;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesWorkOrderCutDetailModel;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
+import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
 import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplateParam;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderCut;
 import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
 import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
 import cn.estsh.i3plus.pojo.mes.model.StepResult;
 import cn.estsh.i3plus.pojo.mes.repository.MesLabelTemplateParamRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesLabelTemplateRepository;
+import cn.estsh.i3plus.pojo.mes.repository.MesWorkOrderCutRepository;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +56,9 @@ public class MesWorkOrderCutPackagePrintStepService extends BaseStepService {
     @Autowired
     private MesLabelTemplateParamRepository labelTemplateParamRao;
 
+    @Autowired
+    private MesWorkOrderCutRepository workOrderCutRepository;
+
     @Override
     public StepResult execute(StationRequestBean reqBean) {
 
@@ -64,7 +74,7 @@ public class MesWorkOrderCutPackagePrintStepService extends BaseStepService {
         //
         //String labelTemplateCode = entry.getValue().getLabelTemplate();
 
-        List<Map<String, Object>> resultMap = null;
+        List<Map<String, Object>> resultMap = new ArrayList<>();
 
         Map<String, List<MesWorkOrderCutDetailModel>> workOrderCutDetailModelMapByPartNo = workOrderCutFgDataContext.stream().collect(Collectors.groupingBy(o -> new StringJoiner(MesPcnExtConstWords.AND).add(o.getPrinter()).add(o.getLabelTemplate()).toString()));
 
@@ -103,9 +113,17 @@ public class MesWorkOrderCutPackagePrintStepService extends BaseStepService {
             // GenSerialNoModel model , MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule, StepResult stepResult, StationRequestBean reqBean, Boolean isStep
             MesProduceSnPrintModel printModel = strategyService.execute(null, mesProduceSnPrintModel, null, stepResult, reqBean, true);
 
-            resultMap = printModel.getPrintContextList();
+            resultMap.addAll(printModel.getPrintContextList());
         }
 
+        List<String> cutWorkOrderNoList = workOrderCutFgDataContext.stream().map(MesWorkOrderCutDetailModel::getCutWorkOrderNo).collect(Collectors.toList());
+        // 修改工单为已打印
+        workOrderCutRepository.updateByProperties(
+                new String[]{MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.CUT_WORK_ORDER_NO},
+                new Object[]{CommonEnumUtil.VALID, CommonEnumUtil.IS_DEAL.NO.getValue(), reqBean.getOrganizeCode(), cutWorkOrderNoList.get(0)},
+                new String[]{MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME, MesPcnExtConstWords.SYSTEM_SYNC_STATUS, MesPcnExtConstWords.WORK_ORDER_STATUS},
+                new Object[]{reqBean.getUserInfo(), TimeTool.getNowTime(true), CommonEnumUtil.FALSE, MesExtEnumUtil.CUT_ORDER_STATUS.PRINTED.getValue()});
+
         // 裁片方案代码
         // 根据裁片方案代码查询裁片方案成品配置
         //返回打印标识 给前端

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

@@ -489,4 +489,13 @@ public class MesPcnExtConstWords {
 
     //工步解绑
     public static final String STEP_UNBINDING = "工步解绑";
+
+    //二维码
+    public static final String QR_CODE = "qrCode";
+    //条形码
+    public static final String BAR_CODE = "barCode";
+    //竖杠
+    public static final String VERTIVAL_BAR = "|";
+    // 时间
+    public static final String TIME = "time";
 }