api010验证成功后不出库bug修改

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

@@ -1213,9 +1213,7 @@ public class LiteOrderCache {
 
 
     public synchronized String dispatchCheckOut(LiteOrder order, boolean isRetry,boolean isOver) {
-        order.setStatus(LITEORDER_STATUS.TAILS);
-        order.setTaskReelCount(0);
-        order.setFinishedReelCount(0);
+
 
         log.info("dispatchCheckOut 出库单[" + order.getOrderNo() + "] operatetionId [" + order.getOperationId() + "]开始出库,isRetry="+isRetry+",isOver="+isOver);
         int taskReelCount = 0;
@@ -1247,6 +1245,10 @@ public class LiteOrderCache {
             log.info("dispatchCheckOut 出库单[" + order.getOrderNo() + "] 未找到可以retry的物料");
             return "";
         }
+        order.setStatus(LITEORDER_STATUS.TAILS);
+        order.setTaskReelCount(0);
+        order.setFinishedReelCount(0);
+
         List<StoragePos> storagePosList = storagePosManager.findByQuery(new Query(Criteria.where("barcode.barcode").in(needOutBarcode)));
         List<Material> materialList = new ArrayList<>();
 
@@ -1274,7 +1276,7 @@ public class LiteOrderCache {
                         if (!needOutBarcode.contains(ri)) {
                             continue;
                         }
-                        StoragePos storagePos = storagePosList.stream().filter(pos -> pos.getBarcode().equals(ri)).findFirst().orElse(null);
+                        StoragePos storagePos = storagePosList.stream().filter(pos -> pos.getBarcode().getBarcode().equals(ri)).findFirst().orElse(null);
                         if (storagePos == null) {
                             log.info("dispatchCheckOut 出库单[" + order.getOrderNo() + "] operatetionId [" + order.getOperationId() + "] ,pn[" + orderItem.getPn() + "] ,RI[" + ri + "] 未找到对应的库位，跳过");
                             continue;

src/main/java/com/neotel/smfcore/custom/micron1053/api/MicronApi.java

@@ -695,7 +695,7 @@ public class MicronApi  {
         if (Debug) {
             for (Barcode barcode :
                     barcodeList) {
-                resultMap.put(barcode.getBarcode(), new MaterialStatus(barcode.getBarcode(), barcode.getPartNumber(), "", "", true,""));
+                resultMap.put(barcode.getBarcode(), new MaterialStatus(barcode.getBarcode(), barcode.getPartNumber(), "", "", true,"Available"));
             }
             return resultMap;
         }
@@ -770,8 +770,8 @@ public class MicronApi  {
                 trackStatus.setPartNumber(m.getPartNumber());
                 trackStatus.setSerialNum(m.getSerialNum());
                 statusList.add(trackStatus);
-                return statusList;
             }
+            return statusList;
         }
 
         String url = config.getUrl(config.api_name_010);

src/main/java/com/neotel/smfcore/custom/micron1053/task/MicronDispatchController.java

@@ -497,7 +497,7 @@ private IStoragePosManager storagePosManager;
                     if (s!=null&&s.isAvailable()) {
                         reelItem.setStatus(OrderItemStatus.CheckOk);
 
-                        log.info("工单【" + order.getOrderNo() + "】PN [" + item.getPn() + "] RI [" + item.getRi() + "] API009 验证成功，更改状态为 CheckOk ,锁定库位【" + pos.getPosName() + "】");
+                        log.info("工单【" + order.getOrderNo() + "】PN [" + item.getPn() + "] RI [" + reelItem.getRi() + "] API009 验证成功，更改状态为 CheckOk ,锁定库位【" + pos.getPosName() + "】");
 
                         //锁定物料
                         pos.getBarcode().setLockId(order.getOrderNo());
@@ -512,7 +512,7 @@ private IStoragePosManager storagePosManager;
                         }
                         reelItem.setExecutFailReason(str);
                         reelItem.setStatus(OrderItemStatus.Reserved);
-                        log.info("工单【" + order.getOrderNo() + "】PN [" + item.getPn() + "] RI [" + item.getRi() + "] API009 验证失败，更改状态为 Reserved");
+                        log.info("工单【" + order.getOrderNo() + "】PN [" + item.getPn() + "] RI [" + reelItem.getRi() + "] API009 验证失败，更改状态为 Reserved");
                     }else {
                         String str=s.getDescription();
                         if(ObjectUtil.isNotEmpty(s.getMaterialStatus())){
@@ -520,7 +520,7 @@ private IStoragePosManager storagePosManager;
                         }
                         reelItem.setExecutFailReason(str);
                         reelItem.setStatus(OrderItemStatus.CheckFail);
-                        log.info("工单【" + order.getOrderNo() + "】PN [" + item.getPn() + "] RI [" + item.getRi() + "] API009 验证失败，更改状态为 CheckFail");
+                        log.info("工单【" + order.getOrderNo() + "】PN [" + item.getPn() + "] RI [" + reelItem.getRi() + "] API009 验证失败，更改状态为 CheckFail");
                     }
 
                     selectReelItems.add(reelItem);