From f8c29731de73b1c05a5336b433ad92d52eb4ee97 Mon Sep 17 00:00:00 2001
From: 如洲 陈 <1278080563@qq.com>
Date: 星期一, 27 十月 2025 08:38:03 +0800
Subject: [PATCH] 人员信息接口,首检巡检入库检优化,变更工单修改

---
 MES.Service/service/QC/SJService.cs |   55 ++++++++++++++++++++++++++-----------------------------
 1 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index 04c5723..bdc2cfd 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -423,39 +423,36 @@
 
     public int SJQaSubmit(string userNo, decimal id)
     {
-        return SqlSugarHelper.UseTransactionWithOracle(db =>
+        var db = SqlSugarHelper.GetInstance();
+        
+        // 杈撳嚭鍙傛暟
+        var poResult = new SugarParameter("PO_RESULT", null, System.Data.DbType.Int32, System.Data.ParameterDirection.Output, 4000);
+        var poText = new SugarParameter("PO_TEXT", null, System.Data.DbType.String, System.Data.ParameterDirection.Output, 4000);
+
+        // 杈撳叆鍙傛暟 + 杈撳嚭鍙傛暟
+        var parameters = new List<SugarParameter>
         {
-            var commit = 0;
+            new("P_ID", id, System.Data.DbType.Decimal, System.Data.ParameterDirection.Input),
+            new("P_USER", userNo ?? string.Empty, System.Data.DbType.String, System.Data.ParameterDirection.Input),
+            poResult,
+            poText
+        };
 
-            // 鎻愪氦棣栨鍗�
-            var sql = "update QS_ITEM_IPI_REQ set FSUBMIT=1, FSUBMIT_BY=:userNo, FSUBMIT_DATE=SYSDATE where ID=:id";
-            var parameters = new List<SugarParameter>
-            {
-                new(":userNo", userNo),
-                new(":id", id)
-            };
-            commit += db.Ado.ExecuteCommand(sql, parameters);
+        // 璋冪敤瀛樺偍杩囩▼鎻愪氦棣栨鍗�
+        db.Ado.ExecuteCommand(
+            "BEGIN PRC_GEN_TJQ_SJ(:P_ID, :P_USER, :PO_RESULT, :PO_TEXT); END;",
+            parameters.ToArray());
 
-            // 璇诲彇棣栨鍗曪紝鍙栫粨鏋滀笌璁″垝缂栧彿
-            var req = db.Queryable<QsItemIpiReq>().Single(s => s.Id == id);
-            if (req != null)
-            {
-                // 閫氳繃 PBAID 鎵惧埌 WOMDAA 鑾峰彇璁″垝缂栧彿 DAA001
-                var wom = db.Queryable<Womdaa>().Single(s => s.Id == req.Pbaid);
-                if (wom != null && !string.IsNullOrWhiteSpace(wom.Daa001))
-                {
-                    var resultText = req.IsPass == 1 ? "鍚堟牸" : "涓嶅悎鏍�";
-                    // 鏇存柊 WOMDAA锛氶妫�鏍囪涓庣粨鏋�
-                    commit += db.Updateable<Womdaa>()
-                        .SetColumns(w => w.Daa025 == "1")
-                        .SetColumns(w => w.Daa026 == resultText)
-                        .Where(w => w.Daa001 == wom.Daa001)
-                        .ExecuteCommand();
-                }
-            }
+        var code = Convert.ToInt32(poResult.Value?.ToString() ?? "0");
+        var message = poText.Value?.ToString() ?? "";
+        
+        // 濡傛灉瀛樺偍杩囩▼鎵ц澶辫触锛屾姏鍑哄紓甯�
+        if (code != 0)
+        {
+            throw new Exception($"棣栨鎻愪氦澶辫触: {message}");
+        }
 
-            return commit;
-        });
+        return code;
     }
 
     public (int code, string message) GenUpdateSJ(decimal id, string no, string userNo)

--
Gitblit v1.9.3