Browse Source

agv相关接口

LZH 1 year ago
parent
commit
67367d95e7

+ 23 - 6
ruoyi-admin/src/main/java/com/ruoyi/xuankuang/controller/WmsToWcsApiController.java

@@ -4,12 +4,10 @@ package com.ruoyi.xuankuang.controller;
 import com.ruoyi.ams.xuankuang.service.WmsDocAsnSubService;
 import com.ruoyi.ams.xuankuang.service.WmsDocAsnSubService;
 import com.ruoyi.ams.xuankuang.service.WmsDocOrderSubService;
 import com.ruoyi.ams.xuankuang.service.WmsDocOrderSubService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.AjaxResult;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 @RestController
 @RestController
 @RequestMapping("/Wms/Wcs")
 @RequestMapping("/Wms/Wcs")
@@ -18,16 +16,35 @@ public class WmsToWcsApiController {
     private WmsDocAsnSubService wmsDocAsnSubService;
     private WmsDocAsnSubService wmsDocAsnSubService;
     @Autowired
     @Autowired
     private WmsDocOrderSubService wmsDocOrderSubService;
     private WmsDocOrderSubService wmsDocOrderSubService;
-
+    //入库单同步
     @PreAuthorize("@ss.hasPermi('docAsn:docAsn:push')")
     @PreAuthorize("@ss.hasPermi('docAsn:docAsn:push')")
     @GetMapping(value = "/queryDocAsnDetails/{asnNo}")
     @GetMapping(value = "/queryDocAsnDetails/{asnNo}")
     public AjaxResult queryDocAsnDetails(@PathVariable("asnNo") String asnNo){
     public AjaxResult queryDocAsnDetails(@PathVariable("asnNo") String asnNo){
         return wmsDocAsnSubService.queryDocAsnDetails(asnNo);
         return wmsDocAsnSubService.queryDocAsnDetails(asnNo);
     }
     }
-
+    //出库单同步
     @PreAuthorize("@ss.hasPermi('docOrder:docOrder:push')")
     @PreAuthorize("@ss.hasPermi('docOrder:docOrder:push')")
     @GetMapping(value = "/queryDocOrderDetails/{orderNo}")
     @GetMapping(value = "/queryDocOrderDetails/{orderNo}")
     public AjaxResult queryDocOrderDetails(@PathVariable("orderNo") String orderNo){
     public AjaxResult queryDocOrderDetails(@PathVariable("orderNo") String orderNo){
         return wmsDocOrderSubService.initOrderDetails(orderNo);
         return wmsDocOrderSubService.initOrderDetails(orderNo);
     }
     }
+    //agv入库任务下发
+    @ApiOperation("入库任务下发")
+    @PostMapping(value = "/agvInTask/{asnNo}")
+    public AjaxResult agvInTask(@PathVariable("asnNo") String asnNo){
+        return wmsDocAsnSubService.agvInTask(asnNo);
+    }
+    //agv回调wcs卸货完成
+    @ApiOperation("回调卸货完成")
+    @GetMapping(value = "/wmsAgvCallbackIntask/{taskNo}")
+    public AjaxResult wmsAgvCallbackIntask(@PathVariable("taskNo") String taskNo){
+        return wmsDocAsnSubService.wmsAgvCallbackIntask(taskNo);
+    }
+
+    //agv回调wcs取货完成
+    @ApiOperation("回调取货完成")
+    @GetMapping(value = "/wmsAgvCallbackOuttask/{wcsId}")
+    public AjaxResult wmsAgvCallbackOuttask(@PathVariable("wcsId") String wcsId){
+        return wmsDocAsnSubService.wmsAgvCallbackOuttask(wcsId);
+    }
 }
 }

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

@@ -43,6 +43,14 @@ public class Constant {
 //    public static final String WCS_TASK_URL1 = "http://localhost:8008/test/wcs/test2";
 //    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";
     public static final String WCS_TASK_URL2 = "http://localhost:8082/adaptor/wms/callback/bbm";
+    //工单任务取消接口
+    public static final String WCS_TASK_URL3 = "http://localhost:8082/adaptor/wms/bill/cancel";
+    // WCS智库 agv入库任务下发
+    public static final String WCS_TASK_URL4 = "http://localhost:8082/adaptor/agv/in/task";
+    // WCS智库 agv回调wcs卸货完成
+    public static final String WCS_TASK_URL5 = "http://localhost:8082/adaptor/agv/callback/intask?taskNo=";
+    // WCS智库 agv回调wcs取货完成
+    public static final String WCS_TASK_URL6 = "http://localhost:8082/adaptor/agv/callback/outtask?wcsId=";
 
 
     /**
     /**
      * 产线编号
      * 产线编号