采购退货修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java

@@ -100,7 +100,7 @@ public class RuleController {
     @PostMapping("/getPrecisionStrategyByItemCodes")
     @Operation(summary = "根据物料号集合查询管理精度策略")
     public CommonResult<Object> getPrecisionStrategyByItemCodes(@Valid @RequestBody PrecisionStrategyReqVO reqVO) {
-        List<HashMap<String, Object>> list = ruleService.getPrecisionStrategyByItemCodes(reqVO);
+        List<HashMap<String, Object>> list = ruleService.getPrecisionStrategyByItemCodesNew(reqVO);
         return success(list);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java

@@ -643,7 +643,7 @@ public class PackageServiceImpl implements PackageService {
     @Override
     public PackageRespScanVO queryPackageTree(PackagePageReqVO pageVO) {
         PackageRespScanVO packageRespScanVO = new PackageRespScanVO();
-        if(StringUtils.isEmpty(pageVO.getNumber())){
+        if(StringUtils.isEmpty(pageVO.getNumber()) || pageVO.getNumber() == null){
             throw exception(PACKAGE_NUMBER_NOT_EXISTS);
         }
         //说明是箱数据

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java

@@ -231,6 +231,13 @@ public interface RuleService {
      */
     List<HashMap<String, Object>> getPrecisionStrategyByItemCodes(PrecisionStrategyReqVO reqVO);
 
+    /**
+     * 新的管理精度查询
+     * @param reqVO
+     * @return
+     */
+    List<HashMap<String, Object>> getPrecisionStrategyByItemCodesNew(PrecisionStrategyReqVO reqVO);
+
     /**
      * 获取根据物料代码以及库位代码管理精度策略
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java

@@ -16,6 +16,7 @@ import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.itemarea.ItemareaDO;
 import com.win.module.wms.dal.dataobject.itemarea.ItemareaDetailDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
+import com.win.module.wms.dal.dataobject.itemwarehouse.ItemwarehouseDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.dataobject.rule.RuleDO;
 import com.win.module.wms.dal.dataobject.supplier.SupplierDO;
@@ -24,6 +25,7 @@ import com.win.module.wms.dal.mysql.businesstype.BusinesstypeMapper;
 import com.win.module.wms.dal.mysql.itemarea.ItemareaDetailMapper;
 import com.win.module.wms.dal.mysql.itemarea.ItemareaMapper;
 import com.win.module.wms.dal.mysql.itembasic.ItembasicMapper;
+import com.win.module.wms.dal.mysql.itemwarehouse.ItemwarehouseMapper;
 import com.win.module.wms.dal.mysql.location.LocationMapper;
 import com.win.module.wms.dal.mysql.rule.RuleMapper;
 import com.win.module.wms.dal.mysql.supplier.SupplierMapper;
@@ -65,6 +67,8 @@ public class RuleServiceImpl implements RuleService {
     private BusinesstypeMapper businesstypeMapper;
     @Resource
     private BalanceMapper balanceMapper;
+    @Resource
+    private ItemwarehouseMapper itemwarehouseMapper;
 
     @Override
     public Long createRule(RuleCreateReqVO createReqVO) {
@@ -742,6 +746,49 @@ public class RuleServiceImpl implements RuleService {
         return list;
     }
 
+    @Override
+    public List<HashMap<String, Object>> getPrecisionStrategyByItemCodesNew(PrecisionStrategyReqVO reqVO) {
+        log.debug("校验包装--物料代码:{},库位代码:{}",reqVO.getItemCodes(),reqVO.getLocationCode());
+        List<String> itemCodeList = reqVO.getItemCodes();
+        String locationCode = reqVO.getLocationCode();
+        String manageMode = "";
+        QueryWrapper<LocationDO> queryWrapperLocationDO = new QueryWrapper<>();
+        queryWrapperLocationDO.eq("code", locationCode);
+        queryWrapperLocationDO.eq("available", "TRUE");
+        LocationDO locationDO = locationMapper.selectOne(queryWrapperLocationDO);
+        if (locationDO == null) {
+            throw exception(LOCATION_EXCEPTION,locationCode + " 不存在" );
+        }
+        List<HashMap<String, Object>> list = new ArrayList<>();
+        for(String itemCode:itemCodeList){
+            HashMap<String, Object> map = new HashMap<>();
+            // 物料库区配置表
+            QueryWrapper<ItemareaDO> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("item_code", itemCode);
+            queryWrapper.eq("area_code", locationDO.getAreaCode());
+            queryWrapper.eq("available", "TRUE");
+            ItemareaDO itemareaDO = itemareaMapper.selectOne(queryWrapper);
+            if (itemareaDO == null) {
+                // 查询 物料仓库配置表
+                QueryWrapper<ItemwarehouseDO> itemwarehouseDOQueryWrapper = new QueryWrapper<>();
+                itemwarehouseDOQueryWrapper.eq("item_code", itemCode);
+                itemwarehouseDOQueryWrapper.eq("warehouse_code", locationDO.getWarehouseCode());
+                itemwarehouseDOQueryWrapper.eq("available", "TRUE");
+                ItemwarehouseDO itemwarehouseDO = itemwarehouseMapper.selectOne(itemwarehouseDOQueryWrapper);
+                if (itemwarehouseDO == null) {
+                    throw exception(ITEMWAREHOUSE_NOT_EXISTS);
+                }
+                manageMode = itemwarehouseDO.getManageMode();
+            } else {
+                manageMode =  itemareaDO.getManageMode();
+            }
+            map.put("ManagementPrecision", manageMode);
+            map.put("itemCode", itemCode);
+            list.add(map);
+        }
+        return list;
+    }
+
     @Override
     public List<HashMap<String, Object>> getPrecisionStrategy(List<PrecisionStrategyReqVO2> reqVO2List) {
         List<HashMap<String, Object>> list = new ArrayList<>();