From 1808fc8e1cad8ebf746b9c5385efad62801da069 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Thu, 30 Apr 2026 10:55:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E8=A7=84=E6=80=A7=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/DataVerifyProcessor.java | 33 +++++++++++++++++++ .../desk/order/feign/IOrderClient.java | 10 ++++++ .../desk/order/feign/OrderClient.java | 16 +++++++++ .../scheduling/mapper/WorkOrderMapper.xml | 2 +- 4 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 blade-ops/blade-job/src/main/java/org/springblade/job/processor/dashboard/DataVerifyProcessor.java diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/dashboard/DataVerifyProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/dashboard/DataVerifyProcessor.java new file mode 100644 index 00000000..6d2de435 --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/dashboard/DataVerifyProcessor.java @@ -0,0 +1,33 @@ +package org.springblade.job.processor.dashboard; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.order.feign.IOrderClient; +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; + +/** + * 工艺模块-返工任务 + * @author liweidong + */ +@Component +@Data +@Slf4j +public class DataVerifyProcessor implements BasicProcessor { + + @Resource + private IOrderClient client; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + log.info("订单合规性校验任务开始"); + CompletableFuture runFuture = CompletableFuture.runAsync(()->client.dataVerify()); + log.info("订单合规性校验任务结束"); + return new ProcessResult(true); + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IOrderClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IOrderClient.java index 440d8c5e..efc24be8 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IOrderClient.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IOrderClient.java @@ -20,6 +20,7 @@ public interface IOrderClient { String SAVE_GLASS_CAKE = API_PREFIX + "/saveGlassCake"; String CALCULATE_COATING_MATERIAL = API_PREFIX + "/calculateCoatingMaterial"; String INIT_YIELD_ORDER_DAILY_ASSIGN = API_PREFIX + "/initYieldOrderDailyAssign"; + String DATA_VERIFY = API_PREFIX + "/dataVerify"; /** @@ -42,4 +43,13 @@ public interface IOrderClient { @GetMapping(INIT_YIELD_ORDER_DAILY_ASSIGN) void initYieldOrderDailyAssign() throws Exception; + + /** + * 合规性校验 + * + * @return + */ + @GetMapping(DATA_VERIFY) + void dataVerify(); + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java index 810281a1..5bb271be 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java @@ -25,15 +25,22 @@ */ package org.springblade.desk.order.feign; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.v3.oas.annotations.Hidden; import lombok.RequiredArgsConstructor; +import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.order.pojo.entity.YieldPlan; import org.springblade.desk.order.service.IYieldOrderDailyAssignService; import org.springblade.desk.order.service.IYieldOrderService; import org.springblade.desk.order.service.IYieldPlanService; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.stream.Collectors; + /** * Feign 排产相关定时任务接口 * @@ -64,4 +71,13 @@ public class OrderClient implements IOrderClient { public void initYieldOrderDailyAssign() throws Exception { yieldOrderDailyAssignService.init(); } + + @Override + public void dataVerify() { + List list = orderService.list(Wrappers.lambdaQuery().in(YieldOrder::getValidationResult,16001,16003)); + if(CollectionUtils.isNotEmpty(list)){ + List idList = list.stream().map(BaseEntity::getId).collect(Collectors.toList()); + orderService.dataVerify(idList); + } + } } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml index cb4e168d..d35f6121 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml @@ -120,7 +120,7 @@ LEFT JOIN MES_YIELD_ORDER g on g.id = a.yo_id a.is_deleted = 0 and b.is_deleted = 0 and a.status in (1,2,3,5) - and b.plan_start_time is not null and b.plan_end_time is not null and g.work_center_id in (81,122,162) + and b.plan_start_time is not null and b.plan_end_time is not null and to_char(b.plan_start_time,'YYYY-MM-DD') = ]]> #{startTime}