From 40e24ffdfc95c186bccc24c2bc99a0ffcfec73e3 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期一, 29 七月 2024 10:48:21 +0800
Subject: [PATCH] 订单组托代码
---
src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
index e8b8a2e..139c9b7 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
@@ -3,6 +3,7 @@
import com.zy.common.service.erp.ErpSqlServer;
import com.zy.third.erp.entity.InDetTB;
import com.zy.third.erp.entity.InHedTB;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
@@ -16,6 +17,7 @@
/**
* 鍏ュ簱鍗曟嵁
*/
+@Slf4j
@Component
public class ERPInHedTBScheduler {
@@ -24,18 +26,21 @@
@Autowired
- private ERPInOrOutTBSchedulerMS inMS;
+ private ERPInOrOutService inMS;
@Autowired
private ErpSqlServer erpSqlServer;
+
+ @Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
public void InHedTBScheduler() {
+ //log.info("InHedTBScheduler寮�濮嬩簡");
if (!erpEnabled) return;
String sqlInHed = "select * from erp_InHedTB where LKName='涓壃浜屾湡'";
List<InHedTB> inHeds = erpSqlServer.select(sqlInHed, InHedTB.class);
- if (inHeds.size() > 0) {
+ if (!inHeds.isEmpty()) {
for (InHedTB inHed : inHeds) {
HashMap<String, String> condition = new HashMap<>();
condition.put("BillNo", "'" + inHed.getBillNo() + "'");
@@ -43,8 +48,9 @@
HashMap<String, Object> hedAndDet = new HashMap<>();
hedAndDet.put("hed", inHed);
hedAndDet.put("det", inDetTBS);
- boolean result = inMS.createOrder(inHed, inDetTBS);
+ boolean result = inMS.createInOrder(inHed, inDetTBS);
if (result) {
+ log.info("鍏ュ簱鍗曟嵁鎴愬姛,{}", inHed.getBillNo());
move(hedAndDet);
} else {
String sql = "UPDATE erp_InHedTB SET Temp3 = 鈥榝ault鈥� WHERE BillNo = '" + inHed.getBillNo() + "'";
@@ -54,7 +60,8 @@
}
}
- @Transactional
+
+ @Transactional(rollbackFor = Throwable.class)
public void move(HashMap<String, Object> hedAndDet) {
InHedTB hed = (InHedTB) hedAndDet.get("hed");
ArrayList<InDetTB> dets = (ArrayList<InDetTB>) hedAndDet.get("det");
@@ -67,7 +74,6 @@
condition2.put("BillNo", "'" + det.getBillNo() + "'");
condition2.put("iNo", String.valueOf(det.getINO()));
erpSqlServer.delete(InDetTB.class, condition2);
-
}
}
--
Gitblit v1.9.1