From 0868d9d032f3bfb5f9af870e3f9fbb63e9cb3b8c Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:29:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
index 3e8aacd..6f33115 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
@@ -7,6 +7,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
@@ -19,28 +20,38 @@
private Boolean erpEnabled;
@Autowired
- private ERPInCancelSchedulerMS inMS;
+ private ERPInOrOutCancelService inMS;
@Autowired
private ErpSqlServer erpSqlServer;
- @Scheduled(cron = "${erp.refreshtime}")
+
+ @Transactional(rollbackFor = Throwable.class)
+ //@Scheduled(cron = "${erp.refreshtime}")
public void InCancelScheduler() {
- log.info("InCancelScheduler寮�濮嬩簡");
if (!erpEnabled) return;
String sqlInCancelTB = "select * from erp_InCancelTB where LKName='涓壃浜屾湡'";
List<InCancelTB> ins = erpSqlServer.select(sqlInCancelTB, InCancelTB.class);
for (InCancelTB in : ins) {
- System.out.println(in);
- com.zy.third.lk.entity.InCancelTB lkCancel = inMS.tryCancel(in);
+ com.zy.third.lk.entity.InCancelTB lkCancel = inMS.tryCancel(in.getBillNo());
if (lkCancel != null) {
HashMap<String, String> condition = new HashMap<>();
condition.put("BillNo", "'" + in.getBillNo() + "'");
- erpSqlServer.delete(InCancelTB.class, condition);
+ int delete = erpSqlServer.delete(InCancelTB.class, condition);
+ if (delete > 0) {
+ log.info("灏嗗叆搴撳彇娑堥�氱煡鍗曞垹闄ゆ垚鍔�,{}", lkCancel.getBillNo());
+ } else {
+ log.error("灏嗗叆搴撳彇娑堥�氱煡鍗曞垹闄ゅけ璐�,{}", lkCancel.getBillNo());
+ }
HashMap<String, Object> content = new HashMap<>();
content.put("BillNo", "'" + lkCancel.getBillNo() + "'");
content.put("opFlag", lkCancel.getOpFlag());
- erpSqlServer.insert(com.zy.third.lk.entity.InCancelTB.class, content);
+ int insert = erpSqlServer.insert(com.zy.third.lk.entity.InCancelTB.class, content);
+ if (insert > 0) {
+ log.info("灏嗗叆搴撳彇娑堥�氱煡鍗曞啓鍏ユ垚鍔�,{}", lkCancel.getBillNo());
+ } else {
+ log.error("灏嗗叆搴撳彇娑堥�氱煡鍗曞啓鍏ュけ璐�,{}", lkCancel.getBillNo());
+ }
} else {
log.error("灏嗗叆搴撳彇娑堥�氱煡鍗曞啓鍏ュけ璐�");
}
--
Gitblit v1.9.1