替代料修改

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

@@ -534,6 +534,7 @@ public class LiteOrderCache {
                 while (assignReelCount < remainReelCount) {
                 while (assignReelCount < remainReelCount) {
                     Collection<String> excludePosIds = excludeOutPosIds();
                     Collection<String> excludePosIds = excludeOutPosIds();
                     String partNumber = orderItem.getPn();
                     String partNumber = orderItem.getPn();
+                    String[] partNumberSpl = partNumber.split(",");
 
 
                     StoragePos pos = null;
                     StoragePos pos = null;
                     if (cacheOrder.getType() == 2) {
                     if (cacheOrder.getType() == 2) {
@@ -548,7 +549,14 @@ public class LiteOrderCache {
                     } else {
                     } else {
                         //PN
                         //PN
                         do {
                         do {
-                            pos = storagePosManager.findPartNumberInStorages(storageIdList, partNumber, excludePosIds, checkoutType, orderItem.getBrand());
+
+                            for (String pn : partNumberSpl) {
+                                pos = storagePosManager.findPartNumberInStorages(storageIdList, pn, excludePosIds, checkoutType, orderItem.getBrand());
+                                if (pos != null){
+                                    break;
+                                }
+                            }
+
                             if (pos == null) {
                             if (pos == null) {
                                 break;
                                 break;
                             }
                             }
@@ -1227,16 +1235,24 @@ public class LiteOrderCache {
                                 continue;
                                 continue;
                             }
                             }
                         }
                         }
+
+                        String pn = orderItem.getPn();
+                        String[] split = pn.split(",");
+
                         if (orderItem.getOutReelCount() < orderItem.getNeedReelCount()) {
                         if (orderItem.getOutReelCount() < orderItem.getNeedReelCount()) {
-                            InventoryItem inventoryItem = newInventoryMap.get(orderItem.getPn());
-                            if (inventoryItem != null) {
-                                if (inventoryItem.getStockReel() /*- inventoryItem.getLockReel()*/ - inventoryItem.getBindReel() > 0) {
-                                    inventoryItem.setBindReel(inventoryItem.getBindReel() + 1);
-                                } else {
-                                    lackItems.add(orderItem);
+                            boolean lack = true;
+                            for (String partNumber : split) {
+                                InventoryItem inventoryItem = newInventoryMap.get(partNumber);
+                                if (inventoryItem != null) {
+                                    if (inventoryItem.getStockReel() /*- inventoryItem.getLockReel()*/ - inventoryItem.getBindReel() > 0) {
+                                        inventoryItem.setBindReel(inventoryItem.getBindReel() + 1);
+                                        newInventoryMap.put(orderItem.getPn(), inventoryItem);
+                                        lack = false;
+                                        break;
+                                    }
                                 }
                                 }
-                                inventoryMap.put(orderItem.getPn(), inventoryItem);
-                            } else {
+                            }
+                            if (lack){
                                 lackItems.add(orderItem);
                                 lackItems.add(orderItem);
                             }
                             }
                         }
                         }