From 58dc66a9d999c7d350e1ee4bf32b8d85b6e20e00 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 21 九月 2024 10:32:42 +0800
Subject: [PATCH] 逻辑调整
---
src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 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..873ca15 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
@@ -1,5 +1,6 @@
package com.zy.third.erp.task;
+import com.core.common.Cools;
import com.zy.common.service.erp.ErpSqlServer;
import com.zy.third.erp.entity.InDetTB;
import com.zy.third.erp.entity.InHedTB;
@@ -26,52 +27,57 @@
@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);
+ if (!Cools.isEmpty(inHed.getTemp3()) && inHed.getTemp3().equals("fault")) {
+ continue;
+ }
HashMap<String, String> condition = new HashMap<>();
condition.put("BillNo", "'" + inHed.getBillNo() + "'");
List<InDetTB> inDetTBS = erpSqlServer.selectList(InDetTB.class, condition);
HashMap<String, Object> hedAndDet = new HashMap<>();
hedAndDet.put("hed", inHed);
hedAndDet.put("det", inDetTBS);
- boolean result = inMS.createOrder(inHed, inDetTBS);
- if (result) {
+ try {
+ inMS.createInOrder(inHed, inDetTBS);
+ log.info("鍏ュ簱鍗曟嵁鎴愬姛,{}", inHed);
move(hedAndDet);
- } else {
- String sql = "UPDATE erp_InHedTB SET Temp3 = 鈥榝ault鈥� WHERE BillNo = '" + inHed.getBillNo() + "'";
+ } catch (Exception e) {
+ e.printStackTrace();
+ String sql = "UPDATE erp_InHedTB SET Temp3 = 'fault' WHERE BillNo = '" + inHed.getBillNo() + "'";
erpSqlServer.update(sql);
}
}
}
}
- @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");
HashMap<String, String> condition = new HashMap<>();
condition.put("BillNo", "'" + hed.getBillNo() + "'");
erpSqlServer.delete(InHedTB.class, condition);
-
for (InDetTB det : dets) {
HashMap<String, String> condition2 = new HashMap<>();
condition2.put("BillNo", "'" + det.getBillNo() + "'");
condition2.put("iNo", String.valueOf(det.getINO()));
erpSqlServer.delete(InDetTB.class, condition2);
-
}
}
--
Gitblit v1.9.1