From ab6435ed8f14aa1eb4bc17b5eaf59fb2bdb994f7 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 12 一月 2026 16:55:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 8a9fe5c..6e4d79e 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -35,7 +35,7 @@
@Value("${erp.switch.ReviewOrderSwitch}")
private boolean ReviewOrderSwitch;
-// @Scheduled(cron = "0/20 * * * * ? ")
+ @Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReport(){
if(!ReviewOrderSwitch){
@@ -47,7 +47,7 @@
List<Order> orders = orderService.selectComplete();
if(orders.size() > 0){
for (Order order : orders) {
- if((order.getDocType() == 3 || order.getDocType() == 16) && order.getPayType() == null){ //璧版柊澧炴彁浜ゅ鏍告祦绋�
+ if((order.getDocType() == 3 || order.getDocType() == 16 || order.getDocType() == 23 || order.getDocType() == 24) && order.getPayType() == null){ //璧版柊澧炴彁浜ゅ鏍告祦绋�
ReturnT<String> result = saveOrderSyncHandler.start(order);//4宸插畬鎴�
if (!result.isSuccess()) {
log.error("鍗曟嵁[orderNo={}]鏂板淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
@@ -57,9 +57,9 @@
}else if( order.getDocType() == 21){ //瀵煎叆璁㈠崟鍑哄簱锛堥鏂欙級
order.setSettle(8L);
orderService.updateById(order);
- }else if(order.getPayType() == 1 || order.getSalesman() != null){
+ }else if((order.getPayType() != null && order.getPayType() == 1) && order.getSalesman() != null){
Order order1 = orderService.selectByNo(order.getSalesman());
- if(orderDetlPakinService.morpt(order.getSalesman())){
+ if(orderDetlPakinService.morpt(order.getSalesman(),order.getOrderNo())){
order.setSettle(11L); //yu/cheng/dan/deng/dai/chu/ku/dan
orderService.updateById(order);
}
--
Gitblit v1.9.1