破袋机相关接口完善

ruoyi-admin/src/main/java/com/ruoyi/xuankuang/controller/WcsToWmsApiController.java

@@ -59,7 +59,7 @@ public class WcsToWmsApiController {
     @ApiOperation("破袋机开启通知")
     @PostMapping("/lineOpenNotification")
     public AjaxResult lineOpenNotification(@RequestBody LineOpenNotificationForm lineOpenNotificationForm) {
-        return AjaxResult.success("");
+        return wcsToWmsApiService.lineOpenNotification(lineOpenNotificationForm);
     }
 
     /**

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

@@ -1,8 +1,10 @@
 package com.ruoyi.xuankuang.controller.test;
 
 import com.ruoyi.ams.xuankuang.service.StirringTankClientService;
+import com.ruoyi.ams.xuankuang.service.WcsToWmsApiService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.hard.xuankang.StirringTankClient;
+import com.ruoyi.hard.xuankang.BeltLineClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
@@ -26,105 +28,109 @@ public class TankTestController {
     StirringTankClient stirringTankClient;
     @Autowired
     StirringTankClientService stirringTankClientService;
+    @Autowired
+    WcsToWmsApiService wcsToWmsApiService;
+    @Autowired
+    BeltLineClient beltLine;
 
     @ApiOperation("读碳酸钠搅拌槽液位")
     @GetMapping("/readTank01")
-    public Number readTank01(){
+    public Number readTank01() {
         return stirringTankClient.readTank01();
     }
 
     @ApiOperation("读丁黄药搅拌槽液位")
     @GetMapping("/readTank02")
-    public Number  readTank02(){
+    public Number readTank02() {
         return stirringTankClient.readTank02();
     }
 
     @ApiOperation("读丁铵黑药搅拌槽液位")
     @GetMapping("/readTank03")
-    public Number  readTank03(){
+    public Number readTank03() {
         return stirringTankClient.readTank03();
     }
 
     @ApiOperation("读六偏磷酸钠搅拌槽液位")
     @GetMapping("/readTank04")
-    public Number readTank04(){
+    public Number readTank04() {
         return stirringTankClient.readTank04();
     }
 
     @ApiOperation("读硫酸铵搅拌槽液位")
     @GetMapping("/readTank05")
-    public Number  readTank05(){
+    public Number readTank05() {
         return stirringTankClient.readTank05();
     }
 
     @ApiOperation("读乙黄药搅拌槽液位")
     @GetMapping("/readTank06")
-    public Number  readTank06(){
+    public Number readTank06() {
         return stirringTankClient.readTank06();
     }
-//
+
+    //
     @ApiOperation("读碳酸钠药剂量")
     @GetMapping("/readTank07")
-    public Number readTank07(){
+    public Number readTank07() {
         return stirringTankClient.readTank07();
     }
 
     @ApiOperation("读丁黄药药剂量")
     @GetMapping("/readTank08")
-    public Number  readTank08(){
+    public Number readTank08() {
         return stirringTankClient.readTank08();
     }
 
     @ApiOperation("读丁铵黑药药剂量")
     @GetMapping("/readTank09")
-    public Number  readTank09(){
+    public Number readTank09() {
         return stirringTankClient.readTank09();
     }
 
     @ApiOperation("读六偏磷酸钠药剂量")
     @GetMapping("/readTank10")
-    public Number readTank10(){
+    public Number readTank10() {
         return stirringTankClient.readTank10();
     }
 
     @ApiOperation("读硫酸铵药剂量")
     @GetMapping("/readTank11")
-    public Number  readTank11(){
+    public Number readTank11() {
         return stirringTankClient.readTank11();
     }
 
     @ApiOperation("读乙黄药药剂量")
     @GetMapping("/readTank12")
-    public Number  readTank12(){
+    public Number readTank12() {
         return stirringTankClient.readTank12();
     }
 
     @ApiOperation("读仓库是否可以完成该剂量的注入标志位")
     @GetMapping("/readTank13")
-    public boolean[]  readTank13(){
+    public boolean[] readTank13() {
         return stirringTankClient.readTank13();
     }
 
     @ApiOperation("读药剂注入请求")
     @GetMapping("/readTank14")
-    public boolean[]  readTank14(){
+    public boolean[] readTank14() {
         return stirringTankClient.readTank14();
     }
 
     @ApiOperation("读碳酸钠搅拌槽运行")
     @GetMapping("/readTank15")
-    public boolean[]  readTank15(){
+    public boolean[] readTank15() {
         return stirringTankClient.readTank15();
     }
 
     @ApiOperation("读碳酸钠确认开始生产")
     @GetMapping("/readTank16")
-    public boolean[]  readTank16(){
+    public boolean[] readTank16() {
         return stirringTankClient.readTank16();
     }
 
 
-
     @ApiOperation("写仓库无法完成碳酸钠注药量")
     @PostMapping("/writeTank01")
     public Boolean writeTank01() {
@@ -314,33 +320,134 @@ public class TankTestController {
 
     @ApiOperation("对比丁黄药库存")
     @PostMapping("/matchInventory_2")
-    public boolean matchInventory_2(){
+    public boolean matchInventory_2() {
         return stirringTankClientService.matchInventory_2();
     }
 
     @ApiOperation("对比丁铵黑药库存")
     @PostMapping("/matchInventory_3")
-    public boolean matchInventory_3(){
+    public boolean matchInventory_3() {
         return stirringTankClientService.matchInventory_3();
     }
 
     @ApiOperation("对比六偏磷酸钠库存")
     @PostMapping("/matchInventory_4")
-    public boolean matchInventory_4(){
+    public boolean matchInventory_4() {
         return stirringTankClientService.matchInventory_4();
     }
 
     @ApiOperation("对比硫酸铵库存")
     @PostMapping("/matchInventory_5")
-    public boolean matchInventory_5(){
+    public boolean matchInventory_5() {
         return stirringTankClientService.matchInventory_5();
     }
 
     @ApiOperation("对比乙黄药库存")
     @PostMapping("matchInventory_6")
-    public boolean matchInventory_6(){
+    public boolean matchInventory_6() {
         return stirringTankClientService.matchInventory_6();
     }
 
+    @ApiOperation("正常关闭1号拆包机")
+    @PostMapping("turnOffTheUnpacker")
+    public AjaxResult turnOffTheUnpacker() {
+        return wcsToWmsApiService.turnOffTheUnpacker();
+    }
+
+    @ApiOperation("正常关闭2号拆包机")
+    @PostMapping("turnOffTheUnpacker1")
+    public AjaxResult turnOffTheUnpacker1() {
+        return wcsToWmsApiService.turnOffTheUnpacker1();
+    }
+
+    @ApiOperation("正常关闭3号拆包机")
+    @PostMapping("turnOffTheUnpacker2")
+    public AjaxResult turnOffTheUnpacker2() {
+        return wcsToWmsApiService.turnOffTheUnpacker2();
+    }
+
+    @ApiOperation("正常关闭4号拆包机")
+    @PostMapping("turnOffTheUnpacker3")
+    public AjaxResult turnOffTheUnpacker3() {
+        return wcsToWmsApiService.turnOffTheUnpacker3();
+    }
+
+    @ApiOperation("正常关闭5号拆包机")
+    @PostMapping("turnOffTheUnpacker4")
+    public AjaxResult turnOffTheUnpacker4() {
+        return wcsToWmsApiService.turnOffTheUnpacker4();
+    }
+
+    @ApiOperation("异常关闭1号拆包机")
+    @PostMapping("turnOffTheUnpackererror")
+    public AjaxResult turnOffTheUnpackererror() {
+        return wcsToWmsApiService.turnOffTheUnpackererror();
+    }
+
+    @ApiOperation("异常关闭2号拆包机")
+    @PostMapping("turnOffTheUnpackererror1")
+    public AjaxResult turnOffTheUnpackererror1() {
+        return wcsToWmsApiService.turnOffTheUnpackererror1();
+    }
+
+    @ApiOperation("异常关闭3号拆包机")
+    @PostMapping("turnOffTheUnpackererror2")
+    public AjaxResult turnOffTheUnpackererror2() {
+        return wcsToWmsApiService.turnOffTheUnpackererror2();
+    }
 
+    @ApiOperation("异常关闭4号拆包机")
+    @PostMapping("turnOffTheUnpackererror3")
+    public AjaxResult turnOffTheUnpackererror3() {
+        return wcsToWmsApiService.turnOffTheUnpackererror3();
+    }
+
+    @ApiOperation("异常关闭5号拆包机")
+    @PostMapping("turnOffTheUnpackererror5")
+    public AjaxResult turnOffTheUnpackererror5() {
+        return wcsToWmsApiService.turnOffTheUnpackererror4();
+    }
+
+
+    @ApiOperation("读输送线心跳")
+    @GetMapping("/readHeart")
+    public Number readHeart() {
+        return beltLine.ReadHeartbeat();
+    }
+
+    @ApiOperation("读模式")
+    @GetMapping("/readMode")
+    public Number readMode() {
+        return beltLine.readMode();
+    }
+
+    @ApiOperation("读状态")
+    @GetMapping("/readState")
+    public Number readState() {
+        return beltLine.readState();
+    }
+
+    @ApiOperation("写心跳")
+    @PostMapping("/writeHeart")
+    public Boolean writeHeart(int i) {
+        return beltLine.writeHeartbeat(i);
+    }
+
+    @ApiOperation("写模式")
+    @PostMapping("/writeMode")
+    public Boolean writeMode(int i) {
+        return beltLine.writeMode(i);
+    }
+
+    @ApiOperation("写状态")
+    @PostMapping("/writeState")
+    public Boolean writeState(int i) {
+        return beltLine.writeState(i);
+    }
+
+    @ApiOperation("写通过方向")
+    @PostMapping("/writeDirection")
+    public Boolean writeDirection(int i) {
+        return beltLine.writeDirection(i);
+    }
 }

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

@@ -10,9 +10,7 @@ import com.ruoyi.ams.inv.service.IInvLotLocIdService;
 import com.ruoyi.ams.order.domain.WmsDocOrderDetails;
 import com.ruoyi.ams.task.domain.WcsTask;
 import com.ruoyi.ams.task.service.IWcsTaskService;
-import com.ruoyi.ams.xuankuang.domain.form.EmptyPalletLocForm;
-import com.ruoyi.ams.xuankuang.domain.form.StackingCompletionForm;
-import com.ruoyi.ams.xuankuang.domain.form.TaskStatusForm;
+import com.ruoyi.ams.xuankuang.domain.form.*;
 import com.ruoyi.ams.xuankuang.domain.vo.LocationCoordinateVo;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.base.domain.BaseLocationInfo;
@@ -22,6 +20,8 @@ import com.ruoyi.base.service.IBaseLocationInfoService;
 import com.ruoyi.base.service.IBaseSkuService;
 import com.ruoyi.base.utils.IdSequenceUtils;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.hard.xuankang.StirringTankClient;
+import com.ruoyi.hard.xuankang.UnpackingMachineSubClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -61,6 +61,12 @@ public class WcsToWmsApiService {
     private WmsDocAsnDetailsMapper wmsDocAsnDetailsMapper;
     @Autowired
     private IdSequenceUtils idSequenceUtils;
+    @Autowired
+    private StirringTankClient stirringTankClient;
+    @Autowired
+    private UnpackingMachineSubClient unpackingMachineSubClient;
+    @Autowired
+    private WmsToWcsApiService wmsToWcsApiService;
 
     /**
      * 组盘上报
@@ -86,7 +92,7 @@ public class WcsToWmsApiService {
         String wcsNo = stackingCompletion.getWcsNo();
 
 
-        if (asnNo.equals("")){
+        if (asnNo.equals("")) {
             AjaxResult ajaxResult1 = generateAShippingOrder(sku, new BigDecimal(qty));
             // 判重
             WcsTask wcsTaskQuery = new WcsTask();
@@ -322,6 +328,7 @@ public class WcsToWmsApiService {
 
     /**
      * 生成入库单
+     *
      * @param sku
      * @param qty
      * @return
@@ -354,4 +361,205 @@ public class WcsToWmsApiService {
         wmsDocAsnDetailsMapper.insertWmsDocAsnDetails(wmsDocAsnDetails);
         return AjaxResult.success("操作成功！", asnNo);
     }
+
+    /**
+     * 拆包机开启接口
+     * @param lineOpenNotificationForm
+     * @return
+     */
+    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();
+    }
+
+    /**
+     * 正常关闭1号拆包机
+     *
+     * @return
+     */
+    public AjaxResult turnOffTheUnpacker() {
+        //写仓库注入碳酸钠完成
+        stirringTankClient.writeTank05();
+        //写关闭拆包机信号
+        unpackingMachineSubClient.writeV141_2();
+        return AjaxResult.success();
+    }
+
+    /**
+     * 正常关闭2号拆包机
+     *
+     * @return
+     */
+    public AjaxResult turnOffTheUnpacker1() {
+        //写仓库注入丁黄药完成
+        stirringTankClient.writeTank05_1();
+        //写关闭拆包机信号
+        unpackingMachineSubClient.writeV141_3();
+        return AjaxResult.success();
+    }
+
+    /**
+     * 正常关闭3号拆包机
+     *
+     * @return
+     */
+    public AjaxResult turnOffTheUnpacker2() {
+        //写仓库注入六偏磷酸钠完成
+        stirringTankClient.writeTank05_3();
+        //写关闭拆包机信号
+        unpackingMachineSubClient.writeV141_4();
+        return AjaxResult.success();
+    }
+
+    /**
+     * 正常关闭4号拆包机
+     *
+     * @return
+     */
+    public AjaxResult turnOffTheUnpacker3() {
+        //写仓库注入硫酸铵完成
+        stirringTankClient.writeTank05_4();
+        //写关闭拆包机信号
+        unpackingMachineSubClient.writeV141_5();
+        return AjaxResult.success();
+    }
+
+    /**
+     * 正常关闭5号拆包机
+     *
+     * @return
+     */
+    public AjaxResult turnOffTheUnpacker4() {
+        //写仓库注入乙黄药完成
+        stirringTankClient.writeTank05_5();
+        //写关闭拆包机信号
+        unpackingMachineSubClient.writeV141_6();
+        return AjaxResult.success();
+    }
+    /**
+     * 异常关闭1号拆包机
+     *
+     * @return
+     */
+    public AjaxResult turnOffTheUnpackererror() {
+        //写仓库注入碳酸钠失败
+        stirringTankClient.writeTank04();
+        stirringTankClient.writeTank05f();
+        //写关闭拆包机信号
+        unpackingMachineSubClient.writeV141_2();
+        return AjaxResult.success();
+    }
+
+    /**
+     * 异常关闭2号拆包机
+     *
+     * @return
+     */
+    public AjaxResult turnOffTheUnpackererror1() {
+        //写仓库注入丁黄药失败
+        stirringTankClient.writeTank04_1();
+        stirringTankClient.writeTank05_1f();
+        unpackingMachineSubClient.writeV141_3();
+        return AjaxResult.success();
+    }
+
+    /**
+     * 异常关闭3号拆包机
+     *
+     * @return
+     */
+    public AjaxResult turnOffTheUnpackererror2() {
+        //写仓库注入六偏磷酸钠失败
+        stirringTankClient.writeTank04_3();
+        stirringTankClient.writeTank05_3f();
+        unpackingMachineSubClient.writeV141_4();
+        return AjaxResult.success();
+    }
+
+    /**
+     * 异常关闭4号拆包机
+     *
+     * @return
+     */
+    public AjaxResult turnOffTheUnpackererror3() {
+        //写仓库注入硫酸铵失败
+        stirringTankClient.writeTank04_4();
+        stirringTankClient.writeTank05_4f();
+        unpackingMachineSubClient.writeV141_5();
+        return AjaxResult.success();
+    }
+
+    /**
+     * 异常关闭5号拆包机
+     *
+     * @return
+     */
+    public AjaxResult turnOffTheUnpackererror4() {
+        //写仓库注入乙黄药失败
+        stirringTankClient.writeTank04_5();
+        stirringTankClient.writeTank05_5f();
+        unpackingMachineSubClient.writeV141_6();
+        return AjaxResult.success();
+    }
 }

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

@@ -68,7 +68,7 @@ public class WmsToWcsApiService {
         String r = "";
         WcsResponseVo wcsResponseVo = new WcsResponseVo();
         try {
-            r = HttpRequest.postData(Constant.WCS_TASK_URL, json);
+            r = HttpRequest.postData(Constant.WCS_TASK_URL2, json);
             wcsResponseVo = JSON.parseObject(r, WcsResponseVo.class);
         } catch (Exception e) {
             log.error("wms开启破袋机回调接口失败: ", e);

warewms-base/src/main/java/com/ruoyi/base/constant/Constant.java

@@ -36,11 +36,13 @@ public class Constant {
 
 
     //region WCS智库 工单下发
-//    public static final String WCS_TASK_URL = "http://localhost:8082/adaptor/wms/bill";
-    public static final String WCS_TASK_URL = "http://localhost:8008/test/wcs/test1";
+    public static final String WCS_TASK_URL = "http://localhost:8082/adaptor/wms/bill";
+//    public static final String WCS_TASK_URL = "http://localhost:8008/test/wcs/test1";
     //出库任务下发
-//    public static final String WCS_TASK_URL1 = "http://localhost:8082/gsjc/wms/out/task";
-    public static final String WCS_TASK_URL1 = "http://localhost:8008/test/wcs/test2";
+    public static final String WCS_TASK_URL1 = "http://localhost:8082/adaptor/wms/out/task";
+//    public static final String WCS_TASK_URL1 = "http://localhost:8008/test/wcs/test2";
+    //开启破袋机回调接口
+    public static final String WCS_TASK_URL2 = "http://localhost:8082/adaptor/wms/callback/bbm";
 
     /**
      * 产线编号