47241 PCN：赛力斯jis队列接收和赛力斯JIS单接收，增加取消订单按钮，按钮需要权限管控

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/report/IMesCimSeresReportService.java

@@ -14,9 +14,13 @@ public interface IMesCimSeresReportService {
 
     void doSrmSunSheetJisNormal(List<Long> ids);
 
+    void doSrmSunSheetJisCancel(List<Long> ids);
+
     ListPager<MesCimSeresJisQueue> queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode,
                                                            String partClassCode, String partClassName, Pager pager);
 
     void doJisQueueNormal(List<Long> ids);
 
+    void doJisQueueCancel(List<Long> ids);
+
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/report/MesCimSeresReportController.java

@@ -56,6 +56,20 @@ public class MesCimSeresReportController {
         }
     }
 
+    @ApiOperation(value = "赛力斯JIS单-取消", notes = "赛力斯JIS单-取消")
+    @PostMapping("/srm-sun-sheet-jis-cancel")
+    public ResultBean doSrmSunSheetJisCancel(@RequestBody Long[] idArray) {
+        try {
+            List<Long> idList = Arrays.asList(idArray);
+            mesCimSeresReportService.doSrmSunSheetJisCancel(idList);
+            return ResultBean.success("执行成功");
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
     @ApiOperation(value = "赛力斯JIS队列接收日志", notes = "赛力斯JIS队列接收日志")
     @GetMapping("/query-jis-queue-log")
     public ResultBean queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode,
@@ -86,4 +100,18 @@ public class MesCimSeresReportController {
         }
     }
 
+    @ApiOperation(value = "赛力斯JIS队列-取消", notes = "赛力斯JIS队列-取消")
+    @PostMapping("/jis-queue-cancel")
+    public ResultBean doJisQueueCancel(@RequestBody Long[] idArray) {
+        try {
+            List<Long> idList = Arrays.asList(idArray);
+            mesCimSeresReportService.doJisQueueCancel(idList);
+            return ResultBean.success("执行成功");
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java

@@ -56,6 +56,20 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService {
     }
 
     @Override
+    public void doSrmSunSheetJisCancel(List<Long> ids) {
+        final String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
+        final String username = AuthUtil.getSessionUser().getUserName();
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getInPackList(ids, "id", packBean);
+
+        runSheetJisRDao.updateByProperties(
+                new String[]{"isValid", "isDeleted", "modifyUser", "modifyDatetime"},
+                new Object[]{CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),
+                        username, TimeTool.getNowTime(true)},
+                packBean);
+    }
+
+    @Override
     public ListPager<MesCimSeresJisQueue> queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode,
                                                                   String partClassCode, String partClassName, Pager pager) {
         final String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
@@ -82,4 +96,18 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService {
         queueJisRDao.updateByProperties(new String[]{"checkStatus","modifyUser","modifyDatetime"},new Object[]{MesExtEnumUtil.CIM_SERES_JIS_STATUS.WAIT_CHECK.getValue(), username, TimeTool.getNowTime(true)}, packBean);
     }
 
+    @Override
+    public void doJisQueueCancel(List<Long> ids) {
+        final String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
+        final String username = AuthUtil.getSessionUser().getUserName();
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getInPackList(ids, "id", packBean);
+
+        queueJisRDao.updateByProperties(
+                new String[]{"isValid", "isDeleted", "modifyUser", "modifyDatetime"},
+                new Object[]{CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),
+                        username, TimeTool.getNowTime(true)},
+                packBean);
+    }
+
 }