bug修复

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/externalApi/service/impl/WmsAgvInfoServiceImpl.java

@@ -303,7 +303,8 @@ public class WmsAgvInfoServiceImpl extends SuperCacheServiceImpl<WmsAgvInfoMappe
                 .findFirst()
                 .orElse(null); // 如果没找到返回null*/
         Storge storge=CollectionUtil.isNotEmpty(storges)?storges.get(0):null;
-        if(storge == null){
+        Boolean b = (Boolean) msgUtil.redis_get(CacheKey.PROPERTIES + CacheKey.THREE_FLAG);
+        if(storge == null && b){
             return;
         }
 

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/wms/service/impl/WmsTransferTaskServiceImpl.java

@@ -469,26 +469,28 @@ public class WmsTransferTaskServiceImpl extends SuperCacheServiceImpl<WmsTransfe
             // 将任务列表放入外层Map
             requestBody.put("TaskList", taskList);
             String resp = "{ \"code\":\"200\", \"msg\":\"操作成功\" }";
-            JSONObject respJson = wmsApiClientUtil.postWithLog("任务取消接口", wmsCancelTaskUrl, requestBody, resp);
+            JSONObject respJson = wmsApiClientUtil.postWithLog(wmsAgvInfo.getTaskNo(), wmsCancelTaskUrl, requestBody, resp);
             int code = respJson.getInteger("code");
+            String msg = respJson.getString("msg");
             if (code == 200) {
                 //操作数据库
-                int updateRows = wmsAgvInfoMapper.delete(
+                wmsAgvInfoMapper.delete(
                         new QueryWrapper<WmsAgvInfo>()
                                 .eq("task_no", wmsAgvInfo.getTaskNo())
                 );
-                int wmsAgvInfoId = wmsAgvInfoDetailMapper.delete(new QueryWrapper<WmsAgvInfoDetail>().eq("wms_agv_info_id", wmsAgvInfo.getId()));
+                wmsAgvInfoDetailMapper.delete(new QueryWrapper<WmsAgvInfoDetail>().eq("wms_agv_info_id", wmsAgvInfo.getId()));
             }else {
-                return R.fail("删除失败");
+                return R.fail(msg);
             }
-        } else {
+        }
+        /*else {
             //单独运行
             int updateRows = wmsAgvInfoMapper.delete(
                     new QueryWrapper<WmsAgvInfo>()
                             .eq("task_no", wmsAgvInfo.getTaskNo())
             );
             int wmsAgvInfoId = wmsAgvInfoDetailMapper.delete(new QueryWrapper<WmsAgvInfoDetail>().eq("wms_agv_info_id", wmsAgvInfo.getId()));
-        }
+        }*/
         return R.success();
     }