fix:内包间行架

acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceController.java

@@ -194,7 +194,6 @@ public class DeviceController {
     //@PreAuthorize("@el.check('device:add')")
     public ResponseEntity<Object> autoCreateTask(@RequestBody JSONObject json) {
         deviceService.autoCreateTask(json);
-
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java

@@ -811,8 +811,8 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
                     Map<String, Object> map = new LinkedHashMap<>();
                     map.put("to_command", 1);
                     map.put("inflatableShaftVersion", Integer.parseInt(version));
-                    map.put("tube_num", Integer.parseInt(bushing_num));
+                    map.put("tube_num", bushing_num);
-                    map.put("is_wrapped", Integer.parseInt(is_bushing));
+                    map.put("is_wrapped", is_bushing);
                     map.put("to_task_type", Integer.parseInt(taskDto.getTruss_type()));
                     map.put("to_onset", Integer.parseInt(start_addr));
                     map.put("to_task", Integer.parseInt(instruction.getInstruction_code()));
@@ -836,9 +836,11 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
                             if ("6".equals(task.getTruss_type())) {
                                 flag = checkAgv(task);
                                 if (flag) {
+                                    logServer.deviceExecuteLog(this.device_code,"","","RGV条件满足,允许创建指令,任务号为:"+task.getTask_code());
                                     break;
-                                }else {
+                                } else {
-                                    task =null;
+                                    task = null;
+                                    logServer.deviceExecuteLog(this.device_code,"","","RGV条件不满足,不允许允许创建指令,任务号为:"+task);
                                     continue;
                                 }
 
@@ -964,18 +966,20 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
                     rgv1 = (RgvDeviceDriver) agv1.getDeviceDriver();
                     rgv2 = (RgvDeviceDriver) agv2.getDeviceDriver();
                     if ((rgv1.getMode() == 2 && rgv1.getMove1() == 1 && rgv1.getMove2() == 0) || (rgv2.getMode() == 2 && rgv2.getMove1() == 1 && rgv2.getMove2() == 0)) {
+                        logServer.deviceExecuteLog(device_code, "", "", "mode1"+rgv1.getMode()+"mode2"+
+                                rgv2.getMode()+"rgv1的move2"+ rgv1.getMove2()+"rgv2的move2"+rgv2.getMove2());
                         return true;
                     } else {
                         logServer.deviceExecuteLog(device_code, "", "", "rgv信号不符合");
                     }
-                }else {
+                } else {
                     logServer.deviceExecuteLog(device_code, "", "", "关联的站点不是rgv");
 
                 }
-            }else {
+            } else {
                 logServer.deviceExecuteLog(device_code, "", "", "rgv没有关联站点");
             }
-        }else {
+        } else {
             logServer.deviceExecuteLog(device_code, "", "", "rgv不是普通站点");
 
         }

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/rgv/RgvDeviceDriver.java

@@ -66,8 +66,8 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr
     int last_error = 0;
     int move1 = 0;
     int last_move1 = 0;
-    int move2 = 0;
+    Integer move2 = 0;
-    int last_move2 = 0;
+    Integer last_move2 = 0;
     float qty1 = 0f;
     float last_qty1 = 0f;
     float qty2 = 0f;
@@ -117,10 +117,11 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr
             if (move1 != last_move1) {
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号move1：" + last_move1 + "->" + move1);
             }
-            if (move2 != last_move2) {
+            if(!move2.equals(last_move2)){
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号move2：" + last_move2 + "->" + move2);
             }
 
+
         } catch (Exception var17) {
             var17.printStackTrace();
 

acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONString;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -427,7 +428,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 AddressDto addressDto = addressService.findByCode("applyManipulatorAction");
                 String methods_url = addressDto.getMethods_url();
                 String url = wmsUrl + methods_url;
-                log.info("ApplyManipulatorActionRequest----请求参数{}", param);
+                log.info("ApplyManipulatorActionRequest----请求参数:{}", JSONObject.toJSONString(param));
                 try {
 //                    String result = "";
                     String result = HttpRequest.post(url)

acs/nladmin-system/src/main/resources/logback-spring.xml

@@ -136,7 +136,7 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="asyncFileAppender"/>
         </root>
         <!--logmanage -->
-        <logger name="org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl" level="info" additivity="true">
+        <logger name="org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl" level="info" additivity="false">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="lokiAppender" />
         </logger>
@@ -190,7 +190,7 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="asyncFileAppender"/>
         </root>
         <!--logmanage -->
-        <logger name="org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl" level="info" additivity="true">
+        <logger name="org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl" level="info" additivity="false">
             <appender-ref ref="lokiAppender" />
         </logger>
         <logger name="jdbc.resultsettable" level="ERROR" additivity="true">