From 1d469834074a19ce291f70a783d9d7725430a6fa Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 22 十二月 2025 09:08:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
index 9e5f087..d9ae35d 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -2,6 +2,8 @@
import com.core.common.Cools;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetlPakin;
+import com.zy.asrs.service.OrderDetlPakinService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.kingdee.handler.SaveOrderSyncHandler;
@@ -28,11 +30,12 @@
private SaveOrderSyncHandler saveOrderSyncHandler;
@Autowired
private OrderService orderService;
-
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
@Value("${erp.switch.ReviewOrderSwitch}")
private boolean ReviewOrderSwitch;
- @Scheduled(cron = "0/20 * * * * ?")
+ @Scheduled(cron = "0/20 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReport(){
if(!ReviewOrderSwitch){
@@ -44,9 +47,30 @@
List<Order> orders = orderService.selectComplete();
if(orders.size() > 0){
for (Order order : orders) {
- ReturnT<String> result = saveOrderSyncHandler.start(order);//4宸插畬鎴�
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鏂板淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+ if(order.getDocType() == 3 || order.getDocType() == 16 || order.getPayType()!=1){ //璧版柊澧炴彁浜ゅ鏍告祦绋�
+ ReturnT<String> result = saveOrderSyncHandler.start(order);//4宸插畬鎴�
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]鏂板淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+ }
+// order.setSettle(8L);
+// orderService.updateById(order);
+ }else if( order.getDocType() == 21){ //瀵煎叆璁㈠崟鍑哄簱锛堥鏂欙級
+ order.setSettle(8L);
+ orderService.updateById(order);
+ }else if(order.getPayType() == 1 || order.getSalesman() != null){
+ Order order1 = orderService.selectByNo(order.getSalesman());
+ if(orderDetlPakinService.morpt(order.getSalesman())){
+ order.setSettle(11L); //yu/cheng/dan/deng/dai/chu/ku/dan
+ orderService.updateById(order);
+// ReturnT<String> result = saveOrderSyncHandler.start(order1);//4宸插畬鎴恏ui/bao/dan
+// if (!result.isSuccess()) {
+// log.error("鍗曟嵁[orderNo={}]鏂板淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+// }
+ }
+ }
+ else{
+ order.setSettle(9L);//涓嶉渶瑕佹柊澧炵洿鎺ュ鏍�
+ orderService.updateById(order);
}
}
}
--
Gitblit v1.9.1