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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/InvAsnController.java

@@ -39,6 +39,7 @@ public class InvAsnController {
     @Autowired
     private WcsToWmsApiService bucketWcsToWmsApiService;
 
+    //TODO 李卫
     @ApiOperation("桶装入库：获取当前场景下的库位")
     @GetMapping(value = "/getBaseLocationInfoList")
     public AjaxResult getBaseLocationInfoList(Long zoneId, String locationSceneCode) {
@@ -52,6 +53,8 @@ public class InvAsnController {
 
 
 
+
+    //TODO 李卫
     @ApiOperation("桶装入库：空托出库")
     @GetMapping(value = "/emptyPalletLoc")
     public AjaxResult emptyPalletLoc(EmptyPalletLocForm emptyPalletLocForm) {

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

@@ -2,7 +2,6 @@ package com.ruoyi.ams.xuankuang.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.ams.inv.domain.InvLotLocId;
 import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
 import com.ruoyi.base.constant.Constant;
@@ -12,13 +11,10 @@ import com.ruoyi.base.domain.vo.LotattVO;
 import com.ruoyi.base.service.IBaseLocationInfoService;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.ConvertUtils;
-import com.ruoyi.hard.xuankang.ConvertUtil;
-import com.ruoyi.system.domain.SysConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -44,6 +40,7 @@ public class BucketWcsToWmsApiService extends WcsToWmsApiService {
     /**
      * 入库分配库位
      * @return
+     * TODO 李卫  看看怎么判空
      */
     @Override
     protected BaseLocationInfo selectLocationInfo(){
@@ -62,9 +59,11 @@ public class BucketWcsToWmsApiService extends WcsToWmsApiService {
 
     }
 
+
     /**
      * 出库分配库存
      * @return
+     * TODO 李卫
      */
     protected BaseLocationLotattDTO allocateLocationInfo(){
         //1，2，3

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

@@ -601,6 +601,7 @@ public class WcsToWmsApiService {
      * 根据场景code返回库位列表
      * @param subSceneCode
      * @return
+     * //TODO 李卫
      */
     public List<Long> getBucketLocationIdList(String subSceneCode) {
         String bucketConfig = sysConfigService.selectConfigByKey(SceneConstants.STORAGE_BUCKET_SCENE);

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

@@ -126,6 +126,7 @@ public class WmsDocAsnSubService {
      * agv入库任务下发
      * @return
      */
+    //TODO 李卫 synchronized
     @Transactional
     public List<WmsDocAsnDetails> agvInTask(String palletNo, String materialType, Long sourceLocationId, BigDecimal quantity) {
         //1.预备参数设置