From 8df5325c7dce674563d10e3e73b90b7cabb63184 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 16 一月 2024 12:22:22 +0800
Subject: [PATCH] 过滤方案

---
 DAL/基础资料/公用基础资料/ClsXt_FastICScheme_Ctl.cs                 |  120 ++++++++++++++++------------------------
 WebAPI/Controllers/基础资料/基础资料/Xt_FastICSchemeController.cs |   32 +++-------
 2 files changed, 59 insertions(+), 93 deletions(-)

diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsXt_FastICScheme_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsXt_FastICScheme_Ctl.cs"
index 652f679..fdc23c3 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsXt_FastICScheme_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsXt_FastICScheme_Ctl.cs"
@@ -26,37 +26,59 @@
         #region 鍥哄畾浠g爜
 
         #endregion   鑷畾涔夋柟娉�
+        //鏂板鍗曟嵁
+        public bool AddBill(string HFilterIdLists, string HValue, string HElement_type, ref string sReturn)
+        {
+            try
+            {
+                oCn.BeginTran();
+                //濡傛灉褰撳墠淇濆瓨鐨勮繃婊ゆ柟妗堣缃负浜� 榛樿鏂规锛屽垯鎶� 榛樿杩囨护鏂规鏍囪閮芥竻闄�
+                if (omodel.HUseingFlag == 1)
+                {
+                    oCn.RunProc("update Xt_FastICSchemeMain set HUseingFlag = 0");
+                }
+                //涓昏〃
+                oCn.RunProc("Insert Into Xt_FastICSchemeMain   " +
+                "(HInterID,HName,HUserCode,HBillType,HBillName" +
+                ",HStopflag,HCreateDate,HUseingFlag,HRemark" +
+                ") " +
+                " values('" + omodel.HInterID.ToString() + "','" + omodel.HName + "','" + omodel.HUserCode + "'" +
+                "," + 3332 + ",'" + omodel.HBillName + "'," + omodel.HStopflag + "," + "getdate()" + "," + omodel.HUseingFlag + ",'" + omodel.HRemark +
+                "') ");
+                //鑾峰彇瀛愯〃鏁版嵁
+                string[] HFilterIdLists_arr = Regex.Split(HFilterIdLists, ",", RegexOptions.IgnoreCase);
+                string[] HValue_arr = Regex.Split(HValue, ",", RegexOptions.IgnoreCase);
+                string[] HElement_type_arr = Regex.Split(HElement_type, ",", RegexOptions.IgnoreCase);
+                //鎻掑叆瀛愯〃
+                for (var i = 0; i < HFilterIdLists_arr.Length; i++)
+                {
+                    oCn.RunProc("Insert Into xt_FastICSchemeSub " +
+                   "(HInterID,HKey,HValue,HDataType) " +
+                   " values('" + omodel.HInterID.ToString() + "','" + HFilterIdLists_arr[i] + "','" + HValue_arr[i] + "'" +
+                   ",'" + HElement_type_arr[i] +
+                   "') ");
+                }
+
+                sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+                oCn.Commit();
+                return true;
+            }
+            catch (Exception e)
+            {
+                sReturn = e.Message;
+                oCn.RollBack();
+                throw (e);
+            }
+        }
+
         //淇敼鍗曟嵁
         public bool ModifyBill(Int64 lngBillKey, string HFilterIdLists, string HValue, string HElement_type, ref string sReturn)
         {
             try
             {
-                //
+                //鏇存柊褰撳墠杩囨护鏂规鐨勮繃婊ゅ瓧娈典俊鎭�
                 oCn.BeginTran();
-                //鏇存柊涓昏〃
-                //oCn.RunProc("UpDate Cg_POOrderBillMain set  " +
-                //" HBillNo='" + omodel.HBillNo + "'" +  //鍥哄畾璧嬪��===============
-                //",HDate='" + omodel.HDate + "'" +
-                //",HYear='" + omodel.HYear.ToString() + "'" +
-                //",HPeriod='" + omodel.HPeriod.ToString() + "'" +
-                //",HRemark='" + omodel.HRemark + "'" +
-                //",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
-                //",HUpDateDate=getdate()" +
-                ////========================================
-                //",HSSDate='" + omodel.HSSDate + "'" +
-                //",HAddress='" + omodel.HAddress + "'" +
-                //",HSSID=" + omodel.HSSID.ToString() +
-                //",HPSStyleID=" + omodel.HPSStyleID.ToString() +
-                //",HSupID=" + omodel.HSupID.ToString() +
-                //",HCurID=" + omodel.HCurID.ToString() +
-                //",HExRate=" + omodel.HExRate.ToString() +
-                //",HEmpID=" + omodel.HEmpID.ToString() +
-                //",HManagerID=" + omodel.HManagerID.ToString() +
-                //",HDeptID=" + omodel.HDeptID.ToString() +
-                //",HExplanation='" + omodel.HExplanation + "'" +
-                //",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
-                //" where HInterID=" + lngBillKey.ToString());
-
+                
                 //鍒犻櫎瀛愯〃
                 DeleteBillSub(lngBillKey);
                 //鑾峰彇瀛愯〃鏁版嵁
@@ -83,52 +105,6 @@
                 oCn.RollBack();
                 throw (e);
             }
-        }
-        //鏂板鍗曟嵁
-        public bool AddBill(string HFilterIdLists, string HValue, string HElement_type, ref string sReturn)
-        {
-            try
-            {                              
-                oCn.BeginTran();
-                if (omodel.HUseingFlag == 1)
-                {
-                    oCn.RunProc("update Xt_FastICSchemeMain set HUseingFlag = 0");
-                }
-                //涓昏〃
-                oCn.RunProc("Insert Into Xt_FastICSchemeMain   " +
-                "(HInterID,HName,HUserCode,HBillType,HBillName" +
-                ",HStopflag,HCreateDate,HUseingFlag,HRemark" +              
-                ") " +
-                " values('" + omodel.HInterID.ToString() + "','" + omodel.HName + "','" + omodel.HUserCode + "'" +
-                "," + 3332 + ",'" + omodel.HBillName + "'," + omodel.HStopflag + "," + "getdate()" + "," + omodel.HUseingFlag + ",'" + omodel.HRemark +
-                "') ");
-                //鑾峰彇瀛愯〃鏁版嵁
-                string[] HFilterIdLists_arr = Regex.Split(HFilterIdLists, ",", RegexOptions.IgnoreCase);
-                string[] HValue_arr = Regex.Split(HValue, ",", RegexOptions.IgnoreCase);
-                string[] HElement_type_arr = Regex.Split(HElement_type, ",", RegexOptions.IgnoreCase);
-                //鎻掑叆瀛愯〃
-                for (var i = 0; i < HFilterIdLists_arr.Length;i++)
-                {
-                    oCn.RunProc("Insert Into xt_FastICSchemeSub " +
-                   "(HInterID,HKey,HValue,HDataType) " +
-                   " values('" + omodel.HInterID.ToString() + "','" + HFilterIdLists_arr[i] + "','" + HValue_arr[i] + "'" +
-                   ",'" + HElement_type_arr[i] + 
-                   "') ");
-                }
-               
-              
-                //
-                sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
-                oCn.Commit();
-                return true;
-            }
-            catch (Exception e)
-            {
-                sReturn = e.Message;
-                oCn.RollBack();
-                throw (e);
-            }
-        }
-
+        }       
     }
 }
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Xt_FastICSchemeController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Xt_FastICSchemeController.cs"
index b3f2c7a..5b5f6d0 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Xt_FastICSchemeController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Xt_FastICSchemeController.cs"
@@ -62,7 +62,7 @@
         }
 
         /// <summary>
-        /// 杩斿洖杩囨护鏂规鍒楄〃
+        /// 鍙屽嚮杩斿洖閫夋嫨鐨勮繃婊ゆ柟妗堝垪琛�
         ///鍙傛暟锛歴tring sql銆�
         ///杩斿洖鍊硷細object銆�
         /// </summary>
@@ -140,11 +140,11 @@
                 var _value = oMain["oMain"].ToString();
                 string msg1 = _value.ToString();
                 string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
-                string msg2 = sArray[0].ToString();//琛ㄥご
-                string msg3 = sArray[1].ToString();//杩囨护鏉′欢id
-                string msg4 = sArray[2].ToString();//杩囨护鍊�
-                string msg5 = sArray[3].ToString();//鏍囩绫诲瀷
-                string msg6 = sArray[4].ToString();//鐢ㄦ埛
+                string msg2 = sArray[0].ToString();//琛ㄥご瀛楁淇℃伅 鎴� 鍗曟嵁鍐呯爜
+                string HFilterIdLists = sArray[1].ToString();//杩囨护鏉′欢id
+                string HValue = sArray[2].ToString();//杩囨护鍊�
+                string HElement_type = sArray[3].ToString();//鏍囩绫诲瀷
+                string user = sArray[4].ToString();//鐢ㄦ埛
                 string OperationType = sArray[5].ToString();//鎿嶄綔绫诲瀷
 
                 DAL.ClsXt_FastICScheme_Ctl oBill = new DAL.ClsXt_FastICScheme_Ctl();
@@ -154,10 +154,13 @@
                 List<Model.ClsXt_FastICSchemeMain_Model> lsmain = new List<Model.ClsXt_FastICSchemeMain_Model>();
                 msg2 = msg2.Replace("\\", "");
                 msg2 = msg2.Replace("\n", "");  //\n
+
+                //褰撳墠鎿嶄綔绫诲瀷涓嶄负缂栬緫锛屽垯杩涜json鏁版嵁鐨勮В鏋�
                 if (Convert.ToInt32(OperationType) != 3)
                 {
                     lsmain = oListModels.getObjectByJson_Xt_FastICSchemeMain(msg2);
                 }
+                //褰撳墠鎿嶄綔绫诲瀷涓虹紪杈戯紝msg2 涓哄崟鎹唴鐮�
                 else
                 {
                     oBill.omodel.HInterID = Convert.ToInt32(msg2);
@@ -169,29 +172,16 @@
                     oBill.omodel = oItem;
                 }
 
-                ////琛ㄤ綋鏁版嵁
-                ////鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
-                //msg3 = msg3.Substring(1, msg3.Length - 2);
-                //msg3 = msg3.Replace("\\", "");
-                //msg3 = msg3.Replace("\n", "");  //\n
-                ////msg2 = msg2.Replace("'", "鈥�");
-                //List<Model.ClsXt_FastICSchemeSub_Model> ls = new List<Model.ClsXt_FastICSchemeSub_Model>();
-                //ls = oListModels.getObjectByJson_Gy_ICMOReportBillSub(msg3);
-                //int i = 0;
-               
-
-
-                //淇濆瓨
                 //淇濆瓨瀹屾瘯鍚庡鐞�
                 bool bResult;
                 if (Convert.ToInt32(OperationType) == 1)
                 {
                     // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
-                    bResult = oBill.AddBill(msg3, msg4, msg5, ref DBUtility.ClsPub.sExeReturnInfo);
+                    bResult = oBill.AddBill(HFilterIdLists, HValue, HElement_type, ref DBUtility.ClsPub.sExeReturnInfo);
                 }
                 else
                 {
-                    bResult = oBill.ModifyBill(Convert.ToInt32(msg2), msg3, msg4, msg5, ref DBUtility.ClsPub.sExeReturnInfo);
+                    bResult = oBill.ModifyBill(Convert.ToInt32(msg2), HFilterIdLists, HValue, HElement_type, ref DBUtility.ClsPub.sExeReturnInfo);
                 }
                 if (bResult)
                 {

--
Gitblit v1.9.1