瀏覽代碼

modbusTcp——搅拌槽通讯

LZH 2 年之前
父節點
當前提交
b19e550775

+ 151 - 5
ruoyi-admin/src/main/java/com/ruoyi/xuankuang/controller/test/TankTestController.java

@@ -131,30 +131,181 @@ public class TankTestController {
         return stirringTankClient.writeTank01();
     }
 
+    @ApiOperation("写仓库无法完成丁黄药注药量")
+    @PostMapping("/writeTank01_1")
+    public Boolean writeTank01_1() {
+        return stirringTankClient.writeTank01_1();
+    }
+
+    @ApiOperation("写仓库无法完成丁铵黑药注药量")
+    @PostMapping("/writeTank01_2")
+    public Boolean writeTank01_2() {
+        return stirringTankClient.writeTank01_2();
+    }
+
+    @ApiOperation("写仓库无法完成六偏磷酸钠注药量")
+    @PostMapping("/writeTank01_3")
+    public Boolean writeTank01_3() {
+        return stirringTankClient.writeTank01_3();
+    }
+
+    @ApiOperation("写仓库无法完成硫酸铵注药量")
+    @PostMapping("/writeTank01_4")
+    public Boolean writeTank01_4() {
+        return stirringTankClient.writeTank01_4();
+    }
+
+    @ApiOperation("写仓库无法完成乙黄药注药量")
+    @PostMapping("/writeTank01_5")
+    public Boolean writeTank01_5() {
+        return stirringTankClient.writeTank01_5();
+    }
+
     @ApiOperation("写仓库确认可完成碳酸钠注药量")
     @PostMapping("/writeTank02")
     public Boolean writeTank02() {
         return stirringTankClient.writeTank02();
     }
 
+    @ApiOperation("写仓库确认可完成丁黄药注药量")
+    @PostMapping("/writeTank02_1")
+    public Boolean writeTank02_1() {
+        return stirringTankClient.writeTank02_1();
+    }
+
+    @ApiOperation("写仓库确认可完成丁铵黑药注药量")
+    @PostMapping("/writeTank02_2")
+    public Boolean writeTank02_2() {
+        return stirringTankClient.writeTank02_2();
+    }
+
+    @ApiOperation("写仓库确认可完成六偏磷酸钠注药量")
+    @PostMapping("/writeTank02_3")
+    public Boolean writeTank02_3() {
+        return stirringTankClient.writeTank02_3();
+    }
+
+    @ApiOperation("写仓库确认可完成硫酸铵注药量")
+    @PostMapping("/writeTank02_4")
+    public Boolean writeTank02_4() {
+        return stirringTankClient.writeTank02_4();
+    }
+
+    @ApiOperation("写仓库确认可完成乙黄药注药量")
+    @PostMapping("/writeTank02_5")
+    public Boolean writeTank02_5() {
+        return stirringTankClient.writeTank02_5();
+    }
+
+
     @ApiOperation("写仓库收到请求开始碳酸钠注药")
     @PostMapping("/writeTank03")
     public Boolean writeTank03() {
         return stirringTankClient.writeTank03();
     }
 
+    @ApiOperation("写仓库收到请求开始丁黄药注药")
+    @PostMapping("/writeTank03_1")
+    public Boolean writeTank03_1() {
+        return stirringTankClient.writeTank03_1();
+    }
+
+    @ApiOperation("写仓库收到请求开始丁铵黑药注药")
+    @PostMapping("/writeTank03_2")
+    public Boolean writeTank03_2() {
+        return stirringTankClient.writeTank03_2();
+    }
+
+    @ApiOperation("写仓库收到请求开六偏磷酸钠注药")
+    @PostMapping("/writeTank03_3")
+    public Boolean writeTank03_3() {
+        return stirringTankClient.writeTank03_3();
+    }
+
+    @ApiOperation("写仓库收到请求开始硫酸铵注药")
+    @PostMapping("/writeTank03_4")
+    public Boolean writeTank03_4() {
+        return stirringTankClient.writeTank03_4();
+    }
+
+    @ApiOperation("写仓库收到请求开始乙黄药注药")
+    @PostMapping("/writeTank03_5")
+    public Boolean writeTank03_5() {
+        return stirringTankClient.writeTank03_5();
+    }
+
     @ApiOperation("写仓库注入碳酸钠失败")
     @PostMapping("/writeTank04")
     public Boolean writeTank04() {
         return stirringTankClient.writeTank04();
     }
 
+    @ApiOperation("写仓库注入丁黄药失败")
+    @PostMapping("/writeTank04_1")
+    public Boolean writeTank04_1() {
+        return stirringTankClient.writeTank04_1();
+    }
+
+    @ApiOperation("写仓库注入丁铵黑药失败")
+    @PostMapping("/writeTank04_2")
+    public Boolean writeTank04_2() {
+        return stirringTankClient.writeTank04_2();
+    }
+
+    @ApiOperation("写仓库注入六偏磷酸钠失败")
+    @PostMapping("/writeTank04_3")
+    public Boolean writeTank04_3() {
+        return stirringTankClient.writeTank04_3();
+    }
+
+    @ApiOperation("写仓库注入硫酸铵失败")
+    @PostMapping("/writeTank04_4")
+    public Boolean writeTank04_4() {
+        return stirringTankClient.writeTank04_4();
+    }
+
+    @ApiOperation("写仓库注入乙黄药失败")
+    @PostMapping("/writeTank04_5")
+    public Boolean writeTank04_5() {
+        return stirringTankClient.writeTank04_5();
+    }
+
     @ApiOperation("写仓库注入碳酸钠完成")
     @PostMapping("/writeTank05")
     public Boolean writeTank05() {
         return stirringTankClient.writeTank05();
     }
 
+    @ApiOperation("写仓库注入丁黄药完成")
+    @PostMapping("/writeTank05_1")
+    public Boolean writeTank05_1() {
+        return stirringTankClient.writeTank05_1();
+    }
+
+    @ApiOperation("写仓库注入丁铵黑药完成")
+    @PostMapping("/writeTank05_2")
+    public Boolean writeTank05_2() {
+        return stirringTankClient.writeTank05_2();
+    }
+
+    @ApiOperation("写仓库注入六偏磷酸钠完成")
+    @PostMapping("/writeTank05_3")
+    public Boolean writeTank05_3() {
+        return stirringTankClient.writeTank05_3();
+    }
+
+    @ApiOperation("写仓库注入硫酸铵完成")
+    @PostMapping("/writeTank05_4")
+    public Boolean writeTank05_4() {
+        return stirringTankClient.writeTank05_4();
+    }
+
+    @ApiOperation("写仓库注入乙黄药完成")
+    @PostMapping("/writeTank05_5")
+    public Boolean writeTank05_5() {
+        return stirringTankClient.writeTank05_5();
+    }
+
     @ApiOperation("对比碳酸钠库存")
     @PostMapping("/matchInventory_1")
     public Boolean matchInventory_1() {
@@ -191,10 +342,5 @@ public class TankTestController {
         return stirringTankClientService.matchInventory_6();
     }
 
-    @ApiOperation("触发出库流程")
-    @PostMapping("/outbound_1")
-    public AjaxResult outbound_1() {
-        return stirringTankClientService.outbound_1();
-    }
 
 }

+ 1 - 3
warewms-hard/src/main/java/com/ruoyi/hard/xuankang/ConvertUtil.java

@@ -13,9 +13,7 @@ public class ConvertUtil {
         //转换为bool数组
         int i = num.intValue();
         String string = Integer.toBinaryString(i);
-        StringBuilder stringBuilder = new StringBuilder(string);
-        String string1 = stringBuilder.reverse().toString();
-        char[] chars = string1.toCharArray();
+        char[] chars = string.toCharArray();
         boolean[] booleans = new boolean[16];
         for (int j = 0; j < chars.length; j++) {
             if (chars[j] == 49) {

+ 1 - 1
warewms-hard/src/main/java/com/ruoyi/hard/xuankang/StirringTankClient.java

@@ -370,7 +370,7 @@ public class StirringTankClient {
     }
 
     /**
-     * 写仓库无法完成乙黄药注药量
+     * 写仓库无法完成乙黄药注药量
      *
      * @return
      */