1.规范项目代码规范

2.readme文件编写代码说明

README.md

@@ -1 +1,90 @@
-# 金川选矿
+> 金川选矿
+# WCS->接口
+
+```java
+/**
+ * WCS调WMS接口
+ *
+ * @author jwk
+ * @date 2023/04/03
+ */
+@RestController
+@RequestMapping("/edi/wcs")
+public class WcsToWmsApiController {
+}
+```
+
+# WMS调WCS方法
+
+```java
+/**
+ * @author HuKang
+ * @version 1.0
+ * @date 2023/3/30 15:42
+ */
+@Slf4j
+@Service
+public class WmsToWcsApiService {
+}
+```
+
+
+
+# 入库
+
+## 袋装入库
+
+### 创建入库单
+
+- 界面增加入库单
+
+### 同步入库单给WCS
+
+- 按钮同步给Wcs
+
+### 组盘上报
+
+- Wcs请求Wms入库，获取目标点位
+
+```java
+/**
+     * 组盘上报
+     *
+     * @param stackingCompletion
+     * @return
+     */
+    public AjaxResult stackingCompletion(StackingCompletionForm stackingCompletion) {
+        return AjaxResult.success();
+    }
+```
+
+
+
+### 接受WCS反馈，更新库存信息
+
+## 袋装越库
+
+### 同步入库越库单给WCS
+
+
+
+# 出库
+
+## 创建出库单
+
+## 同步出库单给WCS
+
+## 任务下发
+
+## 更新库存信息
+
+
+
+# 硬件对接
+
+## 拆包机
+
+## 搅拌槽
+
+## 打包机
+

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

@@ -1,16 +1,27 @@
 package com.ruoyi.xuankuang.controller;
 
 import com.ruoyi.ams.xuankuang.domain.form.*;
+import com.ruoyi.ams.xuankuang.service.WcsToWmsApiService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * WCS调WMS接口
+ *
+ * @author jwk
+ * @date 2023/04/03
+ */
 @RestController
 @RequestMapping("/edi/wcs")
-public class XuanKuangApiController {
+public class WcsToWmsApiController {
+
+    @Autowired
+    private WcsToWmsApiService wcsToWmsApiService;
 
 
     /**
@@ -24,7 +35,7 @@ public class XuanKuangApiController {
     @ApiOperation("组盘上报")
     @PostMapping("/stackingCompletion")
     public AjaxResult stackingCompletion(@RequestBody StackingCompletionForm stackingCompletion) {
-        return AjaxResult.success("仓位获取成功");
+        return wcsToWmsApiService.stackingCompletion(stackingCompletion);
     }
 
     /**

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

@@ -2,7 +2,7 @@ package com.ruoyi.xuankuang.controller.test;
 
 import com.ruoyi.ams.xuankuang.domain.form.*;
 import com.ruoyi.ams.xuankuang.domain.vo.WcsResponseVo;
-import com.ruoyi.ams.xuankuang.service.XuanKuangTaskApiService;
+import com.ruoyi.ams.xuankuang.service.WmsToWcsApiService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class XuanKuangTestApiController {
 
     @Autowired
-    private XuanKuangTaskApiService xuanKuangTaskApiService;
+    private WmsToWcsApiService WmsToWcsApiService;
 
     /**
      * wms出库任务下发接口
@@ -28,7 +28,7 @@ public class XuanKuangTestApiController {
     @ApiOperation("wms出库任务下发接口")
     @PostMapping("/wmsOutTask")
     public WcsResponseVo wmsOutTask(@RequestBody OutTaskForm outTaskForm) {
-        return xuanKuangTaskApiService.wmsOutTask(outTaskForm);
+        return WmsToWcsApiService.wmsOutTask(outTaskForm);
     }
 
     /**
@@ -39,7 +39,7 @@ public class XuanKuangTestApiController {
      */
     @ApiOperation("wms工单任务下发接口")
     @PostMapping("/billTaskForm")
-    public WcsResponseVo wmsBillTask(@RequestBody BillTaskForm billTaskForm) {return xuanKuangTaskApiService.wmsBillTask(billTaskForm);}
+    public WcsResponseVo wmsBillTask(@RequestBody BillTaskForm billTaskForm) {return WmsToWcsApiService.wmsBillTask(billTaskForm);}
 
     /**
      * wms开启破袋机回调接口
@@ -49,7 +49,7 @@ public class XuanKuangTestApiController {
      */
     @ApiOperation("wms开启破袋机回调接口")
     @PostMapping("/callbackBbmForm")
-    public WcsResponseVo wmsCallbackBbmTask(@RequestBody CallbackBbmForm callbackBbmForm) {return xuanKuangTaskApiService.wmsCallbackBbmTask(callbackBbmForm);}
+    public WcsResponseVo wmsCallbackBbmTask(@RequestBody CallbackBbmForm callbackBbmForm) {return WmsToWcsApiService.wmsCallbackBbmTask(callbackBbmForm);}
 
     /**
      * agv入库任务下发接口
@@ -59,7 +59,7 @@ public class XuanKuangTestApiController {
      */
     @ApiOperation("agv入库任务下发接口")
     @PostMapping("/agvInTaskForm")
-    public WcsResponseVo wmsAgvInTask(@RequestBody AgvInTaskForm agvInTaskForm) {return xuanKuangTaskApiService.wmsAgvInTask(agvInTaskForm);}
+    public WcsResponseVo wmsAgvInTask(@RequestBody AgvInTaskForm agvInTaskForm) {return WmsToWcsApiService.wmsAgvInTask(agvInTaskForm);}
 
     /**
      * agv回调wcs卸货完成
@@ -69,7 +69,7 @@ public class XuanKuangTestApiController {
      */
     @ApiOperation("agv回调wcs卸货完成")
     @PostMapping("/agvCallbackIntaskForm")
-    public WcsResponseVo wmsAgvCallbackIntask(String taskNo) {return xuanKuangTaskApiService.wmsAgvCallbackIntask(taskNo);}
+    public WcsResponseVo wmsAgvCallbackIntask(String taskNo) {return WmsToWcsApiService.wmsAgvCallbackIntask(taskNo);}
 
     /**
      * agv回调wcs货物取走接口
@@ -79,6 +79,6 @@ public class XuanKuangTestApiController {
      */
     @ApiOperation("agv回调wcs货物取走接口")
     @PostMapping("/agvCallbackOuttask")
-    public WcsResponseVo wmsAgvCallbackOuttask(String wcsId) {return xuanKuangTaskApiService.wmsAgvCallbackOuttask(wcsId);}
+    public WcsResponseVo wmsAgvCallbackOuttask(String wcsId) {return WmsToWcsApiService.wmsAgvCallbackOuttask(wcsId);}
 
 }

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

@@ -0,0 +1,29 @@
+package com.ruoyi.ams.xuankuang.service;
+
+import com.ruoyi.ams.xuankuang.domain.form.StackingCompletionForm;
+import com.ruoyi.common.core.domain.AjaxResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author HuKang
+ * @version 1.0
+ * @date 2023/3/30 15:42
+ */
+@Slf4j
+@Service
+public class WcsToWmsApiService {
+
+
+    /**
+     * 组盘上报
+     *
+     * @param stackingCompletion
+     * @return
+     */
+    public AjaxResult stackingCompletion(StackingCompletionForm stackingCompletion) {
+        return AjaxResult.success();
+    }
+
+
+}

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

@@ -5,6 +5,8 @@ import com.ruoyi.ams.asn.service.IWmsDocAsnHeaderService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
+ * 入库业务
+ *
  * @author JWK
  * @version 1.0
  * @date 2023/3/30 10:51

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

@@ -0,0 +1,27 @@
+package com.ruoyi.ams.xuankuang.service;
+
+import com.ruoyi.ams.order.service.IWmsDocOrderDetailsService;
+import com.ruoyi.ams.order.service.IWmsDocOrderHeaderService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 出库业务
+ *
+ * @author JWK
+ * @version 1.0
+ * @date 2023/3/30 10:51
+ */
+public class WmsDocOrderSubService {
+
+    @Autowired
+    private IWmsDocOrderHeaderService iWmsDocOrderHeaderService;
+    @Autowired
+    private IWmsDocOrderDetailsService iWmsDocOrderDetailsService;
+
+
+
+
+
+
+
+}

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

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service
-public class XuanKuangTaskApiService {
+public class WmsToWcsApiService {
 
 
     /**