diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesPrintedSnLogService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesPrintedSnLogService.java index a4b153e..99c9830 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesPrintedSnLogService.java +++ b/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 printContext); + @ApiOperation(value = "写入条码打印记录表") void insertMesPrintedSnLog(MesPrintedSnLog mesPrintedSnLog,String userName); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPrintedSnLogServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPrintedSnLogServiceImpl.java index 0628087..cd69a60 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPrintedSnLogServiceImpl.java +++ b/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 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); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java index 667ad04..f6a9c38 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java +++ b/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; diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CustomFieldPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CustomFieldPrintStrategy.java index d2ad15c..f31b848 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CustomFieldPrintStrategy.java +++ b/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; }