From 7d074703a8364c27ca38cbb8f82ebd2f6e85cf22 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 07 一月 2025 14:46:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
index 5b4aaee..affcc46 100644
--- a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
@@ -1257,7 +1257,7 @@
{
List<object> columnNameListSum = new List<object>();
List<object> columnNameList0 = new List<object>();
- //List<object> columnNameList1 = new List<object>();
+ List<object> columnNameList1 = new List<object>();
//List<object> columnNameList2 = new List<object>();
//List<object> columnNameList3 = new List<object>();
//List<object> columnNameList4 = new List<object>();
@@ -1273,13 +1273,13 @@
columnNameList0.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- ////娣诲姞 鐢熶骇璁㈠崟 鍒楀悕
- //foreach (DataColumn col in ds.Tables[1].Columns)
- //{
- // Type dataType = col.DataType;
- // string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- // columnNameList1.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- //}
+ //娣诲姞 鐢熶骇璁㈠崟 鍒楀悕
+ foreach (DataColumn col in ds.Tables[1].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList1.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
////娣诲姞 鐗规壒鐢宠鍗� 鍒楀悕
//foreach (DataColumn col in ds.Tables[2].Columns)
@@ -1306,7 +1306,7 @@
//}
columnNameListSum.Add(columnNameList0);
- //columnNameListSum.Add(columnNameList1);
+ columnNameListSum.Add(columnNameList1);
//columnNameListSum.Add(columnNameList2);
//columnNameListSum.Add(columnNameList3);
//columnNameListSum.Add(columnNameList4);
@@ -1971,7 +1971,7 @@
}
string sql = "select * from h_v_Kf_SellOutBillQuerySub where hmainid = " + hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Kf_SellOutBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Kf_SellOutBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1999,5 +1999,38 @@
}
#endregion
+ #region 閿�鍞嚭搴撳崟 鍒ゆ柇鏄惁鍏峰鏌ョ湅閲戦鏉冮檺
+ [Route("Kf_SellOutBill/CheckRight_Money")]
+ [HttpGet]
+ public object CheckRight_Money(string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏌ヨ鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBill_Money", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1