diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/printqueue/strategy/WorkOrderAssemblyPrintQueueStrategyService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/printqueue/strategy/WorkOrderAssemblyPrintQueueStrategyService.java index 92bb6f7..d76561d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/printqueue/strategy/WorkOrderAssemblyPrintQueueStrategyService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/printqueue/strategy/WorkOrderAssemblyPrintQueueStrategyService.java @@ -57,6 +57,9 @@ public class WorkOrderAssemblyPrintQueueStrategyService implements IPrintQueueSt @Autowired private IMesWorkCenterService workCenterService; + @Autowired + private IMesPrintedSnLogRepository printedSnLogRepository; + @Override public List execute(MesPrintQueue model) { @@ -93,6 +96,9 @@ public class WorkOrderAssemblyPrintQueueStrategyService implements IPrintQueueSt // 展示打印队列列表 List showPrintQueueList = new ArrayList<>(); + // 条码打印记录 + List printedSnLogList = new ArrayList<>(); + for (MesPrintQueue printQueue : printQueueList) { MesWorkOrder mesWorkOrder = workOrderMapByWorkOrderNo.get(printQueue.getWorkOrderNo()); @@ -168,10 +174,19 @@ public class WorkOrderAssemblyPrintQueueStrategyService implements IPrintQueueSt showPrintQueueList.add(printQueue); + MesPrintedSnLog printedSnLog = new MesPrintedSnLog(); + printedSnLog.setOrganizeCode(printQueue.getOrganizeCode()); + printedSnLog.setWorkOrderNo(printQueue.getWorkOrderNo()); + printedSnLog.setCustPartNo(printQueue.getCustPartNo()); + ConvertBean.serviceModelInitialize(printedSnLog, "JOB"); + printedSnLogList.add(printedSnLog); + } printQueueRepository.saveAll(printQueueList); + if (!CollectionUtils.isEmpty(printedSnLogList)) printedSnLogRepository.saveAll(printedSnLogList); + return showPrintQueueList; }