From d3c7820992ccfb3296ec031a7c019a4300347b83 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 十月 2025 15:30:25 +0800
Subject: [PATCH] 完善erp对接2.0
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 94 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 87 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..abb6d4e 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,15 +1,22 @@
package com.zy.asrs.task;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.Order1;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.Order1Service;
+import com.zy.asrs.service.OrderDetlService;
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 +24,7 @@
* Created by vincent on 2020/7/7
*/
@Slf4j
-//@Component
+@Component
public class OrderSyncScheduler {
@Autowired
@@ -26,6 +33,10 @@
private OrderService orderService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private Order1Service order1Service;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog(){
@@ -36,16 +47,85 @@
}
}
+ /**
+ * 鍏ュ簱璁㈠崟銆佸嚭搴撹鍗曞畬鎴愪笂鎶�
+ */
@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) {
+ if(order.getDocType()== 81){
+ continue;
+ }
+ try {
+ ReturnT<String> result = orderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp鎶ラ敊", order.getOrderNo());
+ }
}
}
}
+ /**
+ * 閿�鍞嚭搴撹鍗曟槑缁嗗畬鎴愪笂鎶�
+ */
+ @Scheduled(cron = "0/5 * * * * ? ")
+ @Async("orderThreadPool")
+ public synchronized void completeAndReport1(){
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<Order1> orders = order1Service.selectComplete();
+ for (Order1 order : orders) {
+ if(order.getDocType()!= 81){
+ continue;
+ }
+ try {
+ ReturnT<String> result = orderSyncHandler.start1(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }else {
+ //鏇存柊瀛愯〃鐘舵��4--銆�6
+ if (!order1Service.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负涓婃姤澶辫触");
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp鎶ラ敊", order.getOrderNo());
+ }
+ }
+ }
+ }
+
+// /**
+// * 閿�鍞嚭搴撹鍗曟槑缁嗗畬鎴愪笂鎶�
+// */
+// @Scheduled(cron = "0/5 * * * * ? ")
+// @Async("orderThreadPool")
+// public void completeAndReport1(){
+// String erpReport = Parameter.get().getErpReport();
+// if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+// List<OrderDetl> orderDetls = orderDetlService.reportERPOrderDetl();
+// for (OrderDetl orderDetl : orderDetls) {
+// Order order = orderService.selectByNo(orderDetl.getOrderNo());
+// try {
+// ReturnT<String> result = orderSyncHandler.start1(order, orderDetl);
+// if (!result.isSuccess()) {
+// log.error("鍗曟嵁鏄庣粏[orderNo={}],[matnr={}],[batch={}]涓婃姤erp澶辫触", orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch());
+// }
+// }catch (Exception e){
+// e.printStackTrace();
+// log.error("鍗曟嵁鏄庣粏[orderNo={}],[matnr={}],[batch={}]涓婃姤erp澶辫触", orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch());
+// }
+// }
+// }
+// }
+
}
--
Gitblit v1.9.1