手动模式库位处理

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -511,10 +511,9 @@ public class TaskWorkNode {
                                         String instructionUrl = conMap.get("instructionUrl") + "/api/" + conMap.get("method").toString();
 
                                         log.setZoneId(zZone.getId()).setMethod(method).setExecuteTime(new Date()).setRequestAddress(instructionUrl).setRequestParameter(jsonParam);
-                                        logger.info("instructionUrl={}" ,instructionUrl);
-                                        logger.info("[ECS指令发送]节点传参={}" ,jsonParam);
-//                                        returnData = restTemplate.postForObject(instructionUrl, formEntity, String.class);
-                                        returnData = "{\"result\": \"true\"}";
+                                        logger.warn("instructionUrl={}" ,instructionUrl);
+                                        logger.warn("[ECS指令发送]节点传参={}" ,jsonParam);
+                                        returnData = restTemplate.postForObject(instructionUrl, formEntity, String.class);
                                     }
                                 }
                             }
@@ -1268,6 +1267,7 @@ public class TaskWorkNode {
                 Map<String, String> m = new HashMap<>();
                 String filePath = i.getFilePath().replace(uriPath, storagePath);
                 //m.put("fileName", filePath.replace("/", "\\"));
+                filePath = filePath.replace("00.H", "O1.H");
                 m.put("fileName", filePath);
                 fileList.add(m);
             });

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/ToolbarController.java

@@ -34,6 +34,7 @@ import com.github.zuihou.business.util.DynamicRabbitMq;
 import com.github.zuihou.business.util.MsgUtil;
 import com.github.zuihou.common.constant.CacheKey;
 import com.github.zuihou.common.constant.ParameterKey;
+import com.github.zuihou.context.BaseContextHandler;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.log.annotation.SysLog;
 import com.google.common.collect.Maps;
@@ -130,6 +131,7 @@ public class ToolbarController {
     @ApiOperation(value = "手动操作回调更新", notes = "手动操作回调更新")
     @PostMapping("/updateStorgeCallback")
     public R updateStorgeCallback(@RequestBody Map<String, String> data) {
+        BaseContextHandler.setTenant("0000");
         String start = data.containsKey("start")? data.get("start").toString() : null;
         String goal = data.containsKey("goal")? data.get("goal").toString() : null;
 
@@ -145,6 +147,7 @@ public class ToolbarController {
         UpdateWrapper<StockInfo> updateWrapper = new UpdateWrapper<StockInfo>();
         updateWrapper.lambda().eq(StockInfo::getStorgeId, startStorge.getId()).le(StockInfo::getGoodsType, 4).set(StockInfo::getStorgeId, goalStorge.getId());
         stockInfoService.update(null, updateWrapper);
+        log.warn("库位{}手动操作更新{}回调成功", start, goal);
         return R.success();
     }
 

imcs-admin-boot/imcs-common/src/main/java/com/github/zuihou/common/properties/IgnoreTokenProperties.java

@@ -38,6 +38,7 @@ public class IgnoreTokenProperties {
             "/mock/**",
             "/agv/**",
             "/taskNode/taskNodeCallback/**",
+            "/toolbar/updateStorgeCallback/**",
             "/workpiece/handMode/**",
             //"/tray/**",
             //"/mToolClamp/**",