~yxj/MES-WEB-API.git

			@@ -7,6 +7,7 @@
			using System.Net;
			using System.Net.Http;
			using System.Web.Http;
			using ViewAPI;
			using WebAPI.Models;

			namespace WebAPI.Controllers.MJGL
			@@ -28,6 +29,7 @@
			{
			try
			{
			Log.LogInfo("成功！"); //记录提交数据
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, false, user))
			{
			@@ -37,7 +39,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			Log.LogInfo("有权限");
			ds = Sc_GetMouldProdInHouseBill(sWhere,Organization);

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			@@ -69,6 +71,7 @@

			public static DataSet Sc_GetMouldProdInHouseBill(string sWhere, string Organization)
			{
			LogService.Write(sWhere+";"+ Organization);
			string sql1 = string.Format(@"select * from h_v_Sc_MouldProdInHouseBillList where 库存组织='" + Organization + "'");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			@@ -77,6 +80,7 @@
			else
			{
			string sql = sql1 + sWhere+ "order by hmainid desc";
			Log.LogInfo(sql);
			return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
			}
			}

			@@ -4,6 +4,7 @@
			using System.Collections.Generic;
			using System.Data;
			using System.Web.Http;
			using ViewAPI;
			using WebAPI.Models;
			namespace WebAPI.Controllers
			{
			@@ -5028,6 +5029,7 @@
			string sql1 = string.Format(@"select * from h_v_Sc_MouldProdOutHouseBillList where 库存组织='" + Organization + "'");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			Log.LogInfo(sql1);
			return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldProdOutHouseBillList");
			}
			else

	WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/Sc_MouldRepairInBillListController.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史