|
|
|
@ -96,8 +96,9 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService {
|
|
|
|
|
mesProduceSnPrintModel.getMesProduceSnList().add(produceSn);
|
|
|
|
|
//保存打印记录
|
|
|
|
|
MesPrintedSnLog snLog = new MesPrintedSnLog();
|
|
|
|
|
ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
|
|
|
|
|
BeanUtil.copyProperties(printDataModel,snLog);
|
|
|
|
|
snLog.setOrganizeCode(organizeCode);
|
|
|
|
|
ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
|
|
|
|
|
mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog);
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
@ -119,8 +120,9 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService {
|
|
|
|
|
mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel);
|
|
|
|
|
//保存打印记录
|
|
|
|
|
MesPrintedSnLog snLog = new MesPrintedSnLog();
|
|
|
|
|
ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
|
|
|
|
|
BeanUtil.copyProperties(printDataModel,snLog);
|
|
|
|
|
snLog.setOrganizeCode(organizeCode);
|
|
|
|
|
ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
|
|
|
|
|
mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog);
|
|
|
|
|
}
|
|
|
|
|
return mesProduceSnPrintModel;
|
|
|
|
|