fix：正式环境接口请求参数选项增加

src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpReturnInventoryController.java

@@ -13,7 +13,6 @@ import com.neotel.smfcore.custom.luxsan_sp.util.ReturnNoCache;
 import com.neotel.smfcore.custom.luxsan_sp.util.SpareNoCache;
 import com.neotel.smfcore.custom.luxsan_sp.util.SpareNoCache;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import jdk.nashorn.internal.ir.ReturnNode;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -50,7 +49,7 @@ public class SpReturnInventoryController {
     @RequestMapping("/getAllReturnNo")
     @RequestMapping("/getAllReturnNo")
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean getAllReturnNo(String no) {
     public ResultBean getAllReturnNo(String no) {
-        List<GetReturnInventoryResult> resultList = LuxsanSpApi.getReturnInventory(new GetReturnInventoryRequest(SpareNostatus.FUNCTION_DEPT, SpareNostatus.DEPT_ID));
+        List<GetReturnInventoryResult> resultList = LuxsanSpApi.getReturnInventory(new GetReturnInventoryRequest(SpareNostatus.FUNCTION_DEPT, SpareNostatus.FORMAL_DEPT_ID));
         List<ReturnInventoryNo> returnInventoryNos = new ArrayList<>();
         List<ReturnInventoryNo> returnInventoryNos = new ArrayList<>();
         for (GetReturnInventoryResult result : resultList) {
         for (GetReturnInventoryResult result : resultList) {
             ReturnInventoryNo returnInventoryNo = returnNoCache.getByOrderNo(result.getOrderNo());
             ReturnInventoryNo returnInventoryNo = returnNoCache.getByOrderNo(result.getOrderNo());

src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpSpareNoController.java

@@ -4,16 +4,12 @@ import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
-import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
-import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.custom.luxsan_sp.api.LuxsanSpApi;
 import com.neotel.smfcore.custom.luxsan_sp.api.LuxsanSpApi;
 import com.neotel.smfcore.custom.luxsan_sp.api.bean.request.GetSpareNoRequest;
 import com.neotel.smfcore.custom.luxsan_sp.api.bean.request.GetSpareNoRequest;
 import com.neotel.smfcore.custom.luxsan_sp.api.bean.result.GetSpareNoResult;
 import com.neotel.smfcore.custom.luxsan_sp.api.bean.result.GetSpareNoResult;
-import com.neotel.smfcore.custom.luxsan_sp.bean.ReturnInventoryNo;
 import com.neotel.smfcore.custom.luxsan_sp.bean.SpareNo;
 import com.neotel.smfcore.custom.luxsan_sp.bean.SpareNo;
-import com.neotel.smfcore.custom.luxsan_sp.bean.SpareNoDetail;
 import com.neotel.smfcore.custom.luxsan_sp.enums.SpareNostatus;
 import com.neotel.smfcore.custom.luxsan_sp.enums.SpareNostatus;
 import com.neotel.smfcore.custom.luxsan_sp.service.manager.ISpareNoManager;
 import com.neotel.smfcore.custom.luxsan_sp.service.manager.ISpareNoManager;
 import com.neotel.smfcore.custom.luxsan_sp.util.ReturnNoCache;
 import com.neotel.smfcore.custom.luxsan_sp.util.ReturnNoCache;
@@ -27,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 @Slf4j
 @Slf4j
@@ -67,7 +62,7 @@ public class SpSpareNoController {
     @RequestMapping("/getAllSpareNo")
     @RequestMapping("/getAllSpareNo")
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean getAllSpareNo(String no) {
     public ResultBean getAllSpareNo(String no) {
-        List<GetSpareNoResult> resultList = LuxsanSpApi.getSpareNo(new GetSpareNoRequest(SpareNostatus.DEPT_ID, SpareNostatus.FUNCTION_DEPT));
+        List<GetSpareNoResult> resultList = LuxsanSpApi.getSpareNo(new GetSpareNoRequest(SpareNostatus.FORMAL_DEPT_ID, SpareNostatus.FUNCTION_DEPT));
         List<SpareNo> spareNoList = new ArrayList<>();
         List<SpareNo> spareNoList = new ArrayList<>();
         for (GetSpareNoResult result : resultList) {
         for (GetSpareNoResult result : resultList) {
             SpareNo spareNo = spareNoCache.getBySpareNo(result.getSpareNo());
             SpareNo spareNo = spareNoCache.getBySpareNo(result.getSpareNo());

src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpUnclaimedController.java

 package com.neotel.smfcore.custom.luxsan_sp.controller;
 package com.neotel.smfcore.custom.luxsan_sp.controller;
 
 
-import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
-import com.neotel.smfcore.core.inList.service.manager.IInListManager;
 import com.neotel.smfcore.core.order.LiteOrderCache;
 import com.neotel.smfcore.core.order.LiteOrderCache;
 import com.neotel.smfcore.core.order.enums.LITEORDER_STATUS;
 import com.neotel.smfcore.core.order.enums.LITEORDER_STATUS;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderManager;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderManager;
@@ -27,9 +25,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
-import sun.util.calendar.BaseCalendar;
 
 
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -75,7 +71,7 @@ public class SpUnclaimedController {
     @RequestMapping("/getAllUnclaimed")
     @RequestMapping("/getAllUnclaimed")
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean getAllUnclaimed(String no) {
     public ResultBean getAllUnclaimed(String no) {
-        List<GetUnclaimedResult> resultList = LuxsanSpApi.getUnclaimedDetails(new GetUnclaimedRequest(SpareNostatus.DEPT_ID, SpareNostatus.FUNCTION_DEPT));
+        List<GetUnclaimedResult> resultList = LuxsanSpApi.getUnclaimedDetails(new GetUnclaimedRequest(SpareNostatus.FORMAL_DEPT_ID, SpareNostatus.FUNCTION_DEPT));
 
 
         List<Unclaimed> unclaimedList = new ArrayList<>();
         List<Unclaimed> unclaimedList = new ArrayList<>();
 
 

src/main/java/com/neotel/smfcore/custom/luxsan_sp/enums/SpareNostatus.java

@@ -20,7 +20,8 @@ public class SpareNostatus {
     // 出库
     // 出库
     public static final Integer TYPE_CHECKOUT = 3;
     public static final Integer TYPE_CHECKOUT = 3;
 
 
-    public static final String DEPT_ID = "102";
+    public static final String FORMAL_DEPT_ID = "220";
+    public static final String NORMAL_DEPT_ID = "102";
     public static final String FUNCTION_DEPT = "MLB%20MFG";
     public static final String FUNCTION_DEPT = "MLB%20MFG";
     public static final Map<String, String> LOCATION_CODE = new HashMap<String, String>(){{
     public static final Map<String, String> LOCATION_CODE = new HashMap<String, String>(){{
         put("MLB-A003", "MLB-A003-01");
         put("MLB-A003", "MLB-A003-01");