From 172b79e18e745930752c1e5d2bfdc7eda006bde6 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Wed, 13 Dec 2023 14:41:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=BA=93=E4=BD=8D=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../location/LocationController.java          | 32 ++++++++-----------
 .../service/location/LocationServiceImpl.java |  2 +-
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java
index cd3a7af4..119707b5 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java
@@ -1,6 +1,5 @@
 package com.win.module.wms.controller.location;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
@@ -9,8 +8,8 @@ import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.bom.vo.BomImportErrorVO;
 import com.win.module.wms.controller.location.vo.*;
+import com.win.module.wms.controller.rule.vo.RuleRespVO;
 import com.win.module.wms.convert.location.LocationConvert;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.mysql.balance.BalanceMapper;
@@ -29,17 +28,19 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import static com.win.module.wms.enums.ErrorCodeConstants.LOCATION_NOT_EXISTS;
 
 @Tag(name = "管理后台 - 库位")
 @RestController
@@ -207,19 +208,14 @@ public class LocationController {
         }
         return success(returnMap);
     }
-    public LocationDO selectLocation(String pcode) {
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("code",pcode);
-        queryWrapper.eq("available","TRUE");
-        LocationDO locationDO = locationMapper.selectOne(queryWrapper);
-        if(locationDO != null){
-            return locationDO;
-        }else {
-            throw exception(LOCATION_NOT_EXISTS);
-        }
-    }
-
-
 
+    @PermitAll
+    @GetMapping("/inspectLocation")
+    @Operation(summary = "推荐库位（测试用）")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<LocationDO> inspectLocation(@RequestParam("supplierCode") String supplierCode,@RequestParam("itemCode") String itemCode, @RequestParam("batch") String batch, @RequestParam("batch") String inventoryStatus) {
+        RuleRespVO ruleRespVO = ruleService.grounding(supplierCode, null, itemCode, inventoryStatus, null, null, null, null, null);
+        return success(locationService.inspectLocation(ruleRespVO, itemCode, batch, inventoryStatus));
+    }
 
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java
index 90474184..1297509c 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java
@@ -394,7 +394,7 @@ public class LocationServiceImpl implements LocationService {
      * @param enableMixStatus       可以混状态
      * @return 过滤之后的库位list
      */
-    private List<LocationDO> locationFirst(List<LocationDO> locationDOList, Object emptyLocationFirst, Object notEmptyLocationFirst, String itemCode, String batch, String inventoryStatus, String enableMixItem, String enableMixLot, String enableMixStatus) {
+    private List<LocationDO> locationFirst(List<LocationDO> locationDOList, String emptyLocationFirst, String notEmptyLocationFirst, String itemCode, String batch, String inventoryStatus, String enableMixItem, String enableMixLot, String enableMixStatus) {
         List<LocationDO> emptyList = new ArrayList<>();
         List<LocationDO> notEmptyList = new ArrayList<>();
         for (LocationDO locationDO : locationDOList) {