12.4

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -1154,7 +1154,7 @@ public class BizDayworkItemController extends BaseController {
         List<BizDayworkCarrier> allCarries = bizDayworkCarrierService.query().eq("is_changed", 0).eq("process_inspection_id", 0L).in("carrier_id", dayworkCarriers.isEmpty() ? Collections.singletonList(0L) : dayworkCarriers.stream().map(BizDayworkCarrier::getCarrierId).collect(Collectors.toList())).list();
         // 关联批次的所有最后一条报工
         List<BizDayworkItem> bizDayworkItems = bizDayworkItemService.query().in("daywork_id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).in("status", Arrays.asList("0", "1", "2", "3")).orderByDesc("status").orderByDesc("create_time").list();
-        List<BizDayworkItem> bizDayworkItemAll = bizDayworkItemService.query().in("daywork_id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).orderByDesc("status").orderByDesc("create_time").list();
+        List<BizDayworkItem> bizDayworkItemAll = bizDayworkItemService.query().in("daywork_id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).orderByDesc("create_time").list();
         List<BizDayworkItem> bizDayworkItemList = bizDayworkItemService.query().in("daywork_id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
         List<BizDaywork> bizDayworks = bizDayworkService.query().in("id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
         for (BizDaywork v : bizDayworks) {
@@ -1246,7 +1246,7 @@ public class BizDayworkItemController extends BaseController {
         // 根据获取到的所有批次的id，查询出所有批次的报工信息，并且状态是【"0", "1", "2", "3"】，按状态值倒序、创建日期的倒序，对数据进行排序，得到的数据是还未周转的数据。
         // 后续会通过该集合，获取某批次的最后一条报工信息
         List<BizDayworkItem> bizDayworkItems = bizDayworkItemService.query().in("daywork_id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).in("status", Arrays.asList("0", "1", "2", "3")).orderByDesc("status").orderByDesc("create_time").list();
-        List<BizDayworkItem> bizDayworkItemsAll = bizDayworkItemService.query().in("daywork_id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).orderByDesc("status").orderByDesc("create_time").list();
+        List<BizDayworkItem> bizDayworkItemsAll = bizDayworkItemService.query().in("daywork_id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).orderByDesc("create_time").list();
         // 根据获取到的所有批次的id，查询出所有批次的报工信息，不需要判断状态
         List<BizDayworkItem> bizDayworkItemList = bizDayworkItemService.query().in("daywork_id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
         // 获取所有的 daywork 数据集合

src/main/java/cn/ezhizao/project/business/product/controller/BizProcessInspecionController.java

@@ -3349,7 +3349,7 @@ public class BizProcessInspecionController extends BaseController {
         lot.setAllCarrierName(item.getCarrierName());
         if (latestList.stream().map(BizDayworkItem::getStatus).collect(Collectors.toList()).contains("0")) {
             if (!latestList.stream().map(BizDayworkItem::getStatus).collect(Collectors.toList()).contains("1") && !latestList.stream().map(BizDayworkItem::getStatus).collect(Collectors.toList()).contains("2")) {
-                return error("该批次未开始加工");
+                return error("该批次未开始加工,不可交检");
             }
         }
         if (latestList.stream().map(BizDayworkItem::getStatus).collect(Collectors.toList()).contains("4") || latestList.stream().map(BizDayworkItem::getStatus).collect(Collectors.toList()).contains("5") || latestList.stream().map(BizDayworkItem::getStatus).collect(Collectors.toList()).contains("7")) {