yonghu bug

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

@@ -270,6 +270,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
             amsTaskUpdate.setId(amsTask.getId());
             amsTaskUpdate.setIsDelete(1);
             amsTaskUpdate.setAciAccept(0);
+            amsTaskUpdate.setRemark("下发超时1分钟未接收自动取消" + amsTaskUpdate.getAciAccept());
             iAmsTaskService.updateAmsTask(amsTaskUpdate);
         }
         return AjaxResult.success("取消任务指令已下发！");
@@ -454,15 +455,19 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
                                     , Constant.WAREHOUSE_ID, updateBy);
                         } else {
                             // 解锁终点和起始库位
-                            baseLocationInfoService.unLockLocationStockStatus(Long.parseLong(wcsTask.getLocationFrom()), Long.parseLong(wcsTask.getLocationTo())
-                                    , Constant.WAREHOUSE_ID, updateBy);
+                            if (!"待分配".equals(wcsTask.getLocationTo())) {
+                                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()));
                         }
                         // 如果是入库任务，任务结束，减去当前AGV任务数量
-                        subtractTheNumberOfTasks(wcsTask.getLocationTo());
+                        if (!"待分配".equals(wcsTask.getLocationTo())) {
+                            subtractTheNumberOfTasks(wcsTask.getLocationTo());
+                        }
                         // 取消任务删除中间缓存库存
 //                        cancelTaskDelMiddleCache(wcsTask);
                         break;