From 0868d9d032f3bfb5f9af870e3f9fbb63e9cb3b8c Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:29:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
index c1de539..e93a0a2 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.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.OutDetTB;
import com.zy.third.erp.entity.OutHedTB;
@@ -42,18 +43,22 @@
List<OutHedTB> inHeds = erpSqlServer.select(sqlInHed, OutHedTB.class);
if (!inHeds.isEmpty()) {
for (OutHedTB 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<OutDetTB> inDetTBS = erpSqlServer.selectList(OutDetTB.class, condition);
HashMap<String, Object> hedAndDet = new HashMap<>();
hedAndDet.put("hed", inHed);
hedAndDet.put("det", inDetTBS);
- boolean result = inMS.createOutOrder(inHed, inDetTBS);
- if (result) {
+ try {
+ inMS.createOutOrder(inHed, inDetTBS);
+ log.info("鍑哄簱鍗曟嵁鎴愬姛,{}", inHed);
move(hedAndDet);
- } else {
- String sql = "UPDATE erp_OutHedTB SET Temp3 = 鈥榝ault鈥� WHERE BillNo = '" + inHed.getBillNo() + "'";
+ } catch (Exception e) {
+ e.printStackTrace();
+ String sql = "UPDATE erp_OutHedTB SET Temp3 = 'fault' WHERE BillNo = '" + inHed.getBillNo() + "'";
erpSqlServer.update(sql);
}
}
--
Gitblit v1.9.1