From 60af4db0b445edbb2856f9bc7199a3e627d32db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 11:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 28a8308..b065e50 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
@@ -44,7 +44,7 @@
if (!inHeds.isEmpty()) {
for (InHedTB inHed : inHeds) {
if (!Cools.isEmpty(inHed.getTemp3()) && inHed.getTemp3().equals("fault")) {
- continue;
+ //continue;
}
HashMap<String, String> condition = new HashMap<>();
condition.put("BillNo", "'" + inHed.getBillNo() + "'");
@@ -52,16 +52,19 @@
HashMap<String, Object> hedAndDet = new HashMap<>();
hedAndDet.put("hed", inHed);
hedAndDet.put("det", inDetTBS);
+ if (inDetTBS == null || inDetTBS.isEmpty()) {
+ continue;
+ }
try {
inMS.createInOrder(inHed, inDetTBS);
+ log.info("鍏ュ簱鍗曟嵁鎴愬姛,{}", inHed);
+ move(hedAndDet);
} catch (Exception e) {
- e.printStackTrace();
+ log.info(e.getMessage());
+ //e.printStackTrace();
String sql = "UPDATE erp_InHedTB SET Temp3 = 'fault' WHERE BillNo = '" + inHed.getBillNo() + "'";
- erpSqlServer.update(sql);
+ erpSqlServer.update(sql);
}
- log.info("鍏ュ簱鍗曟嵁鎴愬姛,{}", inHed);
- move(hedAndDet);
-
}
}
}
@@ -74,7 +77,6 @@
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() + "'");
--
Gitblit v1.9.1