提交

src/main/java/cn/ezhizao/project/business/controller/BizReturnTurnoverController.java

@@ -262,7 +262,7 @@ public class BizReturnTurnoverController extends BaseController
         //箱子判断完，修改收回单明细的箱号和周转工段
         bizOutsourcedOrderDetailService.updateById(outsourcedOrderDetail);
         //操作dayworkCarrier表，如果该批次已经绑箱，把对应箱解绑，并重新绑定新箱子
-        List<BizDayworkCarrier> returnDayworkCarrierList = bizDayworkCarrierService.query().eq("daywork_id", outsourcedOrderDetail.getDayworkId()).eq("is_changed",0).list();
+        List<BizDayworkCarrier> returnDayworkCarrierList = bizDayworkCarrierService.query().eq("daywork_id", outsourcedOrderDetail.getDayworkId()).eq("process_inspection_id", 0L).eq("is_changed",0).list();
         if (returnDayworkCarrierList.size() > 0){
             returnDayworkCarrierList.stream().forEach(bizDayworkCarrier -> {bizDayworkCarrier.setIsChanged(1);});
             bizDayworkCarrierService.updateBatchById(returnDayworkCarrierList);
@@ -364,7 +364,7 @@ public class BizReturnTurnoverController extends BaseController
         //操作dayworkCarrier表，如果该批次已经绑箱，把对应箱解绑，并重新绑定新箱子
         List<BizDayworkCarrier> newDayworkCarrierList = new ArrayList<>();
         List<BizDayworkItem> bizDayworkItems = bizDayworkItemService.getListByDayworkIds(batches.stream().map(BizOutsourcedOrderDetail::getDayworkId).collect(Collectors.toList()));
-        List<BizDayworkCarrier> returnDayworkCarrierList = bizDayworkCarrierService.query().in("daywork_id", batches.isEmpty() ? Collections.singletonList(0L) : batches.stream().map(BizOutsourcedOrderDetail::getDayworkId).collect(Collectors.toList())).eq("is_changed",0).list();
+        List<BizDayworkCarrier> returnDayworkCarrierList = bizDayworkCarrierService.query().in("daywork_id", batches.isEmpty() ? Collections.singletonList(0L) : batches.stream().map(BizOutsourcedOrderDetail::getDayworkId).collect(Collectors.toList())).eq("process_inspection_id", 0L).eq("is_changed",0).list();
         List<BizDaywork> bizDayworks = bizDayworkService.query().in("id", batches.isEmpty() ? Collections.singletonList(0L) : batches.stream().map(BizOutsourcedOrderDetail::getDayworkId).collect(Collectors.toList())).list();
 
         if (returnDayworkCarrierList.size() > 0){

src/main/java/cn/ezhizao/project/business/domain/BizDayworkCarrier.java

@@ -103,4 +103,6 @@ public class BizDayworkCarrier extends BaseEntity {
     @TableField(exist = false)
     private String remark;
 
+    private Long processInspectionId;
+
 }