From 00b6ee0318f62da3ca5200f6a1eb7aeaddf42433 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 16 十月 2025 13:40:07 +0800
Subject: [PATCH] 数据库字段做映射

---
 Services/MesOrderStaManager.cs |   34 +++++++++++++---------------------
 1 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/Services/MesOrderStaManager.cs b/Services/MesOrderStaManager.cs
index 34bfe3c..759677a 100644
--- a/Services/MesOrderStaManager.cs
+++ b/Services/MesOrderStaManager.cs
@@ -104,15 +104,18 @@
         // 濡傛灉鏍囪涓�1,闇�瑕佸鐞嗛妫�鐩稿叧閫昏緫
         if (entity.Flag == 1)
         {
-            // 璋冪敤瀛樺偍杩囩▼鎵ц鑷姩棣栨
-            // Db.Ado.ExecuteCommand(
-            //     "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
-            //     new SugarParameter("BILL_NO", womdaa.Daa001,
-            //         DbType.String));
+            //璋冪敤瀛樺偍杩囩▼鎵ц鑷姩棣栨
+             Db.Ado.ExecuteCommand(
+                 "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
+                 new SugarParameter("BILL_NO", womdaa.Daa001, System.Data.DbType.String));
             var automaticIpqcFirstCheck =
                 mesQaItemsDetect02Manager
                     .AutomaticIpqcFirstCheck(womdaa.Daa001);
-            if (!automaticIpqcFirstCheck) throw new Exception("棣栨鐢熸垚澶辫触");
+            if (!automaticIpqcFirstCheck)
+            {
+                Console.WriteLine($"鑷姩棣栨澶辫触锛屽伐鍗曞彿锛歿womdaa.Daa001}");
+                throw new Exception("棣栨鐢熸垚澶辫触");
+            }
 
             // 鑾峰彇褰撳墠鏃堕棿
             var s1 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -204,6 +207,9 @@
             // 濡傛灉鏈夎皟鏈哄紑濮嬫椂闂村垯鏇存柊
             .SetColumnsIF(entity.MaStartTime != null,
                 s => s.MaStartTime == entity.MaStartTime)
+            // 濡傛灉鏈夎皟鏈哄畬鎴愭椂闂村垯鏇存柊
+            .SetColumnsIF(entity.MaEndTime != null,
+                s => s.MaEndTime == entity.MaEndTime)
             // 濡傛灉鏍囪涓�1鍒欐洿鏂板娉ㄤ俊鎭�
             .SetColumnsIF(entity.Flag == 1,
                 s => s.remark == "浜�" + entity.MaShoutTime + "鏃堕棿鏈変竴娆¢�佹")
@@ -581,7 +587,7 @@
 
         if (binding)
             return Db.Updateable<MesOrderSta>()
-                .SetColumns(s => s.MaEndTime == endDate)
+                .SetColumns(s => s.MaEndTime == endDate) // 鑷姩鍐欏叆璋冩満瀹屾垚鏃堕棿
                 .SetColumns(s => s.StartTime == entity.MaShoutTime)
                 .Where(s => s.OrderId == query.OrderId).ExecuteCommand() > 0;
 
@@ -616,18 +622,4 @@
         // 鏇存柊宸ュ崟鏃堕棿鍜岀姸鎬�
         return UpdateTime(entity);
     }
-
-    /// <summary>
-    /// 鍒�鍏锋煡璇紙鏀寔缂栧彿鎴栧悕绉版ā绯婃煡璇級
-    /// </summary>
-    /// <param name="searchKey">鏌ヨ鍏抽敭瀛�</param>
-    /// <returns>鍒�鍏峰垪琛�</returns>
-    public List<MesCutterLedger> QueryTools(string searchKey)
-    {
-        return Db.Queryable<MesCutterLedger>()
-            .WhereIF(!string.IsNullOrEmpty(searchKey),
-                t => t.CutterId.Contains(searchKey) || t.CutterName.Contains(searchKey))
-            .ToList();
-    }
-
 }
\ No newline at end of file

--
Gitblit v1.9.3