From 8e0cbb3f632b96a7c6db4124bf339575aa173e88 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 16 十月 2023 09:26:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/条码管理/WEBSController.cs | 78 +++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 39 deletions(-)
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index e7762e1..d5aec95 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -488,6 +488,44 @@
}
}
+ /// <summary>
+ /// 鑾峰彇瀹㈡埛鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetCustomerList_Json")]
+ [HttpGet]
+ public object GetCustomerList_Json(string Customer, Int64 HStockOrgID)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("select HItemID,HNumber,HName from Gy_Customer with(nolock) where HStopflag=0 and HUSEORGID=" + HStockOrgID.ToString() + " and (HNumber like '%" + Customer + "%' or HName like '%" + Customer + "%')", "Gy_Customer");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍瀹㈡埛璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖瀹㈡埛淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
#endregion
#endregion
@@ -2028,51 +2066,17 @@
}
else
{
- //娣诲姞鐗╂枡鏄庣粏鍒楄〃鍒楀悕
List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
Type dataType = col.DataType;
string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- //娣诲姞妯℃不鍏峰垪琛ㄥ垪鍚�
- List<object> MouldcolumnNameList = new List<object>();
- foreach (DataColumn col in ds.Tables[1].Columns)
- {
- Type dataType = col.DataType;
- string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- MouldcolumnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- }
- //娣诲姞鍏堣繘鍏堝嚭鍒楄〃鍒楀悕
- List<object> FIFOcolumnNameList = new List<object>();
- foreach (DataColumn col in ds.Tables[2].Columns)
- {
- Type dataType = col.DataType;
- string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- FIFOcolumnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- }
- //娣诲姞鏉＄爜鏄庣粏鍒楄〃鍒楀悕
- List<object> BarCodecolumnNameList = new List<object>();
- foreach (DataColumn col in ds.Tables[3].Columns)
- {
- Type dataType = col.DataType;
- string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- BarCodecolumnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- }
- //娣诲姞婧愬崟鐢熶骇姹囨姤鍗曟潯鐮佹槑缁嗗垪琛ㄥ垪鍚�
- List<object> ICMOReportcolumnNameList = new List<object>();
- foreach (DataColumn col in ds.Tables[4].Columns)
- {
- Type dataType = col.DataType;
- string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- ICMOReportcolumnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- }
-
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
objJsonResult.data = new
{
Materlist = ds.Tables[0], //杩斿洖鐗╂枡鏄庣粏鍒楄〃淇℃伅锛�0锛�
@@ -2083,10 +2087,6 @@
BarCodeDetailslist = ds.Tables[5] //杩斿洖褰撳墠鎵�鎵弿鏉＄爜鏄庣粏淇℃伅锛�5锛�
};
objJsonResult.list = columnNameList;
- objJsonResult.list = MouldcolumnNameList;
- objJsonResult.list = FIFOcolumnNameList;
- objJsonResult.list = BarCodecolumnNameList;
- objJsonResult.list = ICMOReportcolumnNameList;
return objJsonResult;
}
}
--
Gitblit v1.9.1