From 85f8eed3fa9f52a68dff30ea8bdee00fbc1d5938 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 22 十二月 2025 12:48:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 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 4fe4f26..8a9fe5c 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -2,8 +2,11 @@
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;
import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.entity.Parameter;
@@ -24,28 +27,47 @@
public class SaveOrderSyncScheduler {
@Autowired
- private SubmitOrderSyncHandler submitOrderSyncHandler;
+ private SaveOrderSyncHandler saveOrderSyncHandler;
@Autowired
private OrderService orderService;
-
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
@Value("${erp.switch.ReviewOrderSwitch}")
private boolean ReviewOrderSwitch;
-// @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/20 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReport(){
- if (1==1) return;
if(!ReviewOrderSwitch){
return;
}
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- // List<Order> orders = orderService.selectComplete8();
- List<Order> orders = OrderInAndOutUtil.selectComplete8(null);
- for (Order order : orders) {
- ReturnT<String> result = submitOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
+// List<Order> orders = OrderInAndOutUtil.selectComplete(null);
+ List<Order> orders = orderService.selectComplete();
+ if(orders.size() > 0){
+ for (Order order : orders) {
+ if((order.getDocType() == 3 || order.getDocType() == 16) && order.getPayType() == null){ //璧版柊澧炴彁浜ゅ鏍告祦绋�
+ 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);
+ }
+ }
+ else{
+ order.setSettle(9L);//涓嶉渶瑕佹柊澧炵洿鎺ュ鏍�
+ orderService.updateById(order);
+ }
}
}
}
--
Gitblit v1.9.1