0731

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

@@ -102,6 +102,8 @@ public class BizDayworkItemController extends BaseController {
 
     @Resource
     private IBizDeptProcessService bizDeptProcessService;
+//    @Resource
+//    private IBizDayworkItemExamineService bizDayworkItemExamineService;
     /**
      * 查询报工记录列表
      */
@@ -391,7 +393,7 @@ public class BizDayworkItemController extends BaseController {
                 //工序集合
                 if (daywork.getIsAmend() == 1 || daywork.getIsWasteRecycling() == 1) {
                     BizProcess process = new BizProcess();
-                    BizLotTechnologicalProcessDetail processDetail = abNormalDetailList.stream().filter(item -> item.getProcessStepNumber().equals(turnoverItem.getProcessStepNumber())).collect(Collectors.toList()).get(0);
+                    BizLotTechnologicalProcessDetail processDetail = abNormalDetailList.stream().filter(item -> item.getProcessStepNumber().equals(turnoverItem.getProcessStepNumber()) && item.getLotTechnologicalProcessId().equals(turnoverItem.getTechnologicalProcessId())).collect(Collectors.toList()).get(0);
                     process.setProcessAlias(processDetail.getProcessAlias());
                     process.setProcessStepNumber(processDetail.getProcessStepNumber());
                     daywork.setCurrentProcess(process);
@@ -407,7 +409,7 @@ public class BizDayworkItemController extends BaseController {
                     daywork.setProcessSequence(processSequence);
                 } else {
                     BizProcess process = new BizProcess();
-                    BizTechnologicalProcessDetail processDetail = normalDetailList.stream().filter(item -> item.getProcessStepNumber().equals(turnoverItem.getProcessStepNumber())).collect(Collectors.toList()).get(0);
+                    BizTechnologicalProcessDetail processDetail = normalDetailList.stream().filter(item -> item.getProcessStepNumber().equals(turnoverItem.getProcessStepNumber()) && item.getTechnologicalProcessId().equals(turnoverItem.getTechnologicalProcessId())).collect(Collectors.toList()).get(0);
                     process.setProcessAlias(processDetail.getProcessAlias());
                     process.setProcessStepNumber(processDetail.getProcessStepNumber());
                     daywork.setCurrentProcess(process);
@@ -1196,9 +1198,14 @@ public class BizDayworkItemController extends BaseController {
 
         // 根据获取到的所有批次的id，查询出所有批次的报工信息，不需要判断状态
         List<BizDayworkItem> bizDayworkItemList = bizDayworkItemService.query().in("daywork_id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
-
         // 获取所有的 daywork 数据集合
         List<BizDaywork> bizDayworks = bizDayworkService.query().in("id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
+//        //查询分选-包装的审核申请
+//        List<BizDayworkItemExamine> dayworkExamineList = bizDayworkItemExamineService.query().in("daywork_id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
+//        //需要删除的审核申请集合
+//        List<BizDayworkItemExamine> needRemoveList = new ArrayList<>();
+//        //需要新增的审核申请集合
+//        List<BizDayworkItemExamine> needAddList = new ArrayList<>();
         // 遍历 daywork 数据集合
         for (BizDaywork v : bizDayworks) {
             // 获取该批次的最后一条报工
@@ -1217,7 +1224,32 @@ public class BizDayworkItemController extends BaseController {
                 bizItem.setProcessId(lastItem.getProcessId());
                 bizItem.setTechnologicalProcessDetailId(lastItem.getTechnologicalProcessDetailId());
                 bizItem.setStatus(bizDayworkItem.getStatus());
-
+//                //添加分选-包装的审核申请
+//                if(bizDayworkItem.getIsNextPacking()) {
+//                    List<BizDayworkItemExamine> examineData = dayworkExamineList.stream().filter(item -> item.getDayworkId().equals(v.getId())).collect(Collectors.toList());
+//                    //如果有审核申请，则删除审核申请，重新新增
+//                    if(examineData.size() > 0) {
+//                        needRemoveList.addAll(examineData);
+//                    }else {
+//                        //新增审核申请
+//                        BizDayworkItemExamine examine = new BizDayworkItemExamine();
+//                        examine.setDayworkId(v.getId());
+//                        examine.setDayworkItemId(lastItem.getId());
+//                        examine.setDeptId(bizDayworkItem.getDeptId());
+//                        examine.setProductionPlanDetailId(bizDayworkItem.getProductionPlanDetailId());
+//                        examine.setProductDescription(bizDayworkItem.getProductDescription());
+//                        examine.setLotId(lastItem.getLotId());
+//                        examine.setLotCode(v.getLotCode());
+//                        examine.setProductId(v.getProductId());
+//                        examine.setTechnologicalProcessId(lastItem.getTechnologicalProcessId());
+//                        examine.setTechnologicalProcessDetailId(lastItem.getTechnologicalProcessDetailId());
+//                        examine.setProcessId(lastItem.getProcessId());
+//                        examine.setProcessAlias(bizDayworkItem.getProcess().getProcessAlias());
+//                        examine.setStatus(0);
+//                        needAddList.add(examine);
+//                    }
+//
+//                }
                 // 如果报工状态为：7（已送达）或者4（待周转），则需要设置对应的daywork的当前部门id，以及合格数
                 // 这里的状态值4/7，是由前端传递过来的。
                 if (bizDayworkItem.getStatus().equals("7") || bizDayworkItem.getStatus().equals("4")) {
@@ -1301,7 +1333,9 @@ public class BizDayworkItemController extends BaseController {
                 }
             }
         }
-
+//        //删除多余的审核申请
+//        bizDayworkItemExamineService.removeBatchByIds(needRemoveList);
+//        bizDayworkItemExamineService.saveBatch(needAddList);
         return toAjax(batch);
     }