移库需求增加接口

ruoyi-admin/src/main/resources/application.yml

@@ -37,7 +37,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: prod
+    active: dev
   # 文件上传
   servlet:
     multipart:

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

@@ -19,6 +19,7 @@ import com.ruoyi.ams.task.service.IWcsTaskService;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.service.IBaseLocationInfoService;
+import com.ruoyi.base.utils.IdSequenceUtils;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.exception.base.BaseException;
@@ -26,6 +27,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import reactor.core.publisher.SinkOneSerialized;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -59,7 +61,9 @@ public class WcsTaskSubService {
     @Autowired
     private WmsDocOrderHeaderMapper wmsDocOrderHeaderMapper;
     @Autowired
-    WmsDocAsnSubService wmsDocAsnSubService;
+    private WmsDocAsnSubService wmsDocAsnSubService;
+    @Autowired
+    private IdSequenceUtils idSequenceUtils;
 
 
 
@@ -165,21 +169,26 @@ public class WcsTaskSubService {
     }
 
 
-    public AjaxResult addWcsOutTask(String taskNo, String locationFrom, String locationTo
-            , String orderNo, String palletNo, Long state, String remark) {
-        return addWcsTask(taskNo, locationFrom, locationTo, orderNo, palletNo, StringUtils.EMPTY, state, remark);
-    }
 
     public AjaxResult addWcsOutTask(String taskNo, String locationFrom, String locationTo
-            , String orderNo, Long state, String remark) {
-        return addWcsOutTask(taskNo, locationFrom, locationTo, orderNo, StringUtils.EMPTY, state, remark);
+            , String orderNo, String palletNo, String wcsNo, Long state, String remark) {
+        return addWcsTask(taskNo, locationFrom, locationTo, orderNo, palletNo, wcsNo, state, remark);
     }
 
+    public AjaxResult addWcsOutTask(String locationFrom, String locationTo
+            , String orderNo, String palletNo, String wcsNo) {
+        return addWcsOutTask(idSequenceUtils.generateId(Constant.ID_TYPE.ORDERNO.getDesc()),
+                locationFrom, locationTo, orderNo, palletNo, wcsNo, 10L, "立体库出库任务");
+    }
 
     public AjaxResult addWcsOutTask(String taskNo, String locationFrom, String locationTo
-            , String orderNo, String palletNo) {
-        return addWcsOutTask(taskNo, locationFrom, locationTo, orderNo, palletNo, 10L, "立体库出库任务");
+            , String orderNo, String wcsNo, Long state, String remark) {
+        return addWcsOutTask(taskNo, locationFrom, locationTo, orderNo, StringUtils.EMPTY, wcsNo, state, remark);
+    }
 
+    public AjaxResult addWcsOutTask(String taskNo, String locationFrom, String locationTo
+            , String orderNo, Long state, String remark) {
+        return addWcsOutTask(taskNo, locationFrom, locationTo, orderNo, StringUtils.EMPTY, StringUtils.EMPTY, state, remark);
     }
 
     public AjaxResult addWcsOutTask(String taskNo, String locationFrom, String locationTo