生产管理修改

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ReworkProcessController.java

@@ -11,10 +11,8 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.desk.dashboard.service.IPrReworkProcessService;
 import org.springblade.desk.produce.pojo.dto.MesRbRedoRoutDTO;
 import org.springblade.desk.produce.service.IPdaSaveService;
-import org.springblade.erpdata.feign.IErpDataProduceClient;
 import org.springblade.erpdata.pojo.dto.ReworkProcessDTO;
 import org.springblade.erpdata.pojo.vo.ReworkProcessVO;
 import org.springframework.web.bind.annotation.*;
@@ -33,12 +31,8 @@ import java.util.List;
 @Tag(name = "返工订单", description = "接口")
 public class ReworkProcessController extends BladeController {
 
-    private final IErpDataProduceClient erpDataProduceClient;
-
     private final IPdaSaveService pdaSaveService;
 
-    private final IPrReworkProcessService reworkProcessService;
-
     @GetMapping("/loadReworkOrder")
     @ApiOperationSupport(order = 1)
     @Operation(summary = "erp查询返工订单", description  = "传入ReworkProcessDTO")

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java

@@ -3,6 +3,7 @@ package org.springblade.desk.produce.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -48,7 +49,8 @@ public class HandoverRecordServiceImpl extends BaseServiceImpl<HandoverRecordMap
 
     private final IWorkPlanService workPlanService;
 
-    private final IErpDataProduceClient erpDataProduceClient;
+    @Resource
+    private IErpDataProduceClient erpDataProduceClient;
 
     private final IWorkOrderRunService workOrderRunService;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/OrderDeclareServiceImpl.java

@@ -1,5 +1,6 @@
 package org.springblade.desk.produce.service.impl;
 
+import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -26,7 +27,8 @@ import java.util.List;
 @RequiredArgsConstructor
 public class OrderDeclareServiceImpl extends BaseServiceImpl<OrderDeclareMapper, OrderDeclare> implements IOrderDeclareService {
 
-    private final IErpDataProduceClient erpDataProduceClient;
+    @Resource
+    private IErpDataProduceClient erpDataProduceClient;
 
     @Override
     public boolean signDelete(Long id) {

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.sourceforge.barbecue.Barcode;
@@ -108,7 +109,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     private final IProcessAbilityService processAbilityService;
 
-    private final IErpDataProduceClient erpDataProduceClient;
+    @Resource
+    private IErpDataProduceClient erpDataProduceClient;
 
     private final IDsPartService dsPartService;
 
@@ -339,6 +341,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             workOrderRunService.save(workOrderRun);
 
             wo.setApprovalStatus(WorkOrder.APPROVAL_STATUS_UNDER);
+            wo.setWorId(workOrderRun.getId());
+            this.updateById(wo);
 
             Boolean frontHandle = null;
             for (WorkPlanRun item : newWprList) {