From 01824c5104590b96a3040faa317969bcd812bcca Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 21 九月 2024 08:17:04 +0800
Subject: [PATCH] Merge branch 'xgmFlasrs' into xgmFlasrs2 hebing
---
src/main/java/com/zy/third/erp/task/ERPItemScheduler.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
index c9f26a1..f5dd32b 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
@@ -2,43 +2,50 @@
import com.zy.common.service.erp.ErpSqlServer;
import com.zy.third.erp.entity.ItemTB;
+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;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+/**
+ * 鐗╂枡妗ｆ
+ */
+@Slf4j
@Component
public class ERPItemScheduler {
@Value("${erp.enabled}")
private Boolean erpEnabled;
@Autowired
- private ERPItemSchedulerMS erpItemSchedulerMS;
+ private ERPItemService erpItemService;
@Autowired
private ErpSqlServer erpSqlServer;
+
+
+ @Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
public void ItemScheduler() {
+ //log.info("ItemScheduler寮�濮嬩簡");
if (!erpEnabled) return;
-
-// String selectALL = "SELECT AutoId AS autoId,ItemId AS ItemID,ItemCode AS ItemCode,ItemName AS ItemName ,ItemSpc AS ItemSpc,ItemPic AS itemPic,ItemUnit AS ItemUnit,ItemKind AS ItemKind ,Remark AS remark ,Flag AS flag ,MakeDate AS makedate,Temp1 AS temp1,Temp2 AS temp2 ,Temp3 AS temp3 FROM dbo.erp_ItemTB";
-// List<ItemTB> itemTBS = erpSqlServer.select(selectALL, ItemTB.class);
-// List<ItemTB> itemTBS = erpSqlServer.selectAll(ItemTB.class);
-
- String sqlItemTB = "select * from erp_ItemTB where LKName='涓壃'";
+ String sqlItemTB = "select TOP 1000 * from erp_ItemTB where LKName='涓壃浜屾湡'";
List<ItemTB> itemTBS = erpSqlServer.select(sqlItemTB, ItemTB.class);
if (itemTBS != null && itemTBS.size() > 0) {
for (ItemTB itemTB : itemTBS) {
+ log.info("鏂板鐗╂枡鎴愬姛,{}", itemTB);
//00浠ｈ〃鏂板
if (itemTB.getFlag().equals("00")) {
- erpItemSchedulerMS.addToMainDatabase(itemTB);
+ erpItemService.addToMainDatabase(itemTB);
}
//22浠ｈ〃鍒犻櫎
if (itemTB.getFlag().equals("22")) {
- erpItemSchedulerMS.deleteFromMainDatabase(itemTB);
+ log.info("鍒犻櫎鐗╂枡鎴愬姛,{}", itemTB);
+ erpItemService.deleteFromMainDatabase(itemTB);
}
moveToBak(itemTB);
}
@@ -52,12 +59,6 @@
*/
//灏嗘暟鎹粠涓昏〃绉诲姩鍒癰ak琛ㄩ噷
private void moveToBak(ItemTB itemTB) {
-// ItemTBBak itemTBBak = new ItemTBBak();
-// BeanUtils.copyProperties(itemTB, itemTBBak);
-// itemTBBak.setDelDate(new Date());
-// erpItemTBBakMapper.insert(itemTBBak);
- erpSqlServer.update("delete from erp_ItemTB where LKName='涓壃' and ItemId = '" + itemTB.getItemId() + "'");
-// erpItemTBMapper.delete(new EntityWrapper<ItemTB>()
-// .eq("ItemId",itemTB.getItemID()));
+ erpSqlServer.update("delete from erp_ItemTB where LKName='涓壃浜屾湡' and ItemId = '" + itemTB.getItemId() + "'");
}
}
--
Gitblit v1.9.1