Merge remote-tracking branch 'origin/250109-回收单提交后打印，首序外协一箱多批，快速报工选择设备等' into 250109-回收单提交后打印，首序外协一箱多批，快速报工选择设备等

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

@@ -350,11 +350,11 @@ public class BizReturnTurnoverController extends BaseController {
             if ("4".equals(bizDayworkItem.getStatus())) {
                 bizDayworkItemService.removeById(bizDayworkItem);
             }
-            BizDaywork bizDaywork = bizDayworkService.query().eq("id", outsourcedOrderDetail.getDayworkId()).list().get(0);
+//            BizDaywork bizDaywork = bizDayworkService.query().eq("id", outsourcedOrderDetail.getDayworkId()).list().get(0);
             //添加周转的一条dayworkItem
             BizDayworkItem newBizDayworkItem = new BizDayworkItem();
             //拿到周转到外协的最后一条数据
-            if (bizDaywork.getIsAmend() == 1) {
+            if (currentDaywork.getIsAmend() == 1) {
                 newBizDayworkItem.setFormDayworkItemId(1L);
             }
             BizOutsourcedOrderDetail currentOutsourceDetail = outsourceOrderDetailList.stream().filter(v -> v.getDayworkId().equals(dayworkId)).findFirst().orElse(null);
@@ -383,10 +383,10 @@ public class BizReturnTurnoverController extends BaseController {
             bizDayworkItemService.save(newBizDayworkItem);
             //修改daywork主表数据
 
-            bizDaywork.setProcessQualifiedNum(currentReturnDetail.getAuditNum());
-            bizDaywork.setTemporaryProcessQualifiedNum(currentReturnDetail.getAuditNum());
-            bizDaywork.setDeptId(outsourcedOrderDetail.getProductionDeptId());
-            bizDayworkService.updateById(bizDaywork);
+            currentDaywork.setProcessQualifiedNum(currentReturnDetail.getAuditNum());
+            currentDaywork.setTemporaryProcessQualifiedNum(currentReturnDetail.getAuditNum());
+            currentDaywork.setDeptId(outsourcedOrderDetail.getProductionDeptId());
+            bizDayworkService.updateById(currentDaywork);
         }
         //修改发出单
         outsourceOrderDetailList.forEach(item ->{