0829

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

@@ -2014,7 +2014,7 @@ public TableDataInfo examineList(@RequestBody BizProcessInspecion bizProcessInsp
         }
 
         //获取报工信息
-        List<BizDayworkItem> itemList = bizDayworkItemService.getByDayworkId(dayworkCarrier.getDayworkId());
+        List<BizDayworkItem> itemList = bizDayworkItemService.getByDayworkId(dayworkCarrier.getDayworkId()).stream().filter(item ->!item.getStatus().equals("0")).collect(Collectors.toList());
         if (itemList.size() == 0) {
             return error("该批次未开始加工");
         }
@@ -2052,7 +2052,9 @@ public TableDataInfo examineList(@RequestBody BizProcessInspecion bizProcessInsp
         }
         lot.setAllCarrierName(item.getCarrierName());
         if(latestList.stream().map(BizDayworkItem::getStatus).collect(Collectors.toList()).contains("0")){
-            return error("该批次未开始加工");
+            if(!latestList.stream().map(BizDayworkItem::getStatus).collect(Collectors.toList()).contains("1")&&!latestList.stream().map(BizDayworkItem::getStatus).collect(Collectors.toList()).contains("2")){
+                return error("该批次未开始加工");
+            }
         }
         if(latestList.stream().map(BizDayworkItem::getStatus).collect(Collectors.toList()).contains("3")) {
             return error("当前批次，工序已完成");
@@ -2085,6 +2087,7 @@ public TableDataInfo examineList(@RequestBody BizProcessInspecion bizProcessInsp
         lot.setPudName(item.getProdNum() == 0 ? lot.getProductionQuantity() : item.getProdNum());
         return success(lot);
     }
+
     @PostMapping("/getLotInfoByFactoryInspection")
     public AjaxResult getLotInfoByFactoryInspection(@RequestBody BizDayworkCarrier dayworkCarrier) throws NoSuchFieldException, IllegalAccessException {
         //根据箱号查询当前绑定信息