From 611a816801c58abcc81d511a7dfc368f8d8fb24e Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 22 十一月 2024 14:16:59 +0800
Subject: [PATCH] 修改定时任务触发方式，不是以固定时间执行，以执行完成任务，间隔多少时间在此执行
---
src/main/java/com/zy/asrs/controller/OpenController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6d247c2..9a39330 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -116,6 +116,9 @@
return R.parse(BaseRes.PARAM);
}
String docName = param.get鎿嶄綔鍗曟嵁();
+ if (Cools.isEmpty(docName)) {
+ docName = param.getOrderType();
+ }
switch (docName) {
case "Purchase":
mappingPakOutOrderParam(param, true, "閾跺骇閲囪喘鍏ュ簱鍗�");
@@ -156,9 +159,16 @@
case "鐢熶骇鏉愭枡鍑哄簱琛ユ枡":
mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱琛ユ枡");
break;
+
+ case "鍗婃垚鍝佸叆搴撳崟":
+ mappingPakOutOrderParam(param, true, "鍗婃垚鍝佸叆搴撳崟");
+ break;
+ case "鎴愬搧鍏ュ簱鍗�":
+ mappingPakOutOrderParam(param, true, "鎴愬搧鍏ュ簱鍗�");
+ break;
default:
log.info("鏈煡鐨勫崟鎹被鍨�:{}", param);
- mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
+ mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
break;
}
@@ -249,7 +259,7 @@
break;
default:
log.info("鏈煡鐨勫崟鎹被鍨�:{}", param);
- mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
+ mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
break;
}
@@ -316,6 +326,8 @@
//orderDetl.setbFree1(param.getBFree1());
orderDetl.setId(param.getId());
orderDetl.setIvouchrowno(param.getIvouchrowno());
+ orderDetl.setINum(param.getINum());
+ orderDetl.setIinvexchrate(param.getIinvexchrate());
//娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
@@ -352,10 +364,11 @@
//orderDetl.setiQuantity(childInfo.getIQuantity());
orderDetl.setCsocode(param.getCsocode());
//orderDetl.setbFree1(childInfo.getBFree1());
- orderDetl.setId(childInfo.getIds());
+ orderDetl.setId(Cools.isEmpty(childInfo.getIPOsID()) ? childInfo.getId() : childInfo.getIPOsID());
orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
-
-
+ if (!Cools.isEmpty(childInfo.getCFree1())) {
+ orderDetl.setBFree1(childInfo.getCFree1());
+ }
orderDetls.add(orderDetl);
}
orderSyncParam.setChildren(orderDetls);
@@ -384,6 +397,9 @@
orderDetl.setCsocode(param.getCsocode());
orderDetl.setId(childInfo.getIds());
//orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
+ if (!Cools.isEmpty(childInfo.getCFree1())) {
+ orderDetl.setBFree1(childInfo.getCFree1());
+ }
orderDetls.add(orderDetl);
}
orderSyncParam.setChildren(orderDetls);
--
Gitblit v1.9.1