From 7b40697a357feca756647b6c4afaa1b303f5938d Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期一, 06 十一月 2023 11:47:58 +0800 Subject: [PATCH] 修复拣料回库后库存更新错误bug --- src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java index 7dd3566..1619b74 100644 --- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java +++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java @@ -1,15 +1,17 @@ package com.zy.asrs.task; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.common.Cools; import com.zy.asrs.entity.Order; import com.zy.asrs.service.ApiLogService; import com.zy.asrs.service.OrderService; import com.zy.asrs.task.core.ReturnT; import com.zy.asrs.task.handler.OrderSyncHandler; +import com.zy.common.entity.Parameter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; import java.util.List; @@ -17,7 +19,7 @@ * Created by vincent on 2020/7/7 */ @Slf4j -//@Component +@Component public class OrderSyncScheduler { @Autowired @@ -39,11 +41,14 @@ @Scheduled(cron = "0/5 * * * * ? ") @Async("orderThreadPool") public void completeAndReport(){ - List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L).eq("status", 1)); - for (Order order : orders) { - ReturnT<String> result = orderSyncHandler.start(order); - if (!result.isSuccess()) { - log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo()); + String erpReport = Parameter.get().getErpReport(); + if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) { + List<Order> orders = orderService.selectComplete(); + for (Order order : orders) { + ReturnT<String> result = orderSyncHandler.start(order); + if (!result.isSuccess()) { + log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo()); + } } } } -- Gitblit v1.9.1