bug修改

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

@@ -1127,7 +1127,7 @@ public class LiteOrderCache {
                     }
                     }
                     reelItem.setExecutFailReason(str);
                     reelItem.setExecutFailReason(str);
                     reelItem.setStatus(OrderItemStatus.Reserved);
                     reelItem.setStatus(OrderItemStatus.Reserved);
-                    log.info("工单【" + orderNo + "】PN [" + item.getPn() + "] RI [" + item.getRi() + "] API009 验证失败，更改状态为 CheckFail");
+                    log.info("工单【" + orderNo + "】PN [" + item.getPn() + "] RI [" + item.getRi() + "] API009 验证失败，更改状态为 Reserved");
                 }
                 }
                 else {
                 else {
                     String str=s.getDescription();
                     String str=s.getDescription();

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

@@ -505,9 +505,20 @@ private IStoragePosManager storagePosManager;
                         storagePosManager.save(pos);
                         storagePosManager.save(pos);
                         item.setOutNum(item.getOutNum() + pos.getBarcode().getAmount());
                         item.setOutNum(item.getOutNum() + pos.getBarcode().getAmount());
 
 
-                    } else {
-
-                        reelItem.setExecutFailReason(s.getDescription());
+                    }    else if(s!=null && s.isReserved()){
+                        String str=s.getDescription();
+                        if(ObjectUtil.isNotEmpty(s.getMaterialStatus())){
+                            str=str+";"+s.getMaterialStatus();
+                        }
+                        reelItem.setExecutFailReason(str);
+                        reelItem.setStatus(OrderItemStatus.Reserved);
+                        log.info("工单【" + order.getOrderNo() + "】PN [" + item.getPn() + "] RI [" + item.getRi() + "] API009 验证失败，更改状态为 Reserved");
+                    }else {
+                        String str=s.getDescription();
+                        if(ObjectUtil.isNotEmpty(s.getMaterialStatus())){
+                            str=str+";"+s.getMaterialStatus();
+                        }
+                        reelItem.setExecutFailReason(str);
                         reelItem.setStatus(OrderItemStatus.CheckFail);
                         reelItem.setStatus(OrderItemStatus.CheckFail);
                         log.info("工单【" + order.getOrderNo() + "】PN [" + item.getPn() + "] RI [" + item.getRi() + "] API009 验证失败，更改状态为 CheckFail");
                         log.info("工单【" + order.getOrderNo() + "】PN [" + item.getPn() + "] RI [" + item.getRi() + "] API009 验证失败，更改状态为 CheckFail");
                     }
                     }