MES-WEB-API.git

			@@ -37,7 +37,7 @@
			string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];

			/// <summary>
			/// 送货单表头信息
			/// 获取单据号与单据内码
			/// </summary>
			/// <param name="sMsg"></param>
			/// <returns></returns>
			@@ -2614,7 +2614,6 @@
			DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_BadReason ", "Gy_BadReason");
			if (Maxds != null \|\| Maxds.Tables[0].Rows.Count > 0)
			{
			//HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
			var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
			maxid += 1;
			HItemID = maxid;
			@@ -2741,7 +2740,7 @@
			oItem.HShortNumber = sShortNumber;//短代码
			oItem.HEndFlag = true;//末级标志
			oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级

			oItem.HMakeEmp = msg2;
			oBill.oModel = oItem;
			}

			@@ -2750,19 +2749,17 @@
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.Message = "保存成功！";;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -2781,6 +2778,142 @@
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 不良原因获取信息
			/// </summary>
			/// <returns></returns>
			[Route("GetGy_BadReasonDetail")]
			[HttpGet]
			public ApiResult<DataSet> GetGy_BadReasonDetail(string HID)
			{
			var model = LuBaoSevice.GetGy_BadReasonBillDetail(HID);
			return model;
			}

			/// <summary>
			/// 不良原因删除功能
			/// </summary>
			/// <returns></returns>
			[Route("DeltetGy_BadReason")]
			[HttpGet]
			public object DeltetGy_BadReason(string HItemID, string user)
			{
			DataSet ds;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("Gy_BadReason_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (string.IsNullOrWhiteSpace(HItemID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HItemID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.BeginTran();//开始事务
			ds = oCN.RunProcReturn("select * from Gy_BadReason where HItemID=" + HItemID, "Gy_BadReason");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有数据，无法删除！";
			objJsonResult.data = null;
			return objJsonResult; ;
			}
			//var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
			//if (HStopflag)
			//{
			// oCN.RollBack();//回滚事务
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "数据已删除无法再次删除！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}


			//删除前控制=========================================
			string sql1 = "exec h_p_Gy_BadReason_BeforeDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_BadReason_BeforeDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.RunProc("delete Gy_BadReason where HItemID=" + HItemID);


			//删除后控制=========================================
			string sql2 = "exec h_p_Gy_BadReason_AfterDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_Gy_BadReason_AfterDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因：删除后判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "数据删除成功！";
			objJsonResult.data = null;
			return objJsonResult; ;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			@@ -3120,7 +3253,9 @@
			#endregion
			#endregion

			#endregion

			#region 不良类型设置列表/保存/编辑/删除方法

			/// <summary>
			/// 保存不良类型
			@@ -3281,7 +3416,7 @@
			oItem.HShortNumber = sShortNumber;//短代码
			oItem.HEndFlag = true;//末级标志
			oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级

			oItem.HMakeEmp = msg2;
			oBill.oModel = oItem;
			}

			@@ -3290,19 +3425,17 @@
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -3321,6 +3454,143 @@
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 不良类型获取信息
			/// </summary>
			/// <returns></returns>
			[Route("GetGy_BadTypeDetail")]
			[HttpGet]
			public ApiResult<DataSet> GetGy_BadTypeDetail(string HID)
			{
			var dataSet = oCN.RunProcReturn("select top 1 * from h_v_gy_BadTypeList where HItemID= " + HID + " ", "h_v_gy_BadTypeList");
			if (dataSet == null \|\| dataSet.Tables[0].Rows.Count == 0)
			return new ApiResult<DataSet> { code = -1, msg = "不存在不良类型数据" };
			return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
			}

			/// <summary>
			/// 不良类型删除功能
			/// </summary>
			/// <returns></returns>
			[Route("DeltetGy_BadType")]
			[HttpGet]
			public object DeltetGy_BadType(string HItemID, string user)
			{
			DataSet ds;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("Gy_BadType_Drop", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (string.IsNullOrWhiteSpace(HItemID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HItemID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.BeginTran();//开始事务
			ds = oCN.RunProcReturn("select * from Gy_BadType where HItemID=" + HItemID, "Gy_BadType");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有数据，无法删除！";
			objJsonResult.data = null;
			return objJsonResult; ;
			}
			//var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
			//if (HStopflag)
			//{
			// oCN.RollBack();//回滚事务
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "数据已删除无法再次删除！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			//删除前控制=========================================
			string sql1 = "exec h_p_Gy_BadType_BeforeDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_BadType_BeforeDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.RunProc("delete Gy_BadType where HItemID=" + HItemID);


			//删除后控制=========================================
			string sql2 = "exec h_p_Gy_BadType_AfterDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_Gy_BadType_AfterDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因：删除后判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "数据删除成功！";
			objJsonResult.data = null;
			return objJsonResult; ;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			@@ -3631,6 +3901,9 @@
			#endregion
			#endregion

			#endregion

			#region 异常类型设置列表/保存/编辑/删除方法

			/// <summary>
			/// 保存异常类型
			@@ -4271,175 +4544,6 @@
			}
			#endregion
			#endregion

			/// <summary>
			/// 不良类型获取信息
			/// </summary>
			/// <returns></returns>
			[Route("GetGy_BadTypeDetail")]
			[HttpGet]
			public ApiResult<DataSet> GetGy_BadTypeDetail(string HID)
			{
			var dataSet = oCN.RunProcReturn("select top 1 * from h_v_gy_BadTypeList where HItemID= " + HID + " ", "h_v_gy_BadTypeList");
			if (dataSet == null \|\| dataSet.Tables[0].Rows.Count == 0)
			return new ApiResult<DataSet> { code = -1, msg = "不存在不良类型数据" };
			return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
			}

			/// <summary>
			/// 不良类型删除功能
			/// </summary>
			/// <returns></returns>
			[Route("DeltetGy_BadType")]
			[HttpGet]
			public object DeltetGy_BadType(string HItemID, string user)
			{
			DataSet ds;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("Gy_BadType_Drop", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (string.IsNullOrWhiteSpace(HItemID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HItemID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.BeginTran();//开始事务
			ds = oCN.RunProcReturn("select * from Gy_BadType where HItemID=" + HItemID, "Gy_BadType");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有数据，无法删除！";
			objJsonResult.data = null;
			return objJsonResult; ;
			}
			//var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
			//if (HStopflag)
			//{
			// oCN.RollBack();//回滚事务
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "数据已删除无法再次删除！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			oCN.RunProc("delete Gy_BadType where HItemID=" + HItemID);
			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "数据删除成功！";
			objJsonResult.data = null;
			return objJsonResult; ;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 不良原因获取信息
			/// </summary>
			/// <returns></returns>
			[Route("GetGy_BadReasonDetail")]
			[HttpGet]
			public ApiResult<DataSet> GetGy_BadReasonDetail(string HID)
			{
			var model = LuBaoSevice.GetGy_BadReasonBillDetail(HID);
			return model;
			}

			/// <summary>
			/// 不良原因删除功能
			/// </summary>
			/// <returns></returns>
			[Route("DeltetGy_BadReason")]
			[HttpGet]
			public object DeltetGy_BadReason(string HItemID, string user)
			{
			DataSet ds;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("Gy_BadReason_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (string.IsNullOrWhiteSpace(HItemID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HItemID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.BeginTran();//开始事务
			ds = oCN.RunProcReturn("select * from Gy_BadReason where HItemID=" + HItemID, "Gy_BadReason");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有数据，无法删除！";
			objJsonResult.data = null;
			return objJsonResult; ;
			}
			//var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
			//if (HStopflag)
			//{
			// oCN.RollBack();//回滚事务
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "数据已删除无法再次删除！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			oCN.RunProc("delete Gy_BadReason where HItemID=" + HItemID);
			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "数据删除成功！";
			objJsonResult.data = null;
			return objJsonResult; ;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion


			@@ -4614,11 +4718,11 @@
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			@@ -4712,7 +4816,58 @@
			// return objJsonResult;
			//}

			//删除前控制=========================================
			string sql1 = "exec h_p_Gy_BadResult_BeforeDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_BadResult_BeforeDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.RunProc("delete Gy_BadResult where HItemID=" + HItemID);


			//删除后控制=========================================
			string sql2 = "exec h_p_Gy_BadResult_AfterDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_Gy_BadResult_AfterDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因：删除后判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================

			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -7004,19 +7159,17 @@
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -7059,8 +7212,7 @@
			[HttpGet]
			public object DeltetGy_PostSkill(string HItemID, string user)
			{
			DataSet ds;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			DataSet ds;
			try
			{
			//删除权限
			@@ -7093,8 +7245,58 @@
			return objJsonResult; ;
			}

			//删除前控制=========================================
			string sql1 = "exec h_p_Gy_PostSkill_BeforeDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_PostSkill_BeforeDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.RunProc("delete Gy_PostSkill where HItemID=" + HItemID);


			//删除后控制=========================================
			string sql2 = "exec h_p_Gy_PostSkill_AfterDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_Gy_PostSkill_AfterDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因：删除后判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================

			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -7588,19 +7790,17 @@
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -7644,7 +7844,6 @@
			public object DeltetGy_Post(string HItemID, string user)
			{
			DataSet ds;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			try
			{
			//删除权限
			@@ -7677,8 +7876,59 @@
			return objJsonResult; ;
			}

			//删除前控制=========================================
			string sql1 = "exec h_p_Gy_Post_BeforeDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_Post_BeforeDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.RunProc("delete Gy_Post where HItemID=" + HItemID);


			//删除后控制=========================================
			string sql2 = "exec h_p_Gy_Post_AfterDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_Gy_Post_AfterDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因：删除后判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -10373,19 +10623,17 @@
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -10417,7 +10665,6 @@
			public object DeltetGy_TechnologyType(string HItemID, string user)
			{
			DataSet ds;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			try
			{
			//删除权限
			@@ -10450,8 +10697,59 @@
			return objJsonResult; ;
			}

			//删除前控制=========================================
			string sql1 = "exec h_p_Gy_TechnologyParameterClass_BeforeDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_TechnologyParameterClass_BeforeDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.RunProc("delete Gy_TechnologyParameterClass where HItemID=" + HItemID);


			//删除后控制=========================================
			string sql2 = "exec h_p_Gy_TechnologyParameterClass_AfterDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_Gy_TechnologyParameterClass_AfterDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因：删除后判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -12347,11 +12645,11 @@
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			bResult = oBill.ModifyByID(oBill.oModel.HItemID,ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			@@ -12455,8 +12753,59 @@
			return objJsonResult;
			}

			//删除前控制=========================================
			string sql1 = "exec h_p_Gy_BadPhenomena_BeforeDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_BadPhenomena_BeforeDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.RunProc("delete Gy_BadPhenomena where HItemID=" + HItemID);


			//删除后控制=========================================
			string sql2 = "exec h_p_Gy_BadPhenomena_AfterDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_Gy_BadPhenomena_AfterDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因：删除后判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -13791,11 +14140,11 @@
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			@@ -13870,8 +14219,56 @@
			}
			oCN.BeginTran();//开始事务

			//删除前控制=========================================
			string sql1 = "exec h_p_Gy_PreventErrMould_BeforeDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_PreventErrMould_BeforeDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================

			oCN.RunProc("delete Gy_PreventErrMould where HItemID=" + HItemID);

			//删除后控制=========================================
			string sql2 = "exec h_p_Gy_PreventErrMould_AfterDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_Gy_PreventErrMould_AfterDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因：删除后判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================

			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -13924,7 +14321,6 @@
			DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from Gy_MaintainLev ", "Gy_MaintainLev");
			if (Maxds != null \|\| Maxds.Tables[0].Rows.Count > 0)
			{
			//HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
			var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
			maxid += 1;
			HItemID = maxid;
			@@ -14063,18 +14459,17 @@
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -14116,9 +14511,7 @@
			[Route("DeltetGy_MaintainLev")]
			[HttpGet]
			public object DeltetGy_MaintainLev(string HItemID, string user)
			{
			DataSet ds;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			{
			try
			{
			//删除权限
			@@ -14142,8 +14535,59 @@
			}
			oCN.BeginTran();//开始事务

			//删除前控制=========================================
			string sql1 = "exec h_p_Gy_MaintainLev_BeforeDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_MaintainLev_BeforeDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.RunProc("delete Gy_MaintainLev where HItemID=" + HItemID);


			//删除后控制=========================================
			string sql2 = "exec h_p_Gy_MaintainLev_AfterDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_Gy_MaintainLev_AfterDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因：删除后判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -14333,11 +14777,11 @@
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			bResult = oBill.AddNew();
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			@@ -14410,8 +14854,58 @@
			}
			oCN.BeginTran();//开始事务

			//删除前控制=========================================
			string sql1 = "exec h_p_Gy_CheckNoteItem_BeforeDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_CheckNoteItem_BeforeDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.RunProc("delete Gy_CheckNoteItem where HItemID=" + HItemID);


			//删除后控制=========================================
			string sql2 = "exec h_p_Gy_CheckNoteItem_AfterDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_Gy_CheckNoteItem_AfterDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因：删除后判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================

			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -15067,9 +15561,9 @@
			#endregion


			#region 环境检测单设置列表/保存/编辑/删除方法
			#region 环境检测项目设置列表/保存/编辑/删除方法
			/// <summary>
			/// 保存环境检测单
			/// 保存环境检测项目
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			@@ -15100,7 +15594,6 @@
			DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_EnvironmentTestItem ", "Gy_EnvironmentTestItem");
			if (Maxds != null \|\| Maxds.Tables[0].Rows.Count > 0)
			{
			//HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
			var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
			maxid += 1;
			HItemID = maxid;
			@@ -15236,12 +15729,12 @@
			//保存完毕后处理
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			bResult = oBill.AddNew();
			{
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			@@ -15321,9 +15814,59 @@
			objJsonResult.Message = "没有数据，无法删除！";
			objJsonResult.data = null;
			return objJsonResult; ;
			}
			}
			//删除前控制=========================================
			string sql1 = "exec h_p_Gy_EnvironmentTestItem_BeforeDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_EnvironmentTestItem_BeforeDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================


			oCN.RunProc("delete Gy_EnvironmentTestItem where HItemID=" + HItemID);


			//删除后控制=========================================
			string sql2 = "exec h_p_Gy_EnvironmentTestItem_AfterDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_Gy_EnvironmentTestItem_AfterDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因：删除后判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================

			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -16866,12 +17409,16 @@
			/// <returns></returns>
			[Route("Web/GetCheckItemID")]
			[HttpGet]
			public object GetCheckItemID(string HName,string HProName)
			public object GetCheckItemID(string HName,string HProName,string HSourceID)
			{
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Main where 物料名称='"+HName+ "' and 工序名称='" + HProName + "' order by 日期 desc ", "h_v_Gy_QCCheckProjectList_Main");
			ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Main where 物料名称='"+HName+ "' and 工序名称='" + HProName + "' and HSourceID='" + HSourceID + "' order by 日期 desc ", "h_v_Gy_QCCheckProjectList_Main");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Main where 物料名称='" + HName + "' and 工序名称='" + HProName + "' order by 日期 desc ", "h_v_Gy_QCCheckProjectList_Main");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			@@ -18029,7 +18576,7 @@
			if ((ds.Tables[0] == null \|\| ds.Tables[0].Rows.Count == 0))
			{
			sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
			ds = oCn.RunProcReturn(sql, "Gy_Menu");
			ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
			}
			}