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

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesPrintedSnLogService.java

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintDataModel;
 import cn.estsh.i3plus.pojo.mes.bean.MesPrintedSnLog;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.Map;
+
 /**
  * @Description : 条码打印记录表
  * @Reference :
@@ -16,6 +18,9 @@ public interface IMesPrintedSnLogService {
     @ApiOperation(value = "条码打印记录表")
     MesPrintedSnLog getMesPrintedSnLog(String userName, String organizeCode, MesProduceSnPrintDataModel printDataModel);
 
+    @ApiOperation(value = "条码打印记录表")
+    MesPrintedSnLog getMesCustomPrintedSnLog(String userName, String organizeCode, MesProduceSnPrintDataModel printDataModel, Map<String, Object> printContext);
+
     @ApiOperation(value = "写入条码打印记录表")
     void insertMesPrintedSnLog(MesPrintedSnLog mesPrintedSnLog,String userName);
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPrintedSnLogServiceImpl.java

@@ -13,6 +13,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * @Description : 条码打印记录表
  * @Reference :
@@ -39,6 +41,18 @@ public class MesPrintedSnLogServiceImpl implements IMesPrintedSnLogService {
     }
 
     @Override
+    public MesPrintedSnLog getMesCustomPrintedSnLog(String userName, String organizeCode, MesProduceSnPrintDataModel printDataModel, Map<String, Object> printContext) {
+        MesPrintedSnLog snLog = new MesPrintedSnLog();
+        BeanUtil.copyProperties(printDataModel, snLog);
+        snLog.setOrganizeCode(organizeCode);
+        snLog.setPrintContext(printContext);
+        snLog.setPrintData(JSONObject.toJSONString(printContext));
+        snLog.setPrintType(MesExtEnumUtil.PRINT_LOG_TYPE.PRINT_LOG_TYPE_10.getValue());
+        ConvertBean.serviceModelInitialize(snLog, userName);
+        return snLog;
+    }
+
+    @Override
     public void insertMesPrintedSnLog(MesPrintedSnLog mesPrintedSnLog, String userName) {
         MesPrintedSnLog snLog = new MesPrintedSnLog();
         BeanUtil.copyProperties(mesPrintedSnLog, snLog, MesPcnExtConstWords.BASE_BEAN_FIELDS);

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java

@@ -225,8 +225,13 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService {
             }
             MesProduceSnPrintDataModel model = new MesProduceSnPrintDataModel();
             BeanUtil.copyProperties(snLog, model);
-            model.setPrintDate(TimeTool.getNowTime(true));
-            mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(model);
+            if (CollectionUtils.isEmpty(snLog.getPrintContext())) {
+                model.setPrintDate(TimeTool.getNowTime(true));
+                mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(model);
+            } else {
+                snLog.getPrintContext().put(MesPcnExtConstWords.PRINT_DATE, TimeTool.getNowTime(true));
+                mesProduceSnPrintModel.getPrintContextList().add(snLog.getPrintContext());
+            }
             //记录打印日志
             mesPrintedSnLogService.insertMesPrintedSnLog(snLog, model.getUserName());
             return mesProduceSnPrintModel;

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

@@ -80,7 +80,7 @@ public class CustomFieldPrintStrategy implements IPrintTemplateStrategyService {
                 printTemplateData.putAll(customParamValue);
                 mesProduceSnPrintModel.getPrintContextList().add(printTemplateData);
                 //保存打印记录
-                mesProduceSnPrintModel.getMesPrintedSnLogList().add(mesPrintedSnLogService.getMesPrintedSnLog(mesProduceSnPrintModel.getUserName(), organizeCode, printDataModel));
+                mesProduceSnPrintModel.getMesPrintedSnLogList().add(mesPrintedSnLogService.getMesCustomPrintedSnLog(mesProduceSnPrintModel.getUserName(), organizeCode, printDataModel, printTemplateData));
             }
         }else{
             MesProduceSn mesProduceSn = mesProduceSnPrintModel.getMesProduceSnList().get(0);
@@ -91,7 +91,7 @@ public class CustomFieldPrintStrategy implements IPrintTemplateStrategyService {
             printTemplateData.putAll(customParamValue);
             mesProduceSnPrintModel.getPrintContextList().add(printTemplateData);
             //保存打印记录
-            mesProduceSnPrintModel.getMesPrintedSnLogList().add(mesPrintedSnLogService.getMesPrintedSnLog(mesProduceSnPrintModel.getUserName(), organizeCode, printDataModel));
+            mesProduceSnPrintModel.getMesPrintedSnLogList().add(mesPrintedSnLogService.getMesCustomPrintedSnLog(mesProduceSnPrintModel.getUserName(), organizeCode, printDataModel, printTemplateData));
         }
         return mesProduceSnPrintModel;
     }

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

@@ -267,7 +267,7 @@ public class MesWorkOrderCutCheckStepService extends BaseStepService {
                 MesLabelTemplate labelTemplate = mesTemplateService.getLabelTemplate(mesPackingDefine.getPackageTemplate(), reqBean.getOrganizeCode());
 
                 if (labelTemplate == null)
-                    return stepResult.isCompleted(false).msg(String.format("请检查包装定义信息,零件号[%s]对应模板代码[%s]无效!", mesCutSchemeFg.getPartNo(), cutScheme.getCutCode()));
+                    return stepResult.isCompleted(false).msg(String.format("请检查包装定义信息,零件号[%s]对应模板代码[%s]无效!", mesCutSchemeFg.getPartNo(), mesPackingDefine.getPackageTemplate()));
 
                 MesPartContext mesPartContext = partDataExtContext.get(mesCutSchemeFg.getPartNo());
                 mesPartContext.setCopies(mesPackingDefine.getPrintCopies() == null ? 1 : mesPackingDefine.getPrintCopies());