现场光电测试修改

ruoyi-admin/src/main/java/com/ruoyi/init/StartService.java

@@ -56,19 +56,19 @@ public class StartService implements CommandLineRunner {
         autoButtonBoxTask.run();
     }
     /**
-     * 自动按钮盒监控任务 - 硫酸镍废料下线
+     * 自动按钮盒监控任务 - 氯化镍废料口
      */
     public void autoButtonBoxTask01() {
         autoButtonBoxTask01.run();
     }
     /**
-     * 自动按钮盒监控任务 - 氯化镍废料下线
+     * 自动按钮盒监控任务 - 硫酸镍废料口退空
      */
     public void autoButtonBoxTask02() {
         autoButtonBoxTask02.run();
     }
     /**
-     * 自动按钮盒监控任务 - 硫酸镍废料退空
+     * 自动按钮盒监控任务 - 硫酸镍废料口
      */
     public void autoButtonBoxTask03() {
         autoButtonBoxTask03.run();

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/thread/AutoButtonBoxTask01.java

@@ -15,8 +15,8 @@ public class AutoButtonBoxTask01 {
     private ButtonBoxClient buttonBoxClient;
     @Autowired
     private AgvCallProxyService agvCallProxyService;
-    // 硫酸镍废料下线库位id
-    public static final String LSN_FL_POINT = "10386";
+    // 氯化镍废料口下线库位id
+    public static final String LSN_FL_POINT = "10390";
 
     public void run() {
 
@@ -34,7 +34,7 @@ public class AutoButtonBoxTask01 {
     }
 
     public void buttonTask01(ButtonBoxClient.BUTTON_BOX_NO button_box_no) {
-        log.info("硫酸镍废料-按钮已经被按下");
+        log.info("氯化镍废料口-按钮已经被按下");
         AjaxResult ajaxResult = agvCallProxyService.accessoriesHandlingLSN(LSN_FL_POINT, null
                 , "按钮盒");
         if (!ajaxResult.isSuccess()) {
@@ -45,7 +45,7 @@ public class AutoButtonBoxTask01 {
         buttonBoxClient.clearBtn01(button_box_no);
         // 灭灯
         buttonBoxClient.writeLamp01Death(button_box_no);
-        log.info("硫酸镍废料-按钮已经灭灯");
+        log.info("氯化镍废料口-按钮已经灭灯");
     }
 
     public void buttonTask02(ButtonBoxClient.BUTTON_BOX_NO button_box_no) {

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/thread/AutoButtonBoxTask02.java

@@ -15,8 +15,8 @@ public class AutoButtonBoxTask02 {
     private ButtonBoxClient buttonBoxClient;
     @Autowired
     private AgvCallProxyService agvCallProxyService;
-    // 氯化镍废料下线库位id
-    public static final String LHN_FL_POINT = "10390";
+    // 硫酸镍废料接驳口下线库位id
+    public static final String LHN_FL_POINT = "10387";
 
     public void run() {
 
@@ -34,7 +34,7 @@ public class AutoButtonBoxTask02 {
     }
 
     public void buttonTask01(ButtonBoxClient.BUTTON_BOX_NO button_box_no) {
-        log.info("氯化镍废料-按钮已经被按下");
+        log.info("硫酸镍废料接驳口-按钮已经被按下");
         AjaxResult ajaxResult = agvCallProxyService.accessoriesHandlingLHN(LHN_FL_POINT, null
                 , "按钮盒");
         if (!ajaxResult.isSuccess()) {
@@ -45,7 +45,7 @@ public class AutoButtonBoxTask02 {
         buttonBoxClient.clearBtn01(button_box_no);
         // 灭灯
         buttonBoxClient.writeLamp01Death(button_box_no);
-        log.info("氯化镍废料-按钮已经灭灯");
+        log.info("硫酸镍废料口-按钮已经灭灯");
     }
 
     public void buttonTask02(ButtonBoxClient.BUTTON_BOX_NO button_box_no) {

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/thread/AutoButtonBoxTask03.java

@@ -15,8 +15,8 @@ public class AutoButtonBoxTask03 {
     private ButtonBoxClient buttonBoxClient;
     @Autowired
     private AgvCallProxyService agvCallProxyService;
-    // 硫酸镍废料下线库位id
-    public static final String LSN_FL_R_POINT = "10387";
+    // 硫酸镍废料口下线库位id
+    public static final String LSN_FL_R_POINT = "10386";
 
     public void run() {
 
@@ -34,7 +34,7 @@ public class AutoButtonBoxTask03 {
     }
 
     public void buttonTask01(ButtonBoxClient.BUTTON_BOX_NO button_box_no) {
-        log.info("硫酸镍废料退空-按钮已经被按下");
+        log.info("硫酸镍废料口退空-按钮已经被按下");
         AjaxResult ajaxResult = agvCallProxyService.accessoriesReturnEmptyLSN(LSN_FL_R_POINT, null
                 , "按钮盒");
         if (!ajaxResult.isSuccess()) {

warewms-hard/src/main/java/com/ruoyi/hard/modbus/tcp/ButtonBoxClient.java

@@ -76,15 +76,15 @@ public class ButtonBoxClient {
          */
         A("1"),
         /***
-         * 硫酸镍废料
+         * 氯化镍废料口
          */
         B("2"),
         /***
-         * 氯化镍废料
+         * 硫酸镍废料口退空
          */
         C("3"),
         /***
-         * 硫酸镍废料退空
+         * 硫酸镍废料口
          */
         D("4");