华兰：优化任务反馈

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaDocAsnController.java

@@ -1,16 +1,11 @@
 package com.ruoyi.web.controller.warewms.pda;
 
-import com.ruoyi.ams.asn.service.IWmsDocAsnHeaderService;
 import com.ruoyi.ams.business.IBusinessService;
 import com.ruoyi.ams.config.domain.dto.AgvCallDTO;
 import com.ruoyi.ams.config.domain.dto.AgvCallItem;
 import com.ruoyi.ams.config.domain.dto.AgvCallItemDTO;
-import com.ruoyi.ams.config.domain.dto.LotattDTO;
 import com.ruoyi.ams.config.domain.vo.FlowConfigHeaderVO;
 import com.ruoyi.ams.config.service.IFlowConfigHeaderService;
-import com.ruoyi.ams.lineCall.domain.form.LineCallDetailsForm;
-import com.ruoyi.ams.lineCall.domain.form.LineCallForm;
-import com.ruoyi.ams.lineCall.domain.form.LineCallListFrom;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import io.swagger.annotations.Api;
@@ -18,15 +13,14 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author JWK
@@ -48,7 +42,10 @@ public class PdaDocAsnController {
 
     @ApiOperation("入库位->接驳位任务下发")
     @PostMapping("inToTran")
-    public AjaxResult inToTran(@RequestBody AgvCallItem agvCallItem) {
+    public AjaxResult inToTran(@Validated @RequestBody AgvCallItem agvCallItem) {
+        if (StringUtils.isEmpty(agvCallItem.getLocationFrom())) {
+            return AjaxResult.error("起始库位不可为空！");
+        }
         //查询所属流程
         FlowConfigHeaderVO flowConfigHeaderVO = flowConfigHeaderService.selectFlowConfigHeaderById(ASN_FLOW_ID);
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaDocSoController.java

@@ -11,6 +11,7 @@ import com.ruoyi.base.constant.Constant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -42,6 +43,9 @@ public class PdaDocSoController {
     @ApiOperation("出库位->接驳位任务下发")
     @PostMapping("outToTran")
     public AjaxResult outToTran(@RequestBody AgvCallItem agvCallItem) {
+        if (StringUtils.isEmpty(agvCallItem.getLocationTo())) {
+            return AjaxResult.error("目标库位不可为空！");
+        }
         //查询所属流程
         FlowConfigHeaderVO flowConfigHeaderVO = flowConfigHeaderService.selectFlowConfigHeaderById(SO_FLOW_ID);
 

warewms-ams/src/main/java/com/ruoyi/ams/task/service/impl/WcsTaskServiceImpl.java

@@ -332,7 +332,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
                             moveMiddleCacheToDestination(wcsTask);
                             //释放redis锁
                             if (!StringUtils.isEmpty(wcsTask.getExt8())) {
-                                redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()));
+                                redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()),wcsTask.getLocationTo());
                             }
                         }
                         break;
@@ -347,7 +347,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
 
                         //释放redis锁
                         if (!StringUtils.isEmpty(wcsTask.getExt8())) {
-                            redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()));
+                            redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()),wcsTask.getLocationFrom());
                         }
                         break;
                     case 5:
@@ -362,7 +362,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
                             moveMiddleCacheToDestination(wcsTask);
                             //释放redis锁
                             if (!StringUtils.isEmpty(wcsTask.getExt8())) {
-                                redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()));
+                                redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()),wcsTask.getLocationTo());
                             }
                         }
                         break;
@@ -373,17 +373,21 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
                             // 解锁终点库位
                             baseLocationInfoService.unLockLocationStockStatus(Long.parseLong(wcsTask.getLocationTo())
                                     , Constant.WAREHOUSE_ID, updateBy);
+                            //释放redis锁
+                            if (!StringUtils.isEmpty(wcsTask.getExt8())) {
+                                redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()),wcsTask.getLocationTo());
+                            }
                         } else {
                             // 解锁终点和起始库位
                             baseLocationInfoService.unLockLocationStockStatus(Long.parseLong(wcsTask.getLocationFrom()), Long.parseLong(wcsTask.getLocationTo())
                                     , Constant.WAREHOUSE_ID, updateBy);
+                            //释放redis锁
+                            if (!StringUtils.isEmpty(wcsTask.getExt8())) {
+                                redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()));
+                            }
                         }
                         // 取消任务删除中间缓存库存
                         cancelTaskDelMiddleCache(wcsTask);
-                        //释放redis锁
-                        if (!StringUtils.isEmpty(wcsTask.getExt8())) {
-                            redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()));
-                        }
                         break;
                     case 8:
                         log.error("任务异常状态------------" + wcsTask.getTaskNo());