提交

src/main/java/cn/ezhizao/project/business/outsource/domain/BizOutsourcedOrderDetailProcess.java

@@ -93,5 +93,7 @@ public class BizOutsourcedOrderDetailProcess extends BaseEntity
     @Excel(name = "工序简称")
     @ApiModelProperty(value = "工序简称")
     private String processAlias;
+    @ApiModelProperty(value = "工序号")
+    private String processCode;
 
 }

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

@@ -16,6 +16,7 @@ import cn.ezhizao.project.business.carrierReject.domain.BizCarrierReject;
 import cn.ezhizao.project.business.carrierReject.service.IBizCarrierRejectService;
 import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetail;
 import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetailProcess;
+import cn.ezhizao.project.business.outsource.service.IBizOutsourcedOrderDetailProcessService;
 import cn.ezhizao.project.business.outsource.service.IBizOutsourcedOrderDetailService;
 import cn.ezhizao.project.business.product.domain.*;
 import cn.ezhizao.project.business.product.service.*;
@@ -87,6 +88,8 @@ public class BizProcessInspecionController extends BaseController {
     private IBizProcessInspectionDetailService processInspectionDetailService;
     @Resource
     private IBizOutsourcedOrderDetailService bizOutsourcedOrderDetailService;
+    @Resource
+    private IBizOutsourcedOrderDetailProcessService bizOutsourcedOrderDetailProcessService;
 
     /**
      * 查询序检主列表
@@ -656,12 +659,13 @@ public class BizProcessInspecionController extends BaseController {
         BizReturnReceiptDetail bizReturnReceiptDetail = new BizReturnReceiptDetail();
         bizReturnReceiptDetail.setDayworkId(dayworkCarrier.getDayworkId());
         List<BizReturnReceiptDetail> detailList = bizReturnReceiptDetailService.getList(bizReturnReceiptDetail);
+        List<BizOutsourcedOrderDetailProcess> processes = bizOutsourcedOrderDetailProcessService.query().in("detail_id", detailList.isEmpty() ? Collections.singletonList(0L) : detailList.stream().map(BizReturnReceiptDetail::getOutsourceDetailId).collect(Collectors.toList())).list();
         System.out.println("查询是否有该批次：detailList" + detailList);
         if (detailList.size() == 0) {
             throw new RuntimeException("该批次不是外协回收批次");
         }
 
-        if (detailList.stream().noneMatch(detail -> processCodes.stream().anyMatch(l -> l.trim().equals(detail.getProcessCode())))) {
+        if (processes.stream().noneMatch(detail -> processCodes.stream().anyMatch(l -> l.trim().equals(detail.getProcessCode())))) {
             throw new RuntimeException("该批次不需要外协检查");
         }
 //                        现在先不考虑 审核通过后才能外协检查限制先放到下一迭代 20240625
@@ -670,6 +674,7 @@ public class BizProcessInspecionController extends BaseController {
             throw new RuntimeException("该批次需要审核通过后才能外协检查");
         }
         detailList = detailList.stream()
+                .filter(detail -> processes.stream().anyMatch(v -> v.getTechnologicalProcessId().equals(detail.getTechnologicalProcessDetailId())))
                 .filter(detail -> processCodes.stream().anyMatch(l -> l.trim().equals(detail.getProcessCode())) &&
                         detail.getIsAudit().equals(1)
 //                        现在先不考虑 审核通过后才能外协检查限制先放到下一迭代 20240625