1.工单计算时,使用最新的库位信息

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

@@ -1042,25 +1042,31 @@ public class LiteOrderCache {
                             if (pos != null) {
                             if (pos != null) {
                                 break;
                                 break;
                             }
                             }
-                            Storage storage = dataCache.getStorageById(storagePos.getStorageId());
-                            if (storage == null){
-                                continue;
-                            }
                             Barcode posBarcode = storagePos.getBarcode();
                             Barcode posBarcode = storagePos.getBarcode();
                             if (posBarcode == null){
                             if (posBarcode == null){
                                 continue;
                                 continue;
                             }
                             }
-                            if (storagePos.getStorageId().equals(storageId)) {
-                                Barcode barcode = storagePos.getBarcode();
+                            StoragePos newPos = storagePosManager.getByBarcode(posBarcode.getBarcode());
+                            if (newPos == null){
+                                continue;
+                            }
+
+                            Storage storage = dataCache.getStorageById(newPos.getStorageId());
+                            if (storage == null){
+                                continue;
+                            }
+
+                            if (newPos.getStorageId().equals(storageId)) {
+                                Barcode barcode = newPos.getBarcode();
                                 if (barcode == null){
                                 if (barcode == null){
                                     continue;
                                     continue;
                                 }
                                 }
-                                if (!storagePos.isEnabled()){
+                                if (!newPos.isEnabled()){
                                     continue;
                                     continue;
                                 }
                                 }
 
 
                                 Collection<String> excludeOutPosIds = excludeOutPosIds();
                                 Collection<String> excludeOutPosIds = excludeOutPosIds();
-                                if (excludeOutPosIds.contains(storagePos.getId())){
+                                if (excludeOutPosIds.contains(newPos.getId())){
                                     continue;
                                     continue;
                                 }
                                 }
                                 boolean hasTask = false;
                                 boolean hasTask = false;
@@ -1080,7 +1086,7 @@ public class LiteOrderCache {
                                 if (hasTask){
                                 if (hasTask){
                                     continue;
                                     continue;
                                 }
                                 }
-                                pos = storagePos;
+                                pos = newPos;
                             }
                             }
                         }
                         }
                         if (pos != null) {
                         if (pos != null) {