From 7b34a626f1e0d8db378ff877429464c008b42bd3 Mon Sep 17 00:00:00 2001
From: yhj <1836460075@qq.com>
Date: 星期二, 20 五月 2025 13:27:46 +0800
Subject: [PATCH] 1

---
 gdbg/gdbg/Controllers/PrintController.cs |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/gdbg/gdbg/Controllers/PrintController.cs b/gdbg/gdbg/Controllers/PrintController.cs
index 2c41b38..ee526ec 100644
--- a/gdbg/gdbg/Controllers/PrintController.cs
+++ b/gdbg/gdbg/Controllers/PrintController.cs
@@ -25,7 +25,7 @@
                 // 淇敼 SQL 鏌ヨ浠ヨ繑鍥炴洿澶氬瓧娈�
                 string query = "SELECT ITEM_BARCODE, TO_CHAR(a.CREATE_DATE, 'YYYY-MM-DD HH24:MI:SS') AS PRINT_DATE, b.STAFF_NAME,a.quantity " +
                     "FROM MES_INV_ITEM_BARCODES a left join MES_STAFF b on a.CREATE_BY=b.STAFF_NO " +
-                    "WHERE BILL_NO = :orderNo  and TO_CHAR(a.CREATE_DATE, 'YYYY-MM-DD')=to_char(SYSDATE,'YYYY-MM-DD') " +
+                    "WHERE BILL_NO = :orderNo  and TO_CHAR(a.CREATE_DATE, 'YYYY-MM-DD')<=to_char(SYSDATE,'YYYY-MM-DD') and TO_CHAR(a.CREATE_DATE, 'YYYY-MM-DD')>=to_char(SYSDATE-2,'YYYY-MM-DD') " +
                     "order by a.CREATE_DATE desc";
 
 
@@ -99,7 +99,7 @@
 
         }
 
-        private static string ExtractErrorMessage(string oracleMessage)
+       /* private static string ExtractErrorMessage(string oracleMessage)
         {
             // 鍖归厤 "ORA-20002:" 鍚庣殑鍏蜂綋閿欒淇℃伅
             string pattern = @"ORA-20002:.*?:\s(.*?)(\n|$)";
@@ -112,8 +112,26 @@
 
             // 濡傛灉鏃犳硶鍖归厤锛屽垯杩斿洖瀹屾暣閿欒淇℃伅
             return oracleMessage;
+        }*/
+        private static string ExtractErrorMessage(string oracleMessage)
+        {
+            // 鍖归厤澶氫釜 ORA-20002: 鍚庣殑娈佃惤锛屾彁鍙栨渶鍚庝竴涓�
+            var matches = System.Text.RegularExpressions.Regex.Matches(
+                oracleMessage,
+                @"ORA-20002:(.*?)(?=ORA-\d{5}:|$)"
+            );
+
+            if (matches.Count > 0)
+            {
+                // 鎻愬彇鏈�鍚庝竴涓尮閰嶉」锛屽幓闄ゆ崲琛屽拰澶氫綑绌烘牸
+                return matches[matches.Count - 1].Groups[1].Value.Trim();
+            }
+
+            // 榛樿杩斿洖鍘熷閿欒
+            return oracleMessage;
         }
 
 
+
     }
 }

--
Gitblit v1.9.3