提交

src/main/java/cn/ezhizao/project/business/controller/BizLotController.java

@@ -585,6 +585,7 @@ public class BizLotController extends BaseController {
                             });
                             BizDayworkItem latestItem = new BizDayworkItem(currentItems.get(0));
                             BizQuickDayworkNextInfo old = oldQuickDayworkNextInfos.stream().filter(a -> a.getDayworkItemId().equals(latestItem.getId())).findFirst().orElse(new BizQuickDayworkNextInfo());
+//                            BizQuickDayworkNextInfo old = oldQuickDayworkNextInfos.stream().filter(a -> a.getDayworkItemId().equals(currentItems.get(0).getId())).findFirst().orElse(new BizQuickDayworkNextInfo());
                             latestItem.setStatus(currentItems.stream().max(Comparator.comparing(BizDayworkItem::getStatus)).orElse(new BizDayworkItem()).getStatus());
                             latestItem.setProdNum(l.getLotNumber());
                             latestItem.setQualifiedNum(l.getQualifiedNum());
@@ -747,7 +748,7 @@ public class BizLotController extends BaseController {
         }
         List<BizDayworkCarrier> bizDayworkCarriers = dayworkCarrierService.query().in("daywork_id", bizDayworks.isEmpty() ? Collections.singletonList(0L) : bizDayworks.stream().map(BizDaywork::getId).collect(Collectors.toList())).eq("is_changed", 0).list();
         if (bizDayworkCarriers.stream().anyMatch(v -> v.getCreateTime().compareTo(splitDate) > 0)) {
-            return error("分批之后重新绑定了载具，无法退回");
+            return error("该批次载具信息已发生变化，无法退回");
         }
         // 判断是否有新的辅助报工
         List<BizDayworkAuxiliaryItem> bizDayworkAuxiliaryItems = bizDayworkAuxiliaryItemsService.query().in("daywork_id", bizDayworks.isEmpty() ? Collections.singletonList(0L) : bizDayworks.stream().map(BizDaywork::getId).collect(Collectors.toList())).list();