1.每20箱子自动抛送

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/AutoDispatchInventoryController.java

@@ -124,7 +124,7 @@ public class AutoDispatchInventoryController {
             AutoStoRequest autoStoRequest = new AutoStoRequest();
             AutoStoRequest autoStoRequest = new AutoStoRequest();
             List<StoragePos> autoStoPosList = new ArrayList<>();
             List<StoragePos> autoStoPosList = new ArrayList<>();
 
 
-            while (needNum < checkOutNum && count < 20) {
+            while (count < 20) {
                 StoragePos pos = storagePosManager.findPartNumberInStorages(storageIdList, partNumber, excludeOutPosIds, checkOutType);
                 StoragePos pos = storagePosManager.findPartNumberInStorages(storageIdList, partNumber, excludeOutPosIds, checkOutType);
                 if (pos == null) {
                 if (pos == null) {
                     log.info("【自动出库】料号{}未找到可用库位，退出分配", partNumber);
                     log.info("【自动出库】料号{}未找到可用库位，退出分配", partNumber);
@@ -168,21 +168,18 @@ public class AutoDispatchInventoryController {
                 autoStoRequest.setWarehouse_code(barcode.getWarehouseCode());
                 autoStoRequest.setWarehouse_code(barcode.getWarehouseCode());
                 autoStoRequest.setModel(barcode.getModelFamily());
                 autoStoRequest.setModel(barcode.getModelFamily());
 
 
-                //同时更新barcode信息
-                barcode.setCurrentRequestId(autoStoRequest.getKey_id());
-                barcodeManager.save(barcode);
-                pos.setBarcode(barcode);
-                storagePosManager.save(pos);
-                autoStoPosList.add(pos);
                 log.info("【自动出库】锁定库位{}，条码数量：{}，累计已选数量：{}",
                 log.info("【自动出库】锁定库位{}，条码数量：{}，累计已选数量：{}",
                         pos.getId(), barcode.getAmount(), autoStoRequest.getQty());
                         pos.getId(), barcode.getAmount(), autoStoRequest.getQty());
 
 
+                autoStoPosList.add(pos);
                 excludeOutPosIds.add(pos.getId());
                 excludeOutPosIds.add(pos.getId());
                 //更新信息
                 //更新信息
                 needNum = needNum + barcode.getAmount();
                 needNum = needNum + barcode.getAmount();
                 count++;
                 count++;
             }
             }
-
+            if (count < 20) {
+                continue;
+            }
             int qty = autoStoRequest.getQty();
             int qty = autoStoRequest.getQty();
             if (qty <= 0) {
             if (qty <= 0) {
                 log.warn("【自动出库】料号{}未选中任何库存，跳过接口调用", partNumber);
                 log.warn("【自动出库】料号{}未选中任何库存，跳过接口调用", partNumber);
@@ -200,7 +197,7 @@ public class AutoDispatchInventoryController {
                 for (StoragePos pos : autoStoPosList) {
                 for (StoragePos pos : autoStoPosList) {
                     Barcode barcode = pos.getBarcode();
                     Barcode barcode = pos.getBarcode();
                     if (barcode != null) {
                     if (barcode != null) {
-                        if (autoStoRequest.getKey_id().equals(barcode.getCurrentRequestId())) {
+                        //if (autoStoRequest.getKey_id().equals(barcode.getCurrentRequestId())) {
                             barcode.setCurrentRequestId("");
                             barcode.setCurrentRequestId("");
                             barcode.setOdn("");
                             barcode.setOdn("");
                             barcode.setMemo(autoStoResult.getMSGTX());
                             barcode.setMemo(autoStoResult.getMSGTX());
@@ -209,7 +206,7 @@ public class AutoDispatchInventoryController {
                             pos.setBarcode(barcode);
                             pos.setBarcode(barcode);
                             storagePosManager.save(pos);
                             storagePosManager.save(pos);
                             log.info("【自动出库】回滚库位{}完成", pos.getId());
                             log.info("【自动出库】回滚库位{}完成", pos.getId());
-                        }
+                       // }
                     }
                     }
                 }
                 }
                 log.error("【自动出库】料号{}接口失败，全部回滚完成", partNumber);
                 log.error("【自动出库】料号{}接口失败，全部回滚完成", partNumber);
@@ -220,14 +217,15 @@ public class AutoDispatchInventoryController {
                 for (StoragePos pos : autoStoPosList) {
                 for (StoragePos pos : autoStoPosList) {
                     Barcode barcode = pos.getBarcode();
                     Barcode barcode = pos.getBarcode();
                     if (barcode != null) {
                     if (barcode != null) {
-                        if (autoStoRequest.getKey_id().equals(barcode.getCurrentRequestId())) {
+                        //if (autoStoRequest.getKey_id().equals(barcode.getCurrentRequestId())) {
+                            barcode.setCurrentRequestId(autoStoRequest.getKey_id());
                             barcode.setOdn(data);
                             barcode.setOdn(data);
                             barcode.setSto(autoStoResult.getDETAIL());
                             barcode.setSto(autoStoResult.getDETAIL());
                             barcodeManager.save(barcode);
                             barcodeManager.save(barcode);
                             pos.setBarcode(barcode);
                             pos.setBarcode(barcode);
                             storagePosManager.save(pos);
                             storagePosManager.save(pos);
                             log.info("【自动出库】更新库位{} ODN：{} 成功", pos.getId(), data);
                             log.info("【自动出库】更新库位{} ODN：{} 成功", pos.getId(), data);
-                        }
+                        //}
                     }
                     }
                 }
                 }
                 log.info("【自动出库】料号{}所有库位更新完成", partNumber);
                 log.info("【自动出库】料号{}所有库位更新完成", partNumber);