Merge remote-tracking branch 'origin/master'

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

@@ -604,7 +604,7 @@ public class BizProcessInspecionController extends BaseController {
             return error("未找到该箱号");
         }
         //查询箱号是否废弃
-        BizCarrierReject carrierReject = bizCarrierRejectService.query().eq("carrier_id", carrier.getId()).eq("deleted", 0).one();
+        BizCarrierReject carrierReject = bizCarrierRejectService.query().eq("carrier_id", carrier.getId()).eq("deleted", 0).eq("is_abandoned", 1).last("limit 1").one();
         if (carrierReject != null) {
             return error("该载具已废弃");
         }
@@ -913,7 +913,10 @@ public class BizProcessInspecionController extends BaseController {
             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();
+        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);