From fe7eb8332cad8d7cd545f7f915eed1806de3d34a Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期四, 25 七月 2024 16:12:10 +0800
Subject: [PATCH] 新增盘点再入库
---
src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 cd51026..253a3d2 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
@@ -26,19 +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寮�濮嬩簡");
+ //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) {
System.out.println(inHed);
HashMap<String, String> condition = new HashMap<>();
@@ -47,7 +49,7 @@
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) {
move(hedAndDet);
} else {
@@ -58,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");
@@ -71,7 +74,6 @@
condition2.put("BillNo", "'" + det.getBillNo() + "'");
condition2.put("iNo", String.valueOf(det.getINO()));
erpSqlServer.delete(InDetTB.class, condition2);
-
}
}
--
Gitblit v1.9.1