裁片工单打印

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java

@@ -117,7 +117,7 @@ public class MesProduceSnPrintController {
     }
 
     @PostMapping("/mes-work-order-cut/find")
-    @ApiOperation(value = "裁片工单查询")
+    @ApiOperation(value = "裁片工单打印查询")
     public ResultBean findMesWorkOrderCut(MesWorkOrderCut workOrderCut) {
         try {
             ValidatorBean.checkNotNull(workOrderCut.getWorkCenterCodeQuery(), "产线代码不能为空");

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

@@ -311,6 +311,8 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService {
             // 根据pid对 设备参数 分组
             Map<Long, List<MesCutSchemeEquipmentDetail>> cutSchemeEquipmentDetailMapByPid = getCutSchemeEquipmentDetailMapByPid(workOrderCut.getOrganizeCode(), cutSchemeEquipmentList);
 
+            List<MesWorkOrderCut> workOrderCutShowList = new ArrayList<>();
+
             for (MesWorkOrderCut workOrderCutDb : workOrderCutList) {
 
                 MesCutScheme cutScheme = cutSchemeMapByCutCode.get(workOrderCutDb.getCutCode());
@@ -352,11 +354,13 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService {
                     continue;
                 }
 
-                workOrderCutDb.setPrintContent(snPrintModel.getPrintContextList());
                 workOrderCutDb.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue());
                 workOrderCutDb.setPrintTime(TimeTool.getNowTime(true));
+                workOrderCutDb.setWorkOrderStatusName(MesExtEnumUtil.CUT_ORDER_STATUS.valueOfDescription(workOrderCutDb.getWorkOrderStatus()));
                 ConvertBean.serviceModelUpdate(workOrderCutDb, workOrderCut.getModifyUser());
                 workOrderCutRepository.save(workOrderCutDb);
+                workOrderCutDb.setPrintContent(snPrintModel.getPrintContextList());
+                workOrderCutShowList.add(workOrderCutDb);
 
                 MesPrintedSnLog printedSnLog = new MesPrintedSnLog();
                 printedSnLog.setOrganizeCode(workOrderCut.getOrganizeCode());
@@ -367,10 +371,10 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService {
 
             }
 
-            return workOrderCutList;
+            return workOrderCutShowList;
         }
 
-        return workOrderCutList;
+        return new ArrayList<>();
     }
 
     private List<MesCutSchemeEquipment> getMesCutSchemeEquipments(MesWorkOrderCut workOrderCut, List<String> cutCodeList) {