Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git into develop

谭毅彬
2 parents 2caf3d24 9f5484fa
Showing 9 changed files with 65 additions and 37 deletions
ant-design-vue-jeecg/src/views/system/stocktaking/modules/AdjustmentDocModal.vue
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/IHuahengMultiHandlerService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/WcsTask.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
@@ -73,7 +73,6 @@ export default {
   },
   methods: {
-
     add() {
       this.edit(this.modelDefault);
     },
@@ -263,14 +263,9 @@ export default {
           dataIndex: 'status_dictText',
         },
         {
-          title: '是否重入',
+          title: '异常信息',
           align: "center",
-          dataIndex: 'isDoubleIn_dictText',
-        },
-        {
-          title: '重入库位号',
-          align: "center",
-          dataIndex: 'originLocationCode'
+          dataIndex: 'exceptionName'
         },
         {
           title: '创建人',
@@ -261,14 +261,9 @@ export default {
           dataIndex: 'status_dictText',
         },
         {
-          title: '重入',
+          title: '异常信息',
           align: "center",
-          dataIndex: 'isDoubleIn_dictText',
-        },
-        {
-          title: '重入库位号',
-          align: "center",
-          dataIndex: 'originLocationCode'
+          dataIndex: 'exceptionName'
         },
         {
           title: '创建人',
@@ -265,14 +265,9 @@ export default {
           dataIndex: 'status_dictText',
         },
         {
-          title: '空出',
+          title: '异常信息',
           align: "center",
-          dataIndex: 'isEmptyOut_dictText',
-        },
-        {
-          title: '取货错',
-          align: "center",
-          dataIndex: 'isPickupError_dictText',
+          dataIndex: 'exceptionName'
         },
         {
           title: '创建人',
@@ -270,14 +270,9 @@ export default {
           dataIndex: 'status_dictText',
         },
         {
-          title: '是否重入',
+          title: '异常信息',
           align: "center",
-          dataIndex: 'isDoubleIn_dictText',
-        },
-        {
-          title: '重入库位号',
-          align: "center",
-          dataIndex: 'originLocationCode'
+          dataIndex: 'exceptionName'
         },
         {
           title: '创建人',
+package org.jeecg.modules.wms.framework.service;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
+
+/**
+ * @author 游杰
+ */
+public interface IHuahengMultiHandlerService {
+
+    Result sendTaskToWcs(TaskHeader taskHeader);
+}
+package org.jeecg.modules.wms.framework.service.impl;
+
+import javax.annotation.Resource;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
+import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
+import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author 游杰
+ */
+@Service
+public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implements IHuahengMultiHandlerService {
+
+    @Resource
+    private ITaskHeaderService taskHeaderService;
+
+    @Override
+    public Result sendTaskToWcs(TaskHeader taskHeader) {
+        if (taskHeader == null) {
+            return Result.error("任务信息为空");
+        }
+        String lockKey = taskHeader.getWarehouseCode();
+        Result result = handleMultiProcess("sendTaskToWcs", lockKey, new MultiProcessListener() {
+            @Override
+            public Result<?> doProcess() {
+                Result result = taskHeaderService.sendTaskToWcs(taskHeader.getId());
+                return result;
+            }
+        });
+        return result;
+    }
+}
@@ -8,6 +8,7 @@ import javax.annotation.Resource;
 import org.apache.commons.collections.MapUtils;
 import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
 import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
 import org.jeecg.utils.constant.QuantityConstant;
@@ -22,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 /**
  * 定时任务
+ * @author 游杰
  */
 @Slf4j
@@ -31,6 +33,8 @@ public class WcsTask implements Job {
     Map<String, Boolean> runningTaskMap = new HashMap<>();
     @Resource
     private ITaskHeaderService taskHeaderService;
+    @Resource
+    private IHuahengMultiHandlerService huahengMultiHandlerService;
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
@@ -46,7 +50,7 @@ public class WcsTask implements Job {
             List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
             for (TaskHeader taskHeader : taskHeaderList) {
                 try {
-                    taskHeaderService.sendTaskToWcs(taskHeader.getId());
+                    huahengMultiHandlerService.sendTaskToWcs(taskHeader);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -27,6 +27,7 @@ import org.jeecg.modules.wms.config.zone.entity.Zone;
 import org.jeecg.modules.wms.config.zone.service.IZoneService;
 import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
 import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
+import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
 import org.jeecg.modules.wms.task.taskHeader.entity.TaskDetail;
 import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import org.jeecg.modules.wms.task.taskHeader.service.ITaskDetailService;
@@ -81,6 +82,8 @@ public class TaskHeaderController extends HuahengBaseController {
     private IPortService portService;
     @Resource
     private IZoneService zoneService;
+    @Resource
+    private IHuahengMultiHandlerService huahengMultiHandlerService;
     /*---------------------------------主表处理-begin-------------------------------------*/
@@ -385,13 +388,7 @@ public class TaskHeaderController extends HuahengBaseController {
             return Result.error("taskHeader不能为空");
         }
         Integer taskId = taskHeader.getId();
-        Result result = handleMultiProcess("execute", new MultiProcessListener() {
-            @Override
-            public Result<?> doProcess() {
-                Result result = taskHeaderService.sendTaskToWcs(taskId);
-                return result;
-            }
-        });
+        Result result = huahengMultiHandlerService.sendTaskToWcs(taskHeader);
         return result;
     }