From 000b588bfe72532d43a27483810d517b86ef94fb Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 22 十二月 2025 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs |   55 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs b/WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs
index d1ad83a..4ed2894 100644
--- a/WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs
+++ b/WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs
@@ -117,6 +117,7 @@
 
             try
             {
+                
                 errorLogs.Add($"=== {DateTime.Now:yyyy-MM-dd HH:mm:ss} 淇濆瓨寮�濮� ===");
 
                 // 1. 瑙f瀽鏁版嵁
@@ -124,6 +125,16 @@
                 string[] sArray = _value.Split(';');
                 string jsonData = sArray[0];
                 string user = sArray.Length > 1 ? sArray[1] : "unknown";
+
+                // 鏌ョ湅鏉冮檺妫�鏌�
+                if (!DBUtility.ClsPub.Security_Log("Gy_SteppedPriceCoefficient_Edit", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犵紪杈戞潈闄�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
 
                 errorLogs.Add($"瑙f瀽鏁版嵁: user={user}");
 
@@ -308,7 +319,7 @@
                             HMainSourceBillType, HMainSourceInterID, HMainSourceEntryID, HMainSourceBillNo,
                             HPrintQty, HProcID, HEmpID, HDeptID, HStockOrgID
                         ) VALUES (
-                            {HYear}, {HPeriod}, 'GYST', '',
+                            {HYear}, {HPeriod}, '3341', '',
                             {HInterID}, '{HDate.ToString("yyyy-MM-dd HH:mm:ss")}', '{safeHBillNo}', 1, '{safeHRemark}',
                             '', '{safeUser}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',
                             '', 0, 0, '', 0, 
@@ -468,14 +479,14 @@
                 List<object> columnNameList = new List<object>();
 
                 // 鏌ョ湅鏉冮檺妫�鏌�
-                //if (!DBUtility.ClsPub.Security_Log("Gy_MateNumRelation_Sec_Query", 1, false, user))
-                //{
-                //    objJsonResult.code = "0";
-                //    objJsonResult.count = 0;
-                //    objJsonResult.Message = "鏃犳煡鐪嬫潈闄�";
-                //    objJsonResult.data = null;
-                //    return objJsonResult;
-                //}
+                if (!DBUtility.ClsPub.Security_Log("Gy_SteppedPriceCoefficient_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
 
                 // 鏋勫缓鍩虹SQL
                 string baseSql = @"select * from h_v_Gy_SteppedPriceCoefficientBillWithSub";
@@ -485,7 +496,7 @@
 
                 // 澶勭悊鏌ヨ鏉′欢锛堢害瀹氾細鍓嶇鍙彂閫佹潯浠惰〃杈惧紡锛屽彲鑳戒互 AND 寮�澶达級
                 string whereClause = ProcessWhereClause(sWhere);
-                string orderByClause = "order by HItemID";
+                string orderByClause = "order by hmainid";
 
                 // 鏋勫缓瀹屾暣SQL
                 string sql;
@@ -596,6 +607,8 @@
             {
                 Console.WriteLine($"=== 缂栬緫椤甸潰鍒濆鍖栧紑濮� ===");
                 Console.WriteLine($"鍙傛暟 - HInterID: {HInterID}, User: {user}");
+
+
 
                 if (string.IsNullOrEmpty(HInterID) || HInterID == "0")
                 {
@@ -752,7 +765,15 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-
+                // 鏌ョ湅鏉冮檺妫�鏌�
+                if (!DBUtility.ClsPub.Security_Log("Gy_SteppedPriceCoefficient_Drop", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
                 //妫�鏌ュ崟鎹姸鎬�
                 string sql = "SELECT HBillStatus, HChecker FROM Gy_SteppedPriceCoefficientBillMain WHERE HInterID = " + HInterID;
                 ds = oCN.RunProcReturn(sql, "CheckStatus");
@@ -813,6 +834,18 @@
         {
             try
             {
+
+                // 鏌ョ湅鏉冮檺妫�鏌�
+                if (!DBUtility.ClsPub.Security_Log("Gy_SteppedPriceCoefficient_Check", 1, false, CurUserName))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲鏍告潈闄�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+
                 //妫�鏌ュ崟鎹姸鎬�
                 string checkSql = "SELECT HBillStatus, HChecker FROM Gy_SteppedPriceCoefficientBillMain WHERE HInterID = " + HInterID;
                 ds = oCN.RunProcReturn(checkSql, "CheckStatus");

--
Gitblit v1.9.1