uid出库卡机种出库

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -1015,7 +1015,7 @@ public class LiteOrderCache {
 
 
 
 
                 //禁用的物料信息
                 //禁用的物料信息
-                List<String> batchCheckReelList = LuxsanApi.batchCheckReel(subCodeList);
+                List<String> batchCheckReelList = LuxsanApi.batchCheckReel(subCodeList,orderNo,"");
                 if (batchCheckReelList != null && !batchCheckReelList.isEmpty()){
                 if (batchCheckReelList != null && !batchCheckReelList.isEmpty()){
                     for (Barcode subCode : subCodeList){
                     for (Barcode subCode : subCodeList){
                         if (disablePosNameList.contains(subCode.getPosName())) {
                         if (disablePosNameList.contains(subCode.getPosName())) {
@@ -1733,7 +1733,7 @@ public class LiteOrderCache {
 
 
 
 
                 //禁用的物料信息
                 //禁用的物料信息
-                List<String> batchCheckReelList = LuxsanApi.batchCheckReel(subCodeList);
+                List<String> batchCheckReelList = LuxsanApi.batchCheckReel(subCodeList,"","");
                 if (batchCheckReelList != null && !batchCheckReelList.isEmpty()){
                 if (batchCheckReelList != null && !batchCheckReelList.isEmpty()){
                     for (Barcode subCode : subCodeList){
                     for (Barcode subCode : subCodeList){
                         if (disablePosNameList.contains(subCode.getPosName())) {
                         if (disablePosNameList.contains(subCode.getPosName())) {
@@ -1962,7 +1962,7 @@ public class LiteOrderCache {
 
 
 
 
                 //禁用的物料信息
                 //禁用的物料信息
-                List<String> batchCheckReelList = LuxsanApi.batchCheckReel(subCodeList);
+                List<String> batchCheckReelList = LuxsanApi.batchCheckReel(subCodeList,"","");
                 if (batchCheckReelList != null && !batchCheckReelList.isEmpty()) {
                 if (batchCheckReelList != null && !batchCheckReelList.isEmpty()) {
                     for (String reelId : batchCheckReelList) {
                     for (String reelId : batchCheckReelList) {
                         if (!disableReelList.contains(reelId)) {
                         if (!disableReelList.contains(reelId)) {

src/main/java/com/neotel/smfcore/core/storage/rest/query/StoragePosFindCriteria.java

@@ -105,6 +105,8 @@ public class StoragePosFindCriteria {
 
 
     private String boxStatus;
     private String boxStatus;
 
 
+    private String machineTypes;
+
     @ApiModelProperty("料箱状态,是否在库")
     @ApiModelProperty("料箱状态,是否在库")
     @QueryCondition(type = QueryCondition.Type.IN,propName = "barcode.status")
     @QueryCondition(type = QueryCondition.Type.IN,propName = "barcode.status")
     private List<Integer> boxStatusList;
     private List<Integer> boxStatusList;

src/main/java/com/neotel/smfcore/custom/luxsan/api/LuxsanApi.java

@@ -1080,12 +1080,8 @@ public class LuxsanApi extends DefaultSmfApiListener {
         return result;
         return result;
     }
     }
 
 
-    public static void main(String[] args) {
-        List<String> batchCheckReel = batchCheckReel(new ArrayList<>());
-        System.out.println(JSON.toJSONString(batchCheckReel));
-    }
 
 
-    public static List<String> batchCheckReel(List<Barcode> barcodeList) {
+    public static List<String> batchCheckReel(List<Barcode> barcodeList,String pickingId,String model) {
         List<Map<String,Object>> paramList = new ArrayList<>();
         List<Map<String,Object>> paramList = new ArrayList<>();
         for (Barcode barcode : barcodeList) {
         for (Barcode barcode : barcodeList) {
             Map<String,Object> paramMap = new HashMap<>();
             Map<String,Object> paramMap = new HashMap<>();
@@ -1098,7 +1094,13 @@ public class LuxsanApi extends DefaultSmfApiListener {
             paramMap.put("remark","ALL");
             paramMap.put("remark","ALL");
             paramMap.put("werks","ALL");
             paramMap.put("werks","ALL");
             paramMap.put("model","ALL");
             paramMap.put("model","ALL");
+            if (StringUtils.isNotEmpty(model)){
+                paramMap.put("model",model);
+            }
             paramMap.put("picking","ALL");
             paramMap.put("picking","ALL");
+            if (StringUtils.isNotEmpty(pickingId)){
+                paramMap.put("picking",pickingId);
+            }
             paramList.add(paramMap);
             paramList.add(paramMap);
         }
         }
         log.info("批量禁用入参为:"+JSON.toJSONString(paramList));
         log.info("批量禁用入参为:"+JSON.toJSONString(paramList));