From 0b0451d2ddbde67d272ff72fde688c5f1fe67f90 Mon Sep 17 00:00:00 2001
From: Administrator <2856754968@qq.com>
Date: 星期三, 05 十一月 2025 14:06:24 +0800
Subject: [PATCH] 111

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

diff --git a/Services/MesCutterLedgerManager.cs b/Services/MesCutterLedgerManager.cs
index 02b21ce..68c3e60 100644
--- a/Services/MesCutterLedgerManager.cs
+++ b/Services/MesCutterLedgerManager.cs
@@ -58,24 +58,32 @@
     /// <param name="type">鎿嶄綔绫诲瀷锛堜笂鍒�銆佷笅鍒�锛�</param>
     /// <param name="useLimit">浣跨敤涓婇檺</param>
     /// <returns>瀛樺偍杩囩▼鎵ц缁撴灉</returns>
-    public object SubmitToolAction(string workOrderNo, string machineNo, string toolNo, string type, int? useLimit, decimal? sdjs = null, decimal? xdjs = null)
+    public object SubmitToolAction(
+        string workOrderNo,
+        string machineNo,
+        string toolNo,
+        string type,
+        int? useLimit,
+        decimal? sdjs = null,
+        decimal? xdjs = null,
+        decimal? modlLifeWorning = null) // 鏂板锛氬鍛芥瘮棰勮鍊�(0~1鐨勫皬鏁�)
     {
         var parameters = new[]
         {
-            new SugarParameter("V_WORK_ORDER_NO", workOrderNo),
-            new SugarParameter("V_MACHINE_NO", machineNo),
-            new SugarParameter("V_TOOL_NO", toolNo),
-            new SugarParameter("V_TYPE", type),
-            new SugarParameter("V_USE_LIMIT", useLimit ?? (object)DBNull.Value),
-            new SugarParameter("V_SDJS", sdjs ?? (object)DBNull.Value),
-            new SugarParameter("V_XDJS", xdjs ?? (object)DBNull.Value),
-            new SugarParameter("PO_OUTMSG", null) { Direction = ParameterDirection.Output, DbType = System.Data.DbType.String, Size = 200 },
-            new SugarParameter("PO_OUTSUM", null) { Direction = ParameterDirection.Output, DbType = System.Data.DbType.Int32 }
-        };
+        new SugarParameter("V_WORK_ORDER_NO", workOrderNo),
+        new SugarParameter("V_MACHINE_NO", machineNo),
+        new SugarParameter("V_TOOL_NO", toolNo),
+        new SugarParameter("V_TYPE", type),
+        new SugarParameter("V_USE_LIMIT", useLimit ?? (object)DBNull.Value),
+        new SugarParameter("V_SDJS", sdjs ?? (object)DBNull.Value),
+        new SugarParameter("V_XDJS", xdjs ?? (object)DBNull.Value),
+        new SugarParameter("PO_OUTMSG", null) { Direction = ParameterDirection.Output, DbType = System.Data.DbType.String, Size = 200 },
+        new SugarParameter("PO_OUTSUM", null) { Direction = ParameterDirection.Output, DbType = System.Data.DbType.Int32 },
+        new SugarParameter("V_MODL_LIFE_WORNING", modlLifeWorning ?? (object)DBNull.Value) // 鏂板
+    };
         try
         {
-            Db.Ado.UseStoredProcedure().SqlQuery<object>(
-                "PROC_TOOL_ACTION", parameters);
+            Db.Ado.UseStoredProcedure().SqlQuery<object>("PROC_TOOL_ACTION", parameters);
             var outMsg = parameters[7].Value?.ToString();
             var outSum = parameters[8].Value;
             // 杩欓噷 outMsg 宸茬粡鍖呭惈浜嗗瓨鍌ㄨ繃绋嬫瘡姝ML鐨勮缁嗛敊璇俊鎭�

--
Gitblit v1.9.3