From 8aa883ebdf2e3a636aa639d3e918bd65edd0cfd1 Mon Sep 17 00:00:00 2001
From: yhj <1836460075@qq.com>
Date: 星期二, 20 五月 2025 15:34:03 +0800
Subject: [PATCH] 报工人
---
gdbg/gdbg/Controllers/PrintController.cs | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/gdbg/gdbg/Controllers/PrintController.cs b/gdbg/gdbg/Controllers/PrintController.cs
index 2c41b38..a694643 100644
--- a/gdbg/gdbg/Controllers/PrintController.cs
+++ b/gdbg/gdbg/Controllers/PrintController.cs
@@ -23,9 +23,13 @@
try
{
// 淇敼 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') " +
+ string query =
+
+ " SELECT a.ITEM_BARCODE, TO_CHAR(a.CREATE_DATE, 'YYYY-MM-DD HH24:MI:SS') AS PRINT_DATE, bgr.bgr, a.quantity " +
+ " FROM MES_INV_ITEM_BARCODES a left join(select case when sta.STAFF_NAME is null then a.CREATE_BY else sta.STAFF_NAME end bgr,a.ITEM_BARCODE " +
+ " from MES_WORK_PROD_C_DETAILS a left join mes_staff sta on a.CREATE_BY = sta.STAFF_NO) bgr on bgr.ITEM_BARCODE = a.ITEM_BARCODE " +
+ " 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') and TO_CHAR(a.CREATE_DATE, 'YYYY-MM-DD')>=to_char(SYSDATE-2,'YYYY-MM-DD') " +
"order by a.CREATE_DATE desc";
@@ -99,7 +103,7 @@
}
- private static string ExtractErrorMessage(string oracleMessage)
+ /* private static string ExtractErrorMessage(string oracleMessage)
{
// 鍖归厤 "ORA-20002:" 鍚庣殑鍏蜂綋閿欒淇℃伅
string pattern = @"ORA-20002:.*?:\s(.*?)(\n|$)";
@@ -112,8 +116,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