MES-WEB-API.git

			@@ -1,4 +1,5 @@
			using Newtonsoft.Json.Linq;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using Pub_Class;
			using System;
			using System.Collections;
			@@ -71,8 +72,8 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			long HProcNo = list[0].HProcNo;//流水号
			if (HProcNo <= 0)
			string HProcNo = list[0].HProcNo;//流水号
			if (HProcNo == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -122,6 +123,7 @@
			string HSourceName = list[0].HSourceName;//生产资源名称
			long HCenterID = list[0].HCenterID;//工作中心ID
			string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
			long HPRDOrgID = list[0].HPRDOrgID;//组织ID
			//单据完整性判断
			if (HMaterID <= 0)
			{
			@@ -188,7 +190,7 @@
			",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
			",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
			",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
			",HProcNo,HOrderProcNO,HMainInterID" +
			",HProcNo,HOrderProcNO,HMainInterID,HPRDOrgID" +
			") " +
			" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
			@@ -196,7 +198,7 @@
			",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
			"," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
			"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
			",'" + HProcNo + "','" + HOrderProcNO + "'," + HMainInterID +
			",'" + HProcNo + "','" + HOrderProcNO + "','" + HMainInterID + "'," + HPRDOrgID +
			") ");
			}
			else if ("Modify".Equals(eventType))
			@@ -461,6 +463,7 @@
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Query", 1, false, user))
			{
			@@ -482,12 +485,21 @@
			ds = oCN.RunProcReturn(sql, "h_v_MES_StationInBillList");
			}

			//添加列名
			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));//获取到DataColumn列对象的列名
			}

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			//}
			//else