1.03

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

@@ -668,12 +668,13 @@ public class BizDayworkController extends BaseController {
                     .collect(Collectors.toList());
             // 再根据整合后报工明细中对应的 daywork_id 的集合，获取到对应的 daywork 集合
             if (keywords.isEmpty())
-                dayworks = bizDayworkService.query().in("id", dayworkIds).list();
+                dayworks = bizDayworkService.query().in("id", dayworkIds).eq("dept_id", deptId).list();
             else if (!lots.isEmpty()) {
                 List<Long> lotIds = lots.stream().map(BizLot::getId).collect(Collectors.toList());
                 dayworks = bizDayworkService.query()
                         .in("id", dayworkIds)
                         .in("lot_id", lotIds)
+                        .eq("dept_id", deptId)
                         .list();
             }
             if (dayworks.isEmpty())

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

@@ -264,9 +264,11 @@ public class BizProductionPlanDetailController extends BaseController {
                 .list();
         //内部外协已经收回的批次，则不展示收回单
             SysDept sysDept = sysDeptService.selectDeptById(bizProductionPlanDetail.getDeptId());
-                List<BizOutsourcedOrderDetail> outsourcedOrderDetailList = bizOutsourcedOrderDetailService.query()
+        List<BizOutsourcedOrder> outsourceOrderList = bizOutsourcedOrderService.query().eq("outsource_dept_id", sysDept.getDeptId()).list();
+        List<BizOutsourcedOrderDetail> outsourcedOrderDetailList = bizOutsourcedOrderDetailService.query()
                         .in("production_plan_detail_id", tempPlanDetailIds.isEmpty() ? Collections.singletonList(0L):tempPlanDetailIds)
                         .eq("supplier_id", sysDept.getSupplierId())
+                .in("master_id", outsourceOrderList.isEmpty() ? Collections.singletonList(0L): outsourceOrderList.stream().map(BizOutsourcedOrder::getId).collect(Collectors.toList()))
                     .list();
                 List<BizReturnReceiptDetail> returnReceiptDetail = bizReturnReceiptDetailService.query()
                         .in("outsource_detail_id", outsourcedOrderDetailList.isEmpty() ? Collections.singletonList(0L) : outsourcedOrderDetailList.stream().map(BizOutsourcedOrderDetail::getId).collect(Collectors.toList()))
@@ -277,16 +279,12 @@ public class BizProductionPlanDetailController extends BaseController {
                if(!collect.isEmpty()){
                    //该计划单有发出单
                   for(BizOutsourcedOrderDetail v:collect){
-                      if(!returnReceiptDetail.stream().filter(l-> l.getOutsourceDetailId().equals(v.getId())).collect(Collectors.toList()).isEmpty()){
+                      if(returnReceiptDetail.stream().filter(l-> l.getOutsourceDetailId().equals(v.getId())).collect(Collectors.toList()).isEmpty()){
                           if(!newList.contains(item)) {
                               newList.add(item);
                           }
                       }
                   }
-               }else{
-                   if(!newList.contains(item)) {
-                       newList.add(item);
-                   }
                }
             }
 

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

@@ -417,8 +417,8 @@ public class SortDayworkController extends BaseController {
         BizDayworkItem item = bizDayworkItemService.getById(bizDayworkItem.getId());
         //修改发出单报工合格数，投产数及折损率
         BizOutsourcedOrderDetailProcess outsourcedOrderDetailProcess = bizOutsourcedOrderDetailProcessService.query().eq("daywork_id", item.getDayworkId()).eq("process_step_number", item.getProcessStepNumber()).one();
-        outsourcedOrderDetailProcess.setProductionNum(item.getProdNum());
-        outsourcedOrderDetailProcess.setQualifiedNum(item.getQualifiedNum());
+        outsourcedOrderDetailProcess.setProductionNum(bizDayworkItem.getProdNum());
+        outsourcedOrderDetailProcess.setQualifiedNum(bizDayworkItem.getQualifiedNum());
         float percent = ((outsourcedOrderDetailProcess.getProductionNum() - outsourcedOrderDetailProcess.getQualifiedNum()) / (float) outsourcedOrderDetailProcess.getProductionNum()) * 100;
         outsourcedOrderDetailProcess.setLoss(BigDecimal.valueOf(percent));
         bizOutsourcedOrderDetailProcessService.updateById(outsourcedOrderDetailProcess);