MES-WEB-API.git

			@@ -105,28 +105,8 @@

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();


			//判断用户是否拥有查看所有客户权限
			if (DBUtility.ClsPub.Security_Log_second("Gy_UserLookAllCus", 1, false, user))
			{
			ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeBillQuery");
			}
			else
			{
			//获取用户编码
			string sql = "select * from Gy_Czygl where Czymc = '" + user + "'";
			ds = oCN.RunProcReturn(sql, "Gy_Czygl");
			string userID = ds.Tables[0].Rows[0]["Czybm"].ToString();

			string sql1 = " and HCusID in (select HCusID from Gy_UserCustomerRelation Where HUserID = '" + userID + "')";
			string sql2 = "select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere + sql1 + " order by hmainid desc ";
			ds = oCN.RunProcReturn(sql2, "h_v_Sc_ProcessExchangeBillQuery");
			}





			ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeBillQuery");


			//添加列名
			@@ -1349,6 +1329,7 @@
			List<object> columnNameList3 = new List<object>();
			List<object> columnNameList4 = new List<object>();
			List<object> columnNameList5 = new List<object>();
			List<object> columnNameList6 = new List<object>();

			string sql = "exec h_p_Sc_ICMOBillList_LookDown " + HInterID;
			ds = oCN.RunProcReturn(sql, "h_p_Xs_SeOrderBill_lookdown");
			@@ -1401,12 +1382,21 @@
			columnNameList5.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//添加生产订单变更单列名
			foreach (DataColumn col in ds.Tables[6].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList6.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			columnNameListSum.Add(columnNameList0);
			columnNameListSum.Add(columnNameList1);
			columnNameListSum.Add(columnNameList2);
			columnNameListSum.Add(columnNameList3);
			columnNameListSum.Add(columnNameList4);
			columnNameListSum.Add(columnNameList5);
			columnNameListSum.Add(columnNameList6);

			objJsonResult.code = "1";
			objJsonResult.count = 1;