Merge remote-tracking branch 'origin/xuankuang' into xuankuang

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/order/WmsDocOrderHeaderController.java

@@ -183,6 +183,7 @@ public class WmsDocOrderHeaderController extends BaseController {
     @Log(title = "出库明细", businessType = BusinessType.INSERT)
     @PostMapping("/addDocOrderDetails")
     public AjaxResult addDocOrderDetails(@RequestBody WmsDocOrderDetails wmsDocOrderDetails) {
+        if (StringUtils.isEmpty(wmsDocOrderDetails.getSku())) return AjaxResult.error("物料号不能为空！");
         LoginUser loginUser = getLoginUser();
         wmsDocOrderDetails.setCreateBy(loginUser.getUsername());
         wmsDocOrderDetails.setCreateTime(new Date());

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

@@ -57,6 +57,6 @@ public class PdaAgvCallController {
                                          @RequestParam String sourceLocationId, @RequestParam String targetLocationId,
                                          @RequestParam Double quantity) {
         agvCallProxyService.bucketCrossStorage(palletNo, materialType, sourceLocationId, targetLocationId, quantity);
-        return AjaxResult.success("桶装出库下发任务成功");
+        return AjaxResult.success("桶装越库下发任务成功");
     }
 }

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

@@ -1,6 +1,7 @@
 package com.ruoyi.xuankuang.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.ams.xuankuang.service.WmsDocAsnSubService;
 import com.ruoyi.ams.xuankuang.service.WmsDocOrderSubService;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -39,7 +40,7 @@ public class WmsToWcsApiController {
     public AjaxResult queryDocOrderDetails(@PathVariable("orderNo") String orderNo) {
         log.info("WmsToWcsApiController - queryDocOrderDetails request orderNo is :{}, time is :{}", orderNo, DateUtils.getTime());
         AjaxResult ajaxResult = wmsDocOrderSubService.initOrderDetails(orderNo);
-        log.info("WmsToWcsApiController - queryDocOrderDetails response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
+        log.info("WmsToWcsApiController - queryDocOrderDetails response ajaxResult is :{}, time is :{}", JSONObject.toJSONString(ajaxResult), DateUtils.getTime());
         return ajaxResult;
     }
 

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/service/impl/StatusUpdateServiceImpl.java

@@ -8,7 +8,6 @@ import com.ruoyi.ams.agv.ndc.service.StatusUpdateService;
 import com.ruoyi.ams.business.BusinessServiceImpl;
 import com.ruoyi.ams.task.service.IWcsTaskService;
 import com.ruoyi.ams.xuankuang.service.BeltLineClientService;
-import com.ruoyi.ams.xuankuang.service.WmsDocAsnSubService;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.common.utils.uuid.SnowflakeIdWorker;
 import com.ruoyi.hard.demo.AutoDoorClient;
@@ -34,9 +33,6 @@ public class StatusUpdateServiceImpl implements StatusUpdateService {
     @Autowired
     private BeltLineClientService beltLineClientService;
 
-    @Autowired
-    private WmsDocAsnSubService wmsDocAsnSubService;
-
 
     private final static Map<Integer, Integer> eventIdToStatus =  new HashMap<Integer, Integer>(){
         {

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

@@ -21,13 +21,12 @@ 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;
+import com.ruoyi.common.utils.StringUtils;
 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;
@@ -177,8 +176,7 @@ public class WcsTaskSubService {
 
     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, "立体库出库任务");
+        return addWcsOutTask(IdWorker.getIdStr(), locationFrom, locationTo, orderNo, palletNo, wcsNo, 10L, "立体库出库任务");
     }
 
     public AjaxResult addWcsOutTask(String taskNo, String locationFrom, String locationTo

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

@@ -85,7 +85,6 @@ public class WmsDocAsnSubService {
             }
             billTaskForm.setMaterial(Integer.valueOf(baseSku.getDesc2()));
             //调用工单下发
-            WmsToWcsApiService wmsToWcsApiService = new WmsToWcsApiService();
             WcsResponseVo wcsResponseVo = wmsToWcsApiService.wmsBillTask(billTaskForm);
             if (!wcsResponseVo.isSuccess()) {
                 con = false;