From 2f63acadcd111fe47b2feedf13adb9cffcd64b2c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 25 十月 2024 13:28:50 +0800
Subject: [PATCH] mes调用立即出库修改
---
src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java | 18 +++++++++++-------
1 files changed, 11 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 253a3d2..c09196b 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;
@@ -33,7 +34,7 @@
private ErpSqlServer erpSqlServer;
- @Transactional(rollbackFor = Throwable.class)
+ //@Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
public void InHedTBScheduler() {
//log.info("InHedTBScheduler寮�濮嬩簡");
@@ -42,18 +43,22 @@
List<InHedTB> inHeds = erpSqlServer.select(sqlInHed, InHedTB.class);
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.createInOrder(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);
}
}
@@ -68,7 +73,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