From a4699af3282d7abe89f9a9be40e8742fdd3b12b3 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期五, 01 十一月 2024 14:30:38 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 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 e803553..e77f1fb 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;
@@ -33,7 +34,7 @@
     private ErpSqlServer erpSqlServer;
 
 
-    @Transactional(rollbackFor = Throwable.class)
+    //@Transactional(rollbackFor = Throwable.class)
     @Scheduled(cron = "${erp.refreshtime}")
     public void OutHedTBScheduler() {
         //log.info("OutHedTBScheduler寮�濮嬩簡");
@@ -42,19 +43,25 @@
         List<OutHedTB> inHeds = erpSqlServer.select(sqlInHed, OutHedTB.class);
         if (!inHeds.isEmpty()) {
             for (OutHedTB inHed : inHeds) {
+                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) {
-                    log.info("鍑哄簱鍗曟嵁鎴愬姛,{}", inHed.getBillNo());
+                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) {
+                    log.info(e.getMessage());
+//                    e.printStackTrace();
+                    String sql = "UPDATE erp_OutHedTB SET Temp3 = 'fault' WHERE BillNo = '" + inHed.getBillNo() + "'";
                     erpSqlServer.update(sql);
+//
                 }
             }
         }

--
Gitblit v1.9.1