更新双升位移库任务BUG

Signed-off-by: TanYibin <5491541@qq.com>

更新双升位移库任务BUG
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent 8d4ca62c
Showing 3 changed files with 7 additions and 6 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -336,18 +336,18 @@ public class WcsServiceImpl implements WcsService {
                         if (destinationLocation == null) {
                             return Result.error("移库没有剩余库位");
                         }
-                        Result result = taskHeaderService.createTransferTask(insideLocation.getCode(), destinationLocation.getCode(), warehouseCode);
-                        preTaskNo = (Integer)result.getResult();
+                        Result<TaskHeader> result = taskHeaderService.createTransferTask(insideLocation.getCode(), destinationLocation.getCode(), warehouseCode);
                         if (!result.isSuccess()) {
                             return Result.error("创建移库任务失败");
                         }
+                        preTaskNo = result.getResult().getId();
                         // 移库任务
                         taskHeader.setPreTaskNo(preTaskNo);
                         boolean success = taskHeaderService.updateById(taskHeader);
                         if (!success) {
                             return Result.error("更新任务状态失败");
                         }
-                        return Result.error("先执行移库任务");
+//                        return Result.error("先执行移库任务");
                     }
                 } else {
                     // 如果是有任务，从这个库位入托盘，那么不能生成新的出库任务。必须等这个任务完成以后，重新生成新的移库后，这个任务才能执行。
@@ -369,6 +369,7 @@ public class WcsServiceImpl implements WcsService {
             }
         }
+        // 下发移库任务
         WcsTask wcsTask = new WcsTask();
         wcsTask.setTaskNo(taskHeader.getId().toString());
         wcsTask.setWarehouseCode(warehouseCode);
@@ -134,7 +134,7 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
      * @param  warehouseCode
      * @return
      */
-    Result createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode);
+    Result<TaskHeader> createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode);
     /**
      * 创建出库查看任务
@@ -181,7 +181,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode) {
+    public Result<TaskHeader> createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode) {
         log.info("开始创建移库任务,起始库位" + fromLocationCode + ",目标库位" + toLocationCode);
         if (StringUtils.isEmpty(fromLocationCode)) {
             return Result.error("创建移库任务时，起始库位为空");
@@ -295,7 +295,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         if (!success) {
             throw new JeecgBootException("创建移库任务时，容器" + fromLocation.getContainerCode() + "更新失败");
         }
-        return Result.OK("创建移库任务成功");
+        return Result.OK("创建移库任务成功", taskHeader);
     }
     @Override