From 8c7d0e365d20f5f7d05e59afc1c39daeb0dfd690 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 05 十二月 2024 13:34:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs b/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
index ac34b4f..d20866a 100644
--- a/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
@@ -25,6 +25,38 @@
         SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
         DataSet ds;
 
+        #region 搴旀敹鍗曞垪琛� 鏍规嵁鍗曚环绫诲瀷鑾峰彇鐗╂枡鍗曞嚮
+        /// <summary>
+        /// 杩斿洖搴旀敹鍗曞垪琛�
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Xs_ReceivableBill/getPriceByType")]
+        [HttpGet]
+        public object getPriceByType(string HMaterID, string HType)
+        {
+            try
+            {
+                string sql1 = "exec h_p_Xs_ReceivableBill_getPriceByType " + HMaterID + ",'" + HType + "'";
+                ds = oCN.RunProcReturn(sql1, "h_p_Xs_ReceivableBill_getPriceByType");
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0].Rows[0]["HPrice"].ToString();
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
         #region 搴旀敹鍗曞垪琛� 鏌ヨ
         /// <summary>
         /// 杩斿洖搴旀敹鍗曞垪琛�
@@ -1668,7 +1700,7 @@
                 }
                 string sql = "select * from h_v_Xs_ReceivableBillQuerySub where hmainid =  " + hmainid;
 
-                ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Xs_ReceivableBillQuerySub");
+                ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Xs_ReceivableBillQuerySub");
 
 
                 foreach (DataColumn col in ds.Tables[0].Columns)

--
Gitblit v1.9.1