From 7125be069f3f926afe3e15366e9211646de1c637 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 19 七月 2024 15:35:12 +0800
Subject: [PATCH] 中间表代码提交,初步测试完成

---
 src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 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..fee4625 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,11 +20,13 @@
     private Boolean erpEnabled;
 
     @Autowired
-    private ERPInCancelSchedulerMS inMS;
+    private ERPInOrOutCancelService inMS;
 
     @Autowired
     private ErpSqlServer erpSqlServer;
 
+
+    @Transactional(rollbackFor = Throwable.class)
     @Scheduled(cron = "${erp.refreshtime}")
     public void InCancelScheduler() {
         log.info("InCancelScheduler寮�濮嬩簡");
@@ -32,15 +35,25 @@
         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