|
|
|
@ -57,6 +57,9 @@ public class WorkOrderAssemblyPrintQueueStrategyService implements IPrintQueueSt
|
|
|
|
|
@Autowired
|
|
|
|
|
private IMesWorkCenterService workCenterService;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private IMesPrintedSnLogRepository printedSnLogRepository;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<MesPrintQueue> execute(MesPrintQueue model) {
|
|
|
|
|
|
|
|
|
@ -93,6 +96,9 @@ public class WorkOrderAssemblyPrintQueueStrategyService implements IPrintQueueSt
|
|
|
|
|
// 展示打印队列列表
|
|
|
|
|
List<MesPrintQueue> showPrintQueueList = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
// 条码打印记录
|
|
|
|
|
List<MesPrintedSnLog> 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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|