增加并发限制和权限控制

肖超群
1 parent 8b80f9fc
Showing 2 changed files with 25 additions and 7 deletions
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
@@ -142,11 +142,11 @@
         <span slot="action" slot-scope="text, record">
           <a v-if="record.status == 1" v-has="'taskHeader:executeTask'" @click="executeTask(record)">执行<a-divider type="vertical"/></a>
-          <a v-if="record.isEmptyOut == 1 && record.exceptionState == 1" v-has="'taskHeader:executeTask'" @click="handleEmptyOutTask(record)">修复空出数据
+          <a v-if="record.isEmptyOut == 1 && record.exceptionState == 1" v-has="'taskHeader:handleEmptyOutTask'" @click="handleEmptyOutTask(record)">修复空出数据
             <a-divider type="vertical"/></a>
-          <a v-if="record.isPickupError == 1 && record.exceptionState == 1" v-has="'taskHeader:executeTask'" @click="handlePickupErrorTask(record)">修复取货错数据
+          <a v-if="record.isPickupError == 1 && record.exceptionState == 1" v-has="'taskHeader:handlePickupErrorTask'" @click="handlePickupErrorTask(record)">修复取货错数据
             <a-divider type="vertical"/></a>
-          <a v-if="record.isDoubleIn == 1 && record.exceptionState == 1" v-has="'taskHeader:executeTask'" @click="handleDoubleInTask(record)">修复重入数据
+          <a v-if="record.isDoubleIn == 1 && record.exceptionState == 1" v-has="'taskHeader:handleDoubleInTask'" @click="handleDoubleInTask(record)">修复重入数据
             <a-divider type="vertical"/></a>
           <a v-if="record.status <= 10" v-has="'taskHeader:cancelTask'" @click="cancelTask(record)">取消</a>
         </span>
@@ -598,7 +598,7 @@ public class TaskHeaderController extends HuahengBaseController {
         }
         String fromLocationCode = container.getLocationCode();
         if (StringUtils.isEmpty(fromLocationCode)) {
-            return Result.error("选择整出口, 起始库位号为空");
+            return Result.error("选择分拣口, 起始库位号为空");
         }
         Location fromLocation = locationService.getLocationByCode(fromLocationCode, warehouseCode);
         if (fromLocation == null) {
@@ -656,7 +656,13 @@ public class TaskHeaderController extends HuahengBaseController {
     @ResponseBody
     @ApiLogger(apiName = "修复空出的数据", from = "WMS")
     public Result handleEmptyOut(@RequestParam(name = "id", required = true) String id) {
-        Result result = taskHeaderService.handleEmptyOut(id);
+        Result result = handleMultiProcess("handleEmptyOut", new MultiProcessListener() {
+            @Override
+            public Result<?> doProcess() {
+                Result result = taskHeaderService.handleEmptyOut(id);
+                return result;
+            }
+        });
         return result;
     }
@@ -670,7 +676,13 @@ public class TaskHeaderController extends HuahengBaseController {
     @ResponseBody
     @ApiLogger(apiName = "修复重入的数据", from = "WMS")
     public Result handleDoubleIn(@RequestParam(name = "id", required = true) String id) {
-        Result result = taskHeaderService.handleDoubleIn(id);
+        Result result = handleMultiProcess("handleDoubleIn", new MultiProcessListener() {
+            @Override
+            public Result<?> doProcess() {
+                Result result = taskHeaderService.handleDoubleIn(id);
+                return result;
+            }
+        });
         return result;
     }
@@ -684,7 +696,13 @@ public class TaskHeaderController extends HuahengBaseController {
     @ResponseBody
     @ApiLogger(apiName = "修复取货错的数据", from = "WMS")
     public Result handlePickupError(@RequestParam(name = "id", required = true) String id) {
-        Result result = taskHeaderService.handlePickupError(id);
+        Result result = handleMultiProcess("handlePickupError", new MultiProcessListener() {
+            @Override
+            public Result<?> doProcess() {
+                Result result = taskHeaderService.handlePickupError(id);
+                return result;
+            }
+        });
         return result;
     }