~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,8 +29,9 @@
			{
			try
			{
			Log.LogInfo("成功！"); //记录提交数据
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, true, user))
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -37,24 +39,25 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			Log.LogInfo("有权限");
			ds = Sc_GetMouldProdInHouseBill(sWhere,Organization);
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查询数据异常，请与管理员联系！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "返回记录成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "无数据";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception ex)
			{
			@@ -68,17 +71,18 @@

			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(""))
			{
			return new SQLHelper.ClsCN().RunProcReturn(sql1+ sWhere + "order by 日期 desc", "h_v_Sc_MouldProdInHouseBillList");
			return new SQLHelper.ClsCN().RunProcReturn(sql1+ sWhere + "order by hmainid desc", "h_v_Sc_MouldProdInHouseBillList");
			}
			else
			{
			string sql = sql1 + sWhere+ "order by 日期 desc";
			string sql = sql1 + sWhere+ "order by hmainid desc";
			Log.LogInfo(sql);
			return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
			}

			}

			#endregion
			@@ -93,7 +97,7 @@
			public object set_DeleteBill(string HInterID,string user)
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Delete", 1, true, user))
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -187,7 +191,7 @@
			try
			{
			//审核权限
			if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
			if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -294,7 +298,7 @@
			try
			{
			//审核权限
			if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
			if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -480,11 +484,12 @@

			string UserName = "";
			string s = "";
			long mouldid;
			ListModels oListModels = new ListModels();
			try
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, true, msg4))
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, false, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -595,7 +600,7 @@

			i++;
			oItemSub.HEntryID = i;

			mouldid = oItemSub.HMaterID;
			//oItemSub.HRepairCheckID = 0; //验收项目ID
			//oItemSub.HRepairCheckContent = ""; //验收内容
			//oItemSub.HManagerID = 0; //负责人ID
			@@ -629,6 +634,17 @@
			}
			if (bResult)
			{
			string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
			DataSet db=oCn.RunProcReturn(sql, "h_p_Sc_MouldChangeFileStatus");
			if (db.Tables[0].Rows[0]["issuccess"].ToString()=="0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "器具位置同步失败！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			@@ -663,7 +679,7 @@
			{
			//flag=1 审核； flag=2 反审核
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Check", 1, true, user))
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Check", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;