Browse Source

搅拌槽代码修改

LZH 1 year ago
parent
commit
714694a2cf

+ 6 - 0
ruoyi-admin/src/main/java/com/ruoyi/xuankuang/controller/test/TankTestController.java

@@ -426,6 +426,12 @@ public class TankTestController {
         return beltLine.readState();
     }
 
+    @ApiOperation("读状态")
+    @GetMapping("/readMechanicalState")
+    public Number readMechanicalState() {
+        return beltLine.readMechanicalState();
+    }
+
     @ApiOperation("写心跳")
     @PostMapping("/writeHeart")
     public Boolean writeHeart(int i) {

+ 1 - 1
warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/service/StirringTankClientService.java

@@ -438,7 +438,7 @@ public class StirringTankClientService {
      * @return
      */
     public AjaxResult clear() {
-        boolean[] booleans = stirringTankClient.readTank16();
+        boolean[] booleans = stirringTankClient.writeTank03_Read();
         if (booleans[15] = true) {
             stirringTankClient.writeTank01f();
             stirringTankClient.writeTank02f();

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

@@ -654,6 +654,17 @@ public class StirringTankClient {
         return write(WRITE_THE_STIRRING_TANK_03.getSlaveId(), WRITE_THE_STIRRING_TANK_03.getOffset(), i);
     }
 
+    /**
+     * 读仓库收到请求已经开始注药
+     *
+     * @return
+     */
+    public boolean[] writeTank03_Read() {
+        Number number = read1(READ_THE_REPOSITORY_03.getSlaveId(), READ_THE_REPOSITORY_03.getOffset());
+        boolean[] booleans = ConvertUtil.convertToBooleans(number);
+        return booleans;
+    }
+
     /**
      * 清除写仓库收到请求已经开始碳酸钠注药
      *