保存裁片加工记录

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderCutService.java

@@ -18,4 +18,7 @@ public interface IMesWorkOrderCutService extends IBaseMesService<MesWorkOrderCut
     @ApiOperation("发布裁片工单")
     void doReleaseCutWorkOrder(List<String> cutWorkOrderNos, String organizeCode, String userName);
 
+    @ApiOperation("打印裁片工单")
+    void doPrintCutWorkOrder(List<String> cutWorkOrderNos, String organizeCode, String userName);
+
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java

@@ -144,7 +144,12 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
         workOrderCut.setCutName(cutScheme.getCutName());
         workOrderCut.setWorkOrderStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() ==  cutScheme.getIsAutoRelease() ? MesExtEnumUtil.CUT_ORDER_STATUS.RELEASED.getValue() :  MesExtEnumUtil.CUT_ORDER_STATUS.CREATE.getValue());
         workOrderCut.setRemark(remark);
-        workOrderCut.setCutWorkOrderNo(doGenerateSerialNo(cutScheme.getCutCode(), organizeCode, userName));
+
+        String cutWorkOrderNo = doGenerateSerialNo(cutScheme.getCutCode(), organizeCode, userName);
+
+        log.info("裁片工单号:{}", cutWorkOrderNo);
+
+        workOrderCut.setCutWorkOrderNo(cutWorkOrderNo);
         workOrderCut.setOrganizeCode(organizeCode);
 
         workOrderCutDetailtList.forEach(o-> o.setCutWorkOrderNo(workOrderCut.getCutWorkOrderNo()));
@@ -191,6 +196,8 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
 
             if (workOrderCutDb.getWorkOrderStatus() != MesExtEnumUtil.CUT_ORDER_STATUS.CREATE.getValue()) MesException.throwMesBusiException("裁片工单【%】状态不为【%s】,当前状态为【%s】", cutWorkOrderNo, MesExtEnumUtil.CUT_ORDER_STATUS.RELEASED.getValue(), MesExtEnumUtil.CUT_ORDER_STATUS.valueOfDescription(workOrderCutDb.getWorkOrderStatus()));
 
+            workOrderCuts.add(workOrderCutDb);
+
         }
 
         for (MesWorkOrderCut workOrderCut : workOrderCuts) {
@@ -201,6 +208,27 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
         workOrderCutRepository.saveAll(workOrderCuts);
     }
 
+    @Override
+    public void doPrintCutWorkOrder(List<String> cutWorkOrderNos, String organizeCode, String userName) {
+
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getInPackList(cutWorkOrderNos, MesExtConstWords.CUT_WORK_ORDER_NO, packBean);
+        List<MesWorkOrderCut> workOrderCutDbList = workOrderCutRepository.findByHqlWhere(packBean);
+
+        List<String> cutWorkOrderNoDbList = workOrderCutDbList.stream().map(MesWorkOrderCut::getCutWorkOrderNo).collect(Collectors.toList());
+
+        if (CollectionUtils.isEmpty(cutWorkOrderNoDbList)) MesException.throwMesBusiException("裁片工单不存在");
+
+        cutWorkOrderNos.removeAll(cutWorkOrderNoDbList);
+
+        if (!CollectionUtils.isEmpty(cutWorkOrderNos))
+            MesException.throwMesBusiException("裁片工单【%s】不存在", cutWorkOrderNos);
+
+        List<String> cutCode = workOrderCutDbList.stream().map(MesWorkOrderCut::getCutCode).distinct().collect(Collectors.toList());
+
+
+    }
+
     private String doGenerateSerialNo(String cutCode, String organizeCode, String userName) {
         return syncFuncService.syncSerialNo(
                 new GenSerialNoModel(MesExtConstWords.CUT_WORK_ORDER_NO_FUL).dynamicRule(cutCode).year(TimeTool.pareDateToString(MesExtConstWords.DATE_FORMAT_YY, new Date())).organizeCode(organizeCode),