From 263dce23b5554668b7f947d45a91a6f28a0d8101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Fri, 27 Mar 2026 20:06:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/constant/LauncherConstant.java | 4 ++-- .../job/processor/erp/SynCloseProdPlanProcessor.java | 10 +++++++--- .../job/processor/erp/SynCraftProcessor.java | 10 +++++++--- .../job/processor/erp/SynGlassCakeProcessor.java | 11 +++++++---- .../job/processor/erp/SynMesRbWoProcessor.java | 10 +++++++--- .../job/processor/erp/SynOutsourcingProcessor.java | 10 +++++++--- .../job/processor/erp/SynPurchaseLOTTJProcessor.java | 10 +++++++--- .../job/processor/erp/SynPurchaseProcessor.java | 10 +++++++--- .../job/processor/erp/SynSinterProcessor.java | 10 +++++++--- .../erp/SynSupportingFacilitiesProcessor.java | 10 +++++++--- .../job/processor/erp/SynTemporaryProcessor.java | 10 +++++++--- .../produce/service/impl/WorkOrderServiceImpl.java | 1 + 12 files changed, 73 insertions(+), 33 deletions(-) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 9729cc37..7b82fcee 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/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 地址 diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynCloseProdPlanProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynCloseProdPlanProcessor.java index e608d57f..77c9ec46 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynCloseProdPlanProcessor.java +++ b/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 diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynCraftProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynCraftProcessor.java index c8892abd..133959e0 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynCraftProcessor.java +++ b/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; diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynGlassCakeProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynGlassCakeProcessor.java index 5ff307ee..359e2a21 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynGlassCakeProcessor.java +++ b/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; diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynMesRbWoProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynMesRbWoProcessor.java index d9933473..62b9b2b2 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynMesRbWoProcessor.java +++ b/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; diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynOutsourcingProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynOutsourcingProcessor.java index e2a6231c..d3324502 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynOutsourcingProcessor.java +++ b/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; diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseLOTTJProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseLOTTJProcessor.java index f84d4c73..56dc7cc8 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseLOTTJProcessor.java +++ b/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; diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseProcessor.java index 41b2c195..4e6f3ebf 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseProcessor.java +++ b/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; diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynSinterProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynSinterProcessor.java index 1afda091..568aeb3d 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynSinterProcessor.java +++ b/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; diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynSupportingFacilitiesProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynSupportingFacilitiesProcessor.java index b98ac197..c5419388 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynSupportingFacilitiesProcessor.java +++ b/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; diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynTemporaryProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynTemporaryProcessor.java index aa43fb0c..788ada44 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynTemporaryProcessor.java +++ b/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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java index 85549a51..24e7a61c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java @@ -1589,6 +1589,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl