From 896aea7374cf621a0e16b9c90eadff763cad7677 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 05 六月 2025 10:53:29 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 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 31326fe..abe3b38 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
@@ -41,7 +41,7 @@
     public void OutHedTBScheduler() {
         //log.info("OutHedTBScheduler寮�濮嬩簡");
         if (!erpEnabled) return;
-        String sqlInHed = "select * from erp_OutHedTB where LKName='涓壃浜屾湡'";
+        String sqlInHed = "select * from erp_OutHedTB where LKName='楂橀湒绔嬪簱'";
         List<OutHedTB> inHeds = erpSqlServer.select(sqlInHed, OutHedTB.class);
         if (!inHeds.isEmpty()) {
             for (OutHedTB inHed : inHeds) {
@@ -49,11 +49,14 @@
                     //continue;
                 }
                 HashMap<String, String> condition = new HashMap<>();
-                condition.put("BillNo", "'" + inHed.getBillNo() + "'");
+                condition.put("bill_no", "'" + inHed.getBillNo() + "'");
                 List<OutDetTB> inDetTBS = erpSqlServer.selectList(OutDetTB.class, condition);
                 HashMap<String, Object> hedAndDet = new HashMap<>();
                 hedAndDet.put("hed", inHed);
                 hedAndDet.put("det", inDetTBS);
+                if (inDetTBS == null || inDetTBS.isEmpty()) {
+                    continue;
+                }
                 try {
                     inMS.createOutOrder(inHed, inDetTBS);
                     log.info("鍑哄簱鍗曟嵁鎴愬姛,{}", inHed);
@@ -70,11 +73,10 @@
     }
 
 
-
     public void OutHedTBScheduler(String orderNo) {
         //log.info("OutHedTBScheduler寮�濮嬩簡");
         if (!erpEnabled) return;
-        String sqlInHed = "select * from erp_OutHedTB where LKName='涓壃浜屾湡' and BillNo = '"+ orderNo +"'";
+        String sqlInHed = "select * from erp_OutHedTB where LKName='楂橀湒绔嬪簱' and BillNo = '" + orderNo + "'";
         List<OutHedTB> inHeds = erpSqlServer.select(sqlInHed, OutHedTB.class);
         if (!inHeds.isEmpty()) {
             for (OutHedTB inHed : inHeds) {
@@ -107,12 +109,12 @@
         OutHedTB hed = (OutHedTB) hedAndDet.get("hed");
         ArrayList<OutDetTB> dets = (ArrayList<OutDetTB>) hedAndDet.get("det");
         HashMap<String, String> condition = new HashMap<>();
-        condition.put("BillNo", "'" + hed.getBillNo() + "'");
+        condition.put("bill_no", "'" + hed.getBillNo() + "'");
         erpSqlServer.delete(OutHedTB.class, condition);
         for (OutDetTB det : dets) {
             HashMap<String, String> condition2 = new HashMap<>();
-            condition2.put("BillNo", "'" + det.getBillNo() + "'");
-            condition2.put("iNo", String.valueOf(det.getINO()));
+            condition2.put("bill_no", "'" + det.getBillNo() + "'");
+            condition2.put("i_no", String.valueOf(det.getINO()));
             erpSqlServer.delete(OutDetTB.class, condition2);
         }
 

--
Gitblit v1.9.1