禁用不允许出库

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -793,17 +793,23 @@ public class StoragePosController {
 
 
             List<String> checkReelList = lizhenApi.batchCheckReel(barcodeList, "", model);
             List<String> checkReelList = lizhenApi.batchCheckReel(barcodeList, "", model);
 
 
+            List<String> errorBarcodeList = new ArrayList<>();
             for (StoragePos pos : needOutPosList) {
             for (StoragePos pos : needOutPosList) {
                 Barcode barcode = pos.getBarcode();
                 Barcode barcode = pos.getBarcode();
                 String barcodeStr = barcode.getBarcode();
                 String barcodeStr = barcode.getBarcode();
                 if (checkReelList != null && !checkReelList.isEmpty()){
                 if (checkReelList != null && !checkReelList.isEmpty()){
                     if (checkReelList.contains(barcodeStr)){
                     if (checkReelList.contains(barcodeStr)){
-                        return ResultBean.newErrorResult(-2,"",barcodeStr+"已经被禁用,库位为:"+pos.getPosName());
+                        errorBarcodeList.add(barcodeStr);
+                        log.info(barcodeStr+"已经被禁用,库位为:"+pos.getPosName());
                     }
                     }
                 }
                 }
             }
             }
+            if (errorBarcodeList != null && !errorBarcodeList.isEmpty()){
+                return ResultBean.newErrorResult(-1,"", JSON.toJSONString(errorBarcodeList)+"已经被禁用");
+            }
         }
         }
 
 
+
         //生成出库任务
         //生成出库任务
         List<String> messageList = new ArrayList<>();
         List<String> messageList = new ArrayList<>();