Merge remote-tracking branch 'origin/SO1434' into SO1434

src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpAgvDeviceClientController.java

@@ -464,7 +464,7 @@ public class SpAgvDeviceClientController {
         storagePos.setBarcode(barcode);
         storagePosManager.save(storagePos);
 
-        log.info("出库完成,清空仓位: " + storagePos.getId() + "[" + storagePos.getPosName() + "]");
+        log.info("出库完成,更改库位: " + storagePos.getId() + "[" + storagePos.getPosName() + "]中barcode["+barcode.getBarcode()+"]状态为：OUT_NORMAL");
 
         //更新缓存中的库存信息
         dataCache.updateInventory(storagePos, barcode);

src/main/java/com/neotel/smfcore/custom/luxsan_sp/util/SpareNoCache.java

@@ -181,7 +181,7 @@ public class SpareNoCache {
 
             log.info("开始执行 入库单 [" + orderNo + "] ");
 
-            List<StoragePos> needOutPos = new ArrayList<>();
+            Map<String,StoragePos> needOutPos = new HashMap<>();
             List<String> storageIdList = new ArrayList<>();
             for (Storage storage : dataCache.getAllStorage().values()) {
                 storageIdList.add(storage.getId());
@@ -209,7 +209,7 @@ public class SpareNoCache {
                     }
                     boxBarcode.setOut(false);
                     boxBarcode.setStatus(BARCODE_STATUS.IN_STORE);
-                    needOutPos.add(pos);
+                    needOutPos.put(pos.getPosName(),pos);
 
                 } else {
                     noPnDetial.add(detail);
@@ -231,7 +231,7 @@ public class SpareNoCache {
                 //查找准备出库的料箱中是否有空格口
                 StoragePos emptyPos = null;
                 for (StoragePos exPos :
-                        needOutPos) {
+                        needOutPos.values()) {
                     int subCount = SpBoxUtil.GetBoxSubCount(exPos.getBarcode().getBarcode());
                     if (exPos.getBarcode().getSubCodeList().size() < subCount) {
                         emptyPos = exPos;
@@ -248,6 +248,8 @@ public class SpareNoCache {
                     List<Barcode> subL = emptyBox.getSubCodeList();
                     subL.add(newPn);
                     emptyBox.setSubCodeList(subL);
+                    emptyPos.setBarcode(emptyBox);
+                    needOutPos.put(emptyPos.getPosName(),emptyPos);
                     log.info("入库单" + orderNo + ", Pn=" + pn + ",使用料箱的空格口=" + emptyPos.getPosName() + "，料箱号=" + emptyBox.getBarcode() + "，格口号=" + newPn.getBarcode() + "，需要入库数量=" + detail.getInQty());
 
                 } else {
@@ -274,7 +276,8 @@ public class SpareNoCache {
                             emptyBox.setSubCodeList(subL);
                             emptyBox.setOut(false);
                             emptyBox.setStatus(BARCODE_STATUS.IN_STORE);
-                            needOutPos.add(emptyPos);
+                            emptyPos.setBarcode(emptyBox);
+                            needOutPos.put(emptyPos.getPosName(),emptyPos);
                             log.info("入库单" + orderNo + ", Pn=" + pn + "," + type + "查找到有空格口料箱=" + emptyPos.getPosName() + "，料箱号=" + emptyBox.getBarcode() + "，格口号=" + newPn.getBarcode() + "，需要入库数量=" + detail.getInQty());
 
                             break;
@@ -288,16 +291,14 @@ public class SpareNoCache {
             }
             //开始生成出库任务
             int index = 1;
-            for (StoragePos pos : needOutPos
+            for (StoragePos pos : needOutPos.values()
             ) {
                 Barcode barcode = pos.getBarcode();
                 log.info("入库单" + orderNo + ", 为库位=" + pos.getPosName() + "，料箱=" + barcode.getBarcode() + "生成出库任务：" + index);
 
-                // 库位置空
-                barcode.setPosName(null);
-                pos.setBarcode(null);
+                pos.setBarcode(barcode);
                 barcodeManager.save(barcode);
-//                barcodeManager.saveBarcode(barcode);
+                barcodeManager.saveBarcode(barcode);
                 storagePosManager.save(pos);
 
                 Storage storage = dataCache.getStorageById(pos.getStorageId());