拆包机bug修复

warewms-ams/pom.xml

@@ -25,6 +25,11 @@
             <artifactId>warewms-hard</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/facade/IUnpackingMachineFacade.java

@@ -0,0 +1,6 @@
+package com.ruoyi.ams.xuankuang.facade;
+
+public interface IUnpackingMachineFacade {
+
+    Boolean unpackingMachineOpen(String lineId, boolean[] booleans);
+}

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/facade/impl/UnpackingMachineFacadeImpl.java

@@ -0,0 +1,91 @@
+package com.ruoyi.ams.xuankuang.facade.impl;
+
+import com.ruoyi.ams.xuankuang.domain.form.CallbackBbmForm;
+import com.ruoyi.ams.xuankuang.facade.IUnpackingMachineFacade;
+import com.ruoyi.ams.xuankuang.service.WmsToWcsApiService;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.hard.xuankang.StirringTankClient;
+import com.ruoyi.hard.xuankang.UnpackingMachineSubClient;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class UnpackingMachineFacadeImpl implements IUnpackingMachineFacade {
+
+    @Autowired
+    private StirringTankClient stirringTankClient;
+
+    @Autowired
+    private UnpackingMachineSubClient unpackingMachineSubClient;
+
+    @Autowired
+    private WmsToWcsApiService wmsToWcsApiService;
+
+    @Override
+    public Boolean unpackingMachineOpen(String lineId, boolean[] booleans){
+        verifyLineOpenStatus(lineId, booleans);
+        unpackingMachineSubClientWrite(lineId);
+        wmsCallback(lineId);
+        //写仓库收到请求已经开始碳酸钠注药
+        stirringTankClientWrite(lineId);
+        return Boolean.TRUE;
+    }
+
+    private Boolean verifyLineOpenStatus(String lineId, boolean[] booleans) {
+        switch (lineId) {
+            case "1":
+                return booleans[15];
+            case "2":
+                return booleans[14];
+            case "3":
+                return booleans[12];
+            case "4":
+                return booleans[11];
+            case "5":
+                return booleans[10];
+            default:
+                throw new BaseException("拆包机验证失败");
+        }
+    }
+
+    private Boolean unpackingMachineSubClientWrite(String lineId){
+        switch (lineId) {
+            case "1":
+                return unpackingMachineSubClient.writeV140_5();
+            case "2":
+                return unpackingMachineSubClient.writeV140_6();
+            case "3":
+                return unpackingMachineSubClient.writeV140_7();
+            case "4":
+                return unpackingMachineSubClient.writeV141_0();
+            case "5":
+                return unpackingMachineSubClient.writeV141_1();
+            default:
+                throw new BaseException("拆包机启动失败");
+        }
+    }
+
+    private Boolean wmsCallback(String lineId){
+        CallbackBbmForm callbackBbmForm = new CallbackBbmForm();
+        callbackBbmForm.setBbmId(lineId);
+        return wmsToWcsApiService.wmsCallbackBbmTask(callbackBbmForm).isSuccess();
+    }
+
+    private Boolean stirringTankClientWrite(String lineId){
+        switch (lineId) {
+            case "1":
+                return stirringTankClient.writeTank03();
+            case "2":
+                return stirringTankClient.writeTank03_1();
+            case "3":
+                return stirringTankClient.writeTank03_2();
+            case "4":
+                return stirringTankClient.writeTank03_4();
+            case "5":
+                return stirringTankClient.writeTank03_5();
+            default:
+                throw new BaseException("注药失败");
+        }
+    }
+
+
+
+}

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/service/WcsToWmsApiService.java

@@ -12,6 +12,7 @@ import com.ruoyi.ams.task.domain.WcsTask;
 import com.ruoyi.ams.task.service.IWcsTaskService;
 import com.ruoyi.ams.xuankuang.domain.form.*;
 import com.ruoyi.ams.xuankuang.domain.vo.LocationCoordinateVo;
+import com.ruoyi.ams.xuankuang.facade.IUnpackingMachineFacade;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.domain.vo.BaseLocationLotattVO;
@@ -65,8 +66,9 @@ public class WcsToWmsApiService {
     private StirringTankClient stirringTankClient;
     @Autowired
     private UnpackingMachineSubClient unpackingMachineSubClient;
+
     @Autowired
-    private WmsToWcsApiService wmsToWcsApiService;
+    private IUnpackingMachineFacade unpackingMachineFacade;
     @Autowired
     private IWcsTaskService wcsTaskService;
     @Autowired
@@ -367,69 +369,10 @@ public class WcsToWmsApiService {
     public AjaxResult lineOpenNotification(LineOpenNotificationForm lineOpenNotificationForm) {
         String lineId = lineOpenNotificationForm.getLineId();
         boolean[] booleans = stirringTankClient.readTank14();
-        if (lineId.equals("1")) {
-            if (booleans[15] = true) {
-                //一号拆包机启动——碳酸钠
-                unpackingMachineSubClient.writeV140_5();
-                CallbackBbmForm callbackBbmForm = new CallbackBbmForm();
-                callbackBbmForm.setBbmId(lineId);
-                wmsToWcsApiService.wmsCallbackBbmTask(callbackBbmForm);
-                //写仓库收到请求已经开始碳酸钠注药
-                stirringTankClient.writeTank03();
-                return AjaxResult.success();
-            }
-        }
-        if (lineId.equals("2")) {
-            if (booleans[14] = true) {
-                //二号拆包机启动——丁黄药
-                unpackingMachineSubClient.writeV140_6();
-                CallbackBbmForm callbackBbmForm = new CallbackBbmForm();
-                callbackBbmForm.setBbmId(lineId);
-                wmsToWcsApiService.wmsCallbackBbmTask(callbackBbmForm);
-                //写仓库收到请求已经开始丁黄药注药
-                stirringTankClient.writeTank03_1();
-                return AjaxResult.success();
-            }
-        }
-        if (lineId.equals("3")) {
-            if (booleans[12] = true) {
-                //三号拆包机启动——六偏磷酸钠
-                unpackingMachineSubClient.writeV140_7();
-                CallbackBbmForm callbackBbmForm = new CallbackBbmForm();
-                callbackBbmForm.setBbmId(lineId);
-                wmsToWcsApiService.wmsCallbackBbmTask(callbackBbmForm);
-                //写仓库收到请求已经开始六偏磷酸钠注药
-                stirringTankClient.writeTank03_2();
-                return AjaxResult.success();
-            }
-        }
-        if (lineId.equals("4")) {
-            if (booleans[11] = true) {
-                //四号拆包机启动——硫酸铵
-                unpackingMachineSubClient.writeV141_0();
-                CallbackBbmForm callbackBbmForm = new CallbackBbmForm();
-                callbackBbmForm.setBbmId(lineId);
-                wmsToWcsApiService.wmsCallbackBbmTask(callbackBbmForm);
-                //写仓库收到请求已经开始硫酸铵注药
-                stirringTankClient.writeTank03_4();
-                return AjaxResult.success();
-            }
-        }
-        if (lineId.equals("5")) {
-            if (booleans[10] = true) {
-                //五号拆包机启动——乙黄药
-                unpackingMachineSubClient.writeV141_1();
-                CallbackBbmForm callbackBbmForm = new CallbackBbmForm();
-                callbackBbmForm.setBbmId(lineId);
-                wmsToWcsApiService.wmsCallbackBbmTask(callbackBbmForm);
-                //写仓库收到请求已经开始乙黄药注药
-                stirringTankClient.writeTank03_5();
-                return AjaxResult.success();
-            }
-        }
-        return AjaxResult.success();
+        return unpackingMachineFacade.unpackingMachineOpen(lineId, booleans) ? AjaxResult.success() : AjaxResult.error();
     }
 
+
     /**
      * 正常关闭1号拆包机
      *

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/service/WmsToWcsApiService.java

@@ -4,11 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.ruoyi.ams.xuankuang.domain.form.*;
 import com.ruoyi.ams.xuankuang.domain.vo.WcsResponseVo;
 import com.ruoyi.base.constant.Constant;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.HttpMethod;
 import com.ruoyi.common.utils.http.HttpRequest;
 import com.ruoyi.common.utils.http.HttpUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.retry.annotation.Backoff;
+import org.springframework.retry.annotation.Retryable;
 import org.springframework.stereotype.Service;
 
 /**
@@ -65,6 +65,11 @@ public class WmsToWcsApiService {
      * @param callbackBbmForm
      * @return
      */
+    @Retryable(
+            maxAttempts = 4, //指定重试次数
+            //调用失败后，等待5s重试，后面重试间隔依次变为原来的2倍
+            backoff = @Backoff(delay = 5000, multiplier = 2)
+    )
     public WcsResponseVo wmsCallbackBbmTask(CallbackBbmForm callbackBbmForm) {
         String json = JSON.toJSONString(callbackBbmForm);
         String r = "";

warewms-hard/src/main/java/com/ruoyi/hard/xuankang/UnpackingMachineSubClient.java

@@ -1,15 +1,9 @@
 package com.ruoyi.hard.xuankang;
 
-import com.jwk.spring.boot.autoconfigure.ModbusTcpMasterTemplate;
-import com.jwk.spring.boot.constant.DATA_TYPE_WRAPPER;
-import com.jwk.spring.boot.modbus4j.ModbusMasterUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
-import static com.ruoyi.hard.xuankang.UnpackingMachineClient.REGISTER_CODE.*;
-
 
 /**
  * 拆包机通讯客户端