裁片原材料防错

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

@@ -16,6 +16,6 @@ public interface IMesWorkOrderCutService extends IBaseMesService<MesWorkOrderCut
     void doGenerateCutWorkOrder(List<Long> workOrderIds, String cutCode, String remark, String organizeCode, String userName);
 
     @ApiOperation("发布裁片工单")
-    void doReleaseCutWorkOrder(String cutWorkOrderNo, String organizeCode, String userName);
+    void doReleaseCutWorkOrder(List<String> cutWorkOrderNos, String organizeCode, String userName);
 
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderCutController.java

@@ -16,8 +16,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
+import java.util.Arrays;
-
 /**
  * 裁片工单
  */
@@ -31,13 +30,13 @@ public class MesWorkOrderCutController extends BaseMesController<MesWorkOrderCut
 
     @PostMapping(value = "/generate")
     @ApiOperation(value = "裁片工单生成", notes = "裁片工单生成")
-    public ResultBean doGenerateCutWorkOrder(List<Long> workOrderIds, String cutCode, String remark) {
+    public ResultBean doGenerateCutWorkOrder(Long[] workOrderIds, String cutCode, String remark) {
         try {
 
             ValidatorBean.checkNotNull(workOrderIds, "工单不存在");
             ValidatorBean.checkNotNull(cutCode, "裁片方案不存在");
 
-            workOrderCutService.doGenerateCutWorkOrder(workOrderIds, cutCode, remark, AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName());
+            workOrderCutService.doGenerateCutWorkOrder(Arrays.asList(workOrderIds), cutCode, remark, AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName());
             return ResultBean.success("生成成功")
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
@@ -49,12 +48,12 @@ public class MesWorkOrderCutController extends BaseMesController<MesWorkOrderCut
 
     @PostMapping(value = "/release")
     @ApiOperation(value = "裁片工单发布", notes = "裁片工单发布")
-    public ResultBean doReleaseCutWorkOrder(String cutWorkOrderNo) {
+    public ResultBean doReleaseCutWorkOrder(String[] cutWorkOrderNos) {
         try {
 
-            ValidatorBean.checkNotNull(cutWorkOrderNo, "裁片工单不存在");
+            ValidatorBean.checkNotNull(cutWorkOrderNos, "裁片工单不存在");
 
-            workOrderCutService.doReleaseCutWorkOrder(cutWorkOrderNo,  AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName());
+            workOrderCutService.doReleaseCutWorkOrder(Arrays.asList(cutWorkOrderNos),  AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName());
             return ResultBean.success("发布成功")
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {

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

@@ -169,23 +169,32 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
     }
 
     @Override
-    public void doReleaseCutWorkOrder(String cutWorkOrderNo, String organizeCode, String userName) {
+    public void doReleaseCutWorkOrder(List<String> cutWorkOrderNos, String organizeCode, String userName) {
 
-        if (StringUtils.isEmpty(cutWorkOrderNo)) MesException.throwMesBusiException("裁片工单为空");
+        if (CollectionUtils.isEmpty(cutWorkOrderNos)) MesException.throwMesBusiException("裁片工单为空");
 
-        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        List<MesWorkOrderCut> workOrderCuts = new ArrayList<>();
-        DdlPreparedPack.getStringEqualPack(cutWorkOrderNo, MesExtConstWords.CUT_WORK_ORDER_NO, packBean);
+
-        MesWorkOrderCut workOrderCutDb = workOrderCutRepository.getByProperty(packBean);
+        for (String cutWorkOrderNo : cutWorkOrderNos) {
+
+            if (StringUtils.isEmpty(cutWorkOrderNos)) MesException.throwMesBusiException("裁片工单为空");
 
-        if (workOrderCutDb == null) MesException.throwMesBusiException("裁片工单不存在", cutWorkOrderNo);
+            DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+            DdlPreparedPack.getStringEqualPack(cutWorkOrderNo, MesExtConstWords.CUT_WORK_ORDER_NO, packBean);
+            MesWorkOrderCut workOrderCutDb = workOrderCutRepository.getByProperty(packBean);
 
-        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()));
+            if (workOrderCutDb == null) MesException.throwMesBusiException("裁片工单不存在", cutWorkOrderNo);
 
-        workOrderCutDb.setWorkOrderStatus(MesExtEnumUtil.CUT_ORDER_STATUS.RELEASED.getValue());
+            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()));
 
-        ConvertBean.serviceModelUpdate(workOrderCutDb, userName);
+        }
+
+        for (MesWorkOrderCut workOrderCut : workOrderCuts) {
+            workOrderCut.setWorkOrderStatus(MesExtEnumUtil.CUT_ORDER_STATUS.RELEASED.getValue());
+            ConvertBean.serviceModelUpdate(workOrderCut, userName);
+        }
 
-        workOrderCutRepository.save(workOrderCutDb);
+        workOrderCutRepository.saveAll(workOrderCuts);
     }
 
     private String doGererateSerialNo(String cutCode, String organizeCode, String userName) {