From 1d997b9fd1cc2627a1313be762a76cc7cd37fabe Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 07 六月 2022 13:25:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'aliyun/jkasrs' into jkasrs
---
src/main/java/com/zy/common/entity/Parameter.java | 3 +++
src/main/resources/mapper/LocDetlMapper.xml | 2 +-
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 18 ++++++++++++------
3 files changed, 16 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..19876f6 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,15 +1,18 @@
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 +20,7 @@
* Created by vincent on 2020/7/7
*/
@Slf4j
-//@Component
+@Component
public class OrderSyncScheduler {
@Autowired
@@ -39,11 +42,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.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());
+ }
}
}
}
diff --git a/src/main/java/com/zy/common/entity/Parameter.java b/src/main/java/com/zy/common/entity/Parameter.java
index 0eb52b5..d42c3d9 100644
--- a/src/main/java/com/zy/common/entity/Parameter.java
+++ b/src/main/java/com/zy/common/entity/Parameter.java
@@ -60,4 +60,7 @@
// 鎵撳寘涓嬬嚎
private String packDown;
+ // erp涓婃姤
+ private String erpReport;
+
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index d658560..dfff812 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -300,7 +300,7 @@
<select id="sum" resultType="java.lang.Integer">
SELECT SUM(anfme) FROM asr_loc_detl
</select>
- <select id="unreason" resultType="com.zy.asrs.entity.LocDetl">
+ <select id="unreason" resultMap="BaseResultMap">
SELECT
*
FROM
--
Gitblit v1.9.1