生产管理修改

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -31,8 +31,8 @@ public interface LauncherConstant {
     /**
      * nacos dev 地址
      */
-//    String NACOS_DEV_ADDR = "192.168.249.27:8848";
-    String NACOS_DEV_ADDR = "127.0.0.1:8848";
+    String NACOS_DEV_ADDR = "192.168.249.27:8848";
+//    String NACOS_DEV_ADDR = "127.0.0.1:8848";
 
     /**R
      * nacos prod 地址

blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynCloseProdPlanProcessor.java

@@ -1,19 +1,23 @@
 package org.springblade.job.processor.erp;
 
-import lombok.RequiredArgsConstructor;
+import jakarta.annotation.Resource;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.erpdata.feign.IErpMesRbWoClient;
+import org.springframework.stereotype.Component;
 import tech.powerjob.worker.core.processor.ProcessResult;
 import tech.powerjob.worker.core.processor.TaskContext;
 import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
 
 import java.util.concurrent.CompletableFuture;
 
-@RequiredArgsConstructor
+@Data
+@Component
 @Slf4j
 public class SynCloseProdPlanProcessor implements BasicProcessor {
 
-    private final IErpMesRbWoClient mesRbWoClient;
+    @Resource
+    private IErpMesRbWoClient mesRbWoClient;
 
 
     @Override

blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynCraftProcessor.java

@@ -1,19 +1,23 @@
 package org.springblade.job.processor.erp;
 
-import lombok.RequiredArgsConstructor;
+import jakarta.annotation.Resource;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.erpdata.feign.IErpMesRbWoClient;
+import org.springframework.stereotype.Component;
 import tech.powerjob.worker.core.processor.ProcessResult;
 import tech.powerjob.worker.core.processor.TaskContext;
 import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
 
 import java.util.concurrent.CompletableFuture;
 
-@RequiredArgsConstructor
+@Data
+@Component
 @Slf4j
 public class SynCraftProcessor implements BasicProcessor {
 
-    private final IErpMesRbWoClient mesRbWoClient;
+    @Resource
+    private IErpMesRbWoClient mesRbWoClient;
 
 
 

blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynGlassCakeProcessor.java

@@ -1,20 +1,23 @@
 package org.springblade.job.processor.erp;
 
-import lombok.RequiredArgsConstructor;
+import jakarta.annotation.Resource;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.desk.order.feign.IApsOrderClient;
-import org.springblade.erpdata.feign.IErpMesRbWoClient;
+import org.springframework.stereotype.Component;
 import tech.powerjob.worker.core.processor.ProcessResult;
 import tech.powerjob.worker.core.processor.TaskContext;
 import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
 
 import java.util.concurrent.CompletableFuture;
 
-@RequiredArgsConstructor
+@Data
+@Component
 @Slf4j
 public class SynGlassCakeProcessor implements BasicProcessor {
 
-    private final IApsOrderClient orderClient;
+    @Resource
+    private IApsOrderClient orderClient;
 
 
 

blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynMesRbWoProcessor.java

@@ -1,19 +1,23 @@
 package org.springblade.job.processor.erp;
 
-import lombok.RequiredArgsConstructor;
+import jakarta.annotation.Resource;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.erpdata.feign.IErpMesRbWoClient;
+import org.springframework.stereotype.Component;
 import tech.powerjob.worker.core.processor.ProcessResult;
 import tech.powerjob.worker.core.processor.TaskContext;
 import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
 
 import java.util.concurrent.CompletableFuture;
 
-@RequiredArgsConstructor
+@Data
+@Component
 @Slf4j
 public class SynMesRbWoProcessor implements BasicProcessor {
 
-    private final IErpMesRbWoClient mesRbWoClient;
+    @Resource
+    private IErpMesRbWoClient mesRbWoClient;
 
 
 

blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynOutsourcingProcessor.java

@@ -1,19 +1,23 @@
 package org.springblade.job.processor.erp;
 
-import lombok.RequiredArgsConstructor;
+import jakarta.annotation.Resource;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.erpdata.feign.IErpMesRbWoClient;
+import org.springframework.stereotype.Component;
 import tech.powerjob.worker.core.processor.ProcessResult;
 import tech.powerjob.worker.core.processor.TaskContext;
 import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
 
 import java.util.concurrent.CompletableFuture;
 
-@RequiredArgsConstructor
+@Data
+@Component
 @Slf4j
 public class SynOutsourcingProcessor implements BasicProcessor {
 
-    private final IErpMesRbWoClient mesRbWoClient;
+    @Resource
+    private IErpMesRbWoClient mesRbWoClient;
 
 
 

blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseLOTTJProcessor.java

@@ -1,19 +1,23 @@
 package org.springblade.job.processor.erp;
 
-import lombok.RequiredArgsConstructor;
+import jakarta.annotation.Resource;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.erpdata.feign.IErpMesRbWoClient;
+import org.springframework.stereotype.Component;
 import tech.powerjob.worker.core.processor.ProcessResult;
 import tech.powerjob.worker.core.processor.TaskContext;
 import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
 
 import java.util.concurrent.CompletableFuture;
 
-@RequiredArgsConstructor
+@Data
+@Component
 @Slf4j
 public class SynPurchaseLOTTJProcessor implements BasicProcessor {
 
-    private final IErpMesRbWoClient mesRbWoClient;
+    @Resource
+    private IErpMesRbWoClient mesRbWoClient;
 
 
 

blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseProcessor.java

@@ -1,19 +1,23 @@
 package org.springblade.job.processor.erp;
 
-import lombok.RequiredArgsConstructor;
+import jakarta.annotation.Resource;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.erpdata.feign.IErpMesRbWoClient;
+import org.springframework.stereotype.Component;
 import tech.powerjob.worker.core.processor.ProcessResult;
 import tech.powerjob.worker.core.processor.TaskContext;
 import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
 
 import java.util.concurrent.CompletableFuture;
 
-@RequiredArgsConstructor
+@Data
+@Component
 @Slf4j
 public class SynPurchaseProcessor implements BasicProcessor {
 
-    private final IErpMesRbWoClient mesRbWoClient;
+    @Resource
+    private IErpMesRbWoClient mesRbWoClient;
 
 
 

blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynSinterProcessor.java

@@ -1,19 +1,23 @@
 package org.springblade.job.processor.erp;
 
-import lombok.RequiredArgsConstructor;
+import jakarta.annotation.Resource;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.erpdata.feign.IErpMesRbWoClient;
+import org.springframework.stereotype.Component;
 import tech.powerjob.worker.core.processor.ProcessResult;
 import tech.powerjob.worker.core.processor.TaskContext;
 import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
 
 import java.util.concurrent.CompletableFuture;
 
-@RequiredArgsConstructor
+@Data
+@Component
 @Slf4j
 public class SynSinterProcessor implements BasicProcessor {
 
-    private final IErpMesRbWoClient mesRbWoClient;
+    @Resource
+    private IErpMesRbWoClient mesRbWoClient;
 
 
 

blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynSupportingFacilitiesProcessor.java

@@ -1,19 +1,23 @@
 package org.springblade.job.processor.erp;
 
-import lombok.RequiredArgsConstructor;
+import jakarta.annotation.Resource;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.erpdata.feign.IErpMesRbWoClient;
+import org.springframework.stereotype.Component;
 import tech.powerjob.worker.core.processor.ProcessResult;
 import tech.powerjob.worker.core.processor.TaskContext;
 import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
 
 import java.util.concurrent.CompletableFuture;
 
-@RequiredArgsConstructor
+@Data
+@Component
 @Slf4j
 public class SynSupportingFacilitiesProcessor implements BasicProcessor {
 
-    private final IErpMesRbWoClient mesRbWoClient;
+    @Resource
+    private IErpMesRbWoClient mesRbWoClient;
 
 
 

blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynTemporaryProcessor.java

@@ -1,19 +1,23 @@
 package org.springblade.job.processor.erp;
 
-import lombok.RequiredArgsConstructor;
+import jakarta.annotation.Resource;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.erpdata.feign.IErpMesRbWoClient;
+import org.springframework.stereotype.Component;
 import tech.powerjob.worker.core.processor.ProcessResult;
 import tech.powerjob.worker.core.processor.TaskContext;
 import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
 
 import java.util.concurrent.CompletableFuture;
 
-@RequiredArgsConstructor
+@Data
+@Component
 @Slf4j
 public class SynTemporaryProcessor implements BasicProcessor {
 
-    private final IErpMesRbWoClient mesRbWoClient;
+    @Resource
+    private IErpMesRbWoClient mesRbWoClient;
 
 
 

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

@@ -1589,6 +1589,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         }
         // 修改车间订单当前加工工序
         workOrder.setWpId(workPlan.getId());
+        workOrder.setTsId(workPlan.getMakeTeam());
         workOrder.setOemType(-1);
 
         YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId());