From 20dc0ca259d13c6d712bde41c992d94365f5f090 Mon Sep 17 00:00:00 2001
From: 陈雯静 <1134865194@qq.com>
Date: 星期五, 15 三月 2024 16:24:12 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/CGGL/YF_PayMentOtherBillController.cs |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/WebAPI/Controllers/XSGL/YF_PayMentOtherBillController.cs b/WebAPI/Controllers/CGGL/YF_PayMentOtherBillController.cs
similarity index 96%
rename from WebAPI/Controllers/XSGL/YF_PayMentOtherBillController.cs
rename to WebAPI/Controllers/CGGL/YF_PayMentOtherBillController.cs
index 21bd369..94762aa 100644
--- a/WebAPI/Controllers/XSGL/YF_PayMentOtherBillController.cs
+++ b/WebAPI/Controllers/CGGL/YF_PayMentOtherBillController.cs
@@ -93,9 +93,10 @@
             var _value = msg["msg"].ToString();
             string msg1 = _value.ToString();
             string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
-            string msg2 = sArray[0].ToString();                             //琛ㄥご鏁版嵁
-            string refSav = sArray[1].ToString();                           //鎿嶄綔鏂瑰紡
-            string msg4 = sArray[2].ToString();                             //鐢ㄦ埛
+            string msg2 = sArray[0].ToString();
+            string msg3 = sArray[1].ToString(); //瀛愯〃
+            string refSav = sArray[2].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+            string msg4 = sArray[3].ToString();//鐢ㄦ埛鍚�
 
             DBUtility.ClsPub.CurUserName = msg4;
 
@@ -188,6 +189,27 @@
                     oBill.omodel = oItem;
                 }
 
+                // 琛ㄤ綋鏁版嵁
+                //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+                msg3 = msg3.Substring(1, msg3.Length - 2);
+                msg3 = msg3.Replace("\\", "");
+                msg3 = msg3.Replace("\n", "");  //\n
+                List<Model.ClsYF_PayMentOtherBillSub> ls = new List<Model.ClsYF_PayMentOtherBillSub>();
+                ls = oListModels.getObjectByJson_YF_PayMentOtherBillSub(msg3);
+                int i = 0;
+                foreach (Model.ClsYF_PayMentOtherBillSub oItemSub in ls)
+                {
+                    i++;
+                    oItemSub.HEntryID = i;
+
+
+                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+                    oItemSub.HCloseType = false;   //鍏抽棴绫诲瀷
+
+                    oBill.DetailColl.Add(oItemSub);
+
+                }
+
                 //淇濆瓨
                 //淇濆瓨瀹屾瘯鍚庡鐞�
                 bool bResult;
@@ -239,7 +261,11 @@
         {
             try
             {
-                ds = oCN.RunProcReturn("select * from h_v_YF_PayMentOtherBillMainList where hmainid=" + HInterID, "h_v_YF_PayMentOtherBillMainList");
+                List<DataTable> tableList = new List<DataTable>();
+
+                ds = oCN.RunProcReturn("exec h_p_YF_PayMentOtherBillMain_Edit  " + HInterID, "h_p_YF_PayMentOtherBillMain_Edit");
+                tableList.Add(ds.Tables[0]);
+                tableList.Add(ds.Tables[1]);
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
@@ -253,7 +279,7 @@
                     objJsonResult.code = "1";
                     objJsonResult.count = 1;
                     objJsonResult.Message = "Sucess锛�";
-                    objJsonResult.data = ds.Tables[0];
+                    objJsonResult.data = tableList;
                     return objJsonResult;
                 }
             }

--
Gitblit v1.9.1