提交

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

@@ -661,11 +661,16 @@ public class BizProcessInspecionController extends BaseController {
         if (detailList.stream().noneMatch(detail -> processCodes.stream().anyMatch(l -> l.trim().equals(detail.getProcessCode())))) {
             throw new RuntimeException("该批次不需要外协检查");
         }
-        if (detailList.stream().noneMatch(detail -> detail.getIsAudit().equals(1) && detail.getStatus().equals(1))) {
-            throw new RuntimeException("该批次需要审核通过后才能外协检查");
-        }
+//                        现在先不考虑 审核通过后才能外协检查限制先放到下一迭代 20240625
+//        if (detailList.stream().noneMatch(detail -> detail.getIsAudit().equals(1) && detail.getStatus().equals(1))) {
+//            throw new RuntimeException("该批次需要审核通过后才能外协检查");
+//        }
         detailList = detailList.stream()
-                .filter(detail -> processCodes.stream().anyMatch(l -> l.trim().equals(detail.getProcessCode())) && detail.getIsAudit().equals(1) && detail.getStatus().equals(1))
+                .filter(detail -> processCodes.stream().anyMatch(l -> l.trim().equals(detail.getProcessCode())) &&
+                        detail.getIsAudit().equals(1)
+//                        现在先不考虑 审核通过后才能外协检查限制先放到下一迭代 20240625
+//                        && detail.getStatus().equals(1)
+                )
                 .collect(Collectors.toList());
         //如果有多道工序，则根据工序的排序找到最后一条
         if (detailList.size() > 1) {
@@ -896,6 +901,11 @@ public class BizProcessInspecionController extends BaseController {
         if (bizProcessInspecion.getStatus().equals(0) && newCarriers.isEmpty()) {
             return error("该序检未完成，不能解绑载具");
         }
+        List<BizCarrierReject> carrierRejects = bizProcessInspecion.getRejectCarrier();
+        List<BizCarrier> carriers = bizCarrierService.query().in("id", carrierRejects.isEmpty() ? Collections.singletonList(0L) : carrierRejects.stream().map(BizCarrierReject::getCarrierId).collect(Collectors.toList())).list();
+        carriers.forEach(l -> l.setIsAbandoned(1));
+        bizCarrierService.updateBatchById(carriers);
+        bizCarrierRejectService.saveBatch(carrierRejects);
         bizDayworkCarriers.forEach(l -> l.setIsChanged(1));
         bizDayworkCarrierService.updateBatchById(bizDayworkCarriers);
         if (newCarriers.isEmpty()) {

src/main/java/cn/ezhizao/project/business/product/domain/BizProcessInspecion.java

@@ -5,7 +5,9 @@ import java.util.List;
 
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
+import cn.ezhizao.project.business.carrierReject.domain.BizCarrierReject;
 import cn.ezhizao.project.system.domain.SysUser;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -168,10 +170,13 @@ public class BizProcessInspecion extends BaseEntity
     private Integer isInspectionCarrierChanged;
 
     @ApiModelProperty("质检箱解绑时间")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Date inspectionCarrierChangedTime;
 
     @TableField(exist = false)
     private List<BizDayworkCarrier> dayworkCarriers;
+    @TableField(exist = false)
+    private List<BizCarrierReject> rejectCarrier;
 
     @ApiModelProperty("外协序检工序")
     private String processNames;