合规性校验定时任务-sjx

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<Void> runFuture = CompletableFuture.runAsync(()->client.dataVerify());
+        log.info("订单合规性校验任务结束");
+        return new ProcessResult(true);
+    }
+}

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();
+
 }

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<YieldOrder> list = orderService.list(Wrappers.<YieldOrder>lambdaQuery().in(YieldOrder::getValidationResult,16001,16003));
+		if(CollectionUtils.isNotEmpty(list)){
+			List<Long> idList = list.stream().map(BaseEntity::getId).collect(Collectors.toList());
+			orderService.dataVerify(idList);
+		}
+	}
 }

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
         <where>
             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
             <if test="startTime !=null and startTime != ''">
                 and to_char(b.plan_start_time,'YYYY-MM-DD') <![CDATA[ >= ]]> #{startTime}
             </if>