Pārlūkot izejas kodu

关闭拆包机接口暴露

zhangxin 1 gadu atpakaļ
vecāks
revīzija
153b9b89a8

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

@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 /**
  * WCS调WMS接口
  *
@@ -82,6 +84,21 @@ public class WcsToWmsApiController {
         return ajaxResult;
     }
 
+    /**
+     * 通知WMS关闭拆包机
+     *
+     * @param lineOpenNotificationForm
+     * @return
+     */
+    @ApiOperation("通知WMS关闭拆包机")
+    @PostMapping("/turnOffTheUnpacker")
+    public AjaxResult turnOffTheUnpacker(@RequestBody @Valid LineOpenNotificationForm lineOpenNotificationForm) {
+        log.info("WcsToWmsApiController - turnOffTheUnpacker request lineOpenNotificationForm is :{}, time is :{}", JSONObject.toJSONString(lineOpenNotificationForm), DateUtils.getTime());
+        AjaxResult ajaxResult = wcsToWmsApiService.turnOffTheUnpacker(lineOpenNotificationForm);
+        log.info("WcsToWmsApiController - turnOffTheUnpacker response ajaxResult is :{}, time is :{}", JSONObject.toJSONString(ajaxResult), DateUtils.getTime());
+        return ajaxResult;
+    }
+
     /**
      * 空托出入库请求仓位接口
      *

+ 3 - 0
warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/domain/form/LineOpenNotificationForm.java

@@ -1,5 +1,7 @@
 package com.ruoyi.ams.xuankuang.domain.form;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 开启破袋机
  */
@@ -7,6 +9,7 @@ public class LineOpenNotificationForm {
     /**
      * 破袋机输送线id
      */
+    @NotBlank(message = "id不能为空")
     private String lineId;
 
     public LineOpenNotificationForm() {

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

@@ -22,6 +22,7 @@ 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.common.exception.base.BaseException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.hard.xuankang.StirringTankClient;
 import com.ruoyi.hard.xuankang.UnpackingMachineSubClient;
@@ -377,6 +378,23 @@ public class WcsToWmsApiService {
         return unpackingMachineFacade.unpackingMachineOpen(lineId, booleans) ? AjaxResult.success() : AjaxResult.error();
     }
 
+    public AjaxResult turnOffTheUnpacker(LineOpenNotificationForm lineOpenNotificationForm){
+        switch (lineOpenNotificationForm.getLineId()) {
+            case "1":
+                return turnOffTheUnpacker();
+            case "2":
+                return turnOffTheUnpacker1();
+            case "3":
+                return turnOffTheUnpacker2();
+            case "4":
+                return turnOffTheUnpacker3();
+            case "5":
+                return turnOffTheUnpacker4();
+            default:
+                throw new BaseException("lineId is not exist ......");
+        }
+    }
+
     /**
      * 正常关闭1号拆包机
      *