MES-WEB-API.git

			@@ -6,6 +6,7 @@
			using Newtonsoft.Json.Linq;
			using SQLHelper;
			using System;
			using System.Text;
			using System.Collections.Generic;
			using System.Data;
			using System.IO;
			@@ -89,7 +90,7 @@
			}




			/// <summary>
			/// 根据时间获取产量汇报单集合
			/// </summary>
			@@ -343,6 +344,8 @@
			{
			try
			{
			string sErrMsg = "";
			oSystemParameter.ShowBill(ref sErrMsg);
			DataSet ds = null;
			ClsCN oCnLoc = new ClsCN();
			DAL.ClsUser oUser = new DAL.ClsUser();
			@@ -356,7 +359,7 @@
			return objjson;
			}
			//判断用户数是否大于客户账号数
			DataSet ds1 = oCN.RunProcReturn("Exec h_p_Xt_BaseInfo ", "h_p_Xt_BaseInfo");
			DataSet ds1 = oCN.RunProcReturn("Exec h_p_Xt_BaseInfo ", "h_p_Xt_BaseInfo");
			if (DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HBack"]) != "0")
			{
			objjson.code = "0";
			@@ -368,14 +371,18 @@
			string sql = string.Format(@" select a.* from Gy_UserByOrgRelation a
			where a.HUserID = '{0}' and a.HOrgID = '{1}'", UserName, HOrgName);
			DataSet _ds = oCnLoc.RunProcReturn(sql, "h_p_Xt_UserRelationOrg_Check");
			//if (_ds == null \|\| _ds.Tables[0].Rows.Count == 0)
			//{
			// objjson.code = "0";
			// objjson.count = 0;
			// objjson.Message = "用户" + UserName + "没有该组织权限";
			// objjson.data = null;
			// return objjson;
			//}

			if (oSystemParameter.omodel.WMS_CampanyName == "杭州斯莫尔")
			{
			if (_ds == null \|\| _ds.Tables[0].Rows.Count == 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "用户" + UserName + "没有该组织权限";
			objjson.data = null;
			return objjson;
			}
			}

			objjson.code = "0";
			objjson.count = 1;
			@@ -490,15 +497,15 @@
			/// <returns></returns>
			[Route("Web/GetXGPassword")]
			[HttpGet]
			public object GetXGPassword(string UserName, string oldPassword, string PassWord, string Repassword,string HCloudUserName,string HCloudUserPsd)
			public object GetXGPassword(string UserName, string oldPassword, string PassWord, string Repassword, string HCloudUserName, string HCloudUserPsd)
			{
			try
			{
			ClsCN oCn = new ClsCN();
			DataSet oDs = new DataSet();
			//==========

			if(PassWord!=null)

			if (PassWord != null)
			{
			oDs = oCn.RunProcReturn("select Czmm from Gy_Czygl where Czybm='" + UserName + "'", "Gy_Czygl");
			if (PassWord.Trim() != Repassword.Trim())
			@@ -518,12 +525,12 @@
			objjson.data = null;
			return objjson; ;
			}
			oCn.RunProc("update Gy_Czygl set Czmm='" + ClsPub.StrToPsd(PassWord.Trim()) + "',HCloudUserName = '" + HCloudUserName+ "',HCloudUserPsd = '" + HCloudUserPsd+ "' where Czybm='" + UserName.Trim() + "'");
			oCn.RunProc("update Gy_Czygl set Czmm='" + ClsPub.StrToPsd(PassWord.Trim()) + "',HCloudUserName = '" + HCloudUserName + "',HCloudUserPsd = '" + HCloudUserPsd + "' where Czybm='" + UserName.Trim() + "'");
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "* 密码修改成功！";
			objjson.data = null;
			return objjson;
			return objjson;
			}
			else
			{
			@@ -1207,7 +1214,7 @@
			return objjson;
			}
			}


			/// <summary>
			/// 获取仓位列表
			/// </summary>
			@@ -2219,6 +2226,103 @@
			}

			/// <summary>
			/// 获取环境检验方案列表
			/// <summary>
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Web/Gy_EnvironmentTestSchemeBillList_Json")]
			[HttpGet]
			public object Gy_EnvironmentTestSchemeBillList_Json(string sWhere)
			{
			DataSet ds;

			if (sWhere != "")
			{
			sWhere = " and ( 生产部门 like '%" + sWhere + "%' or 工作中心 like '%" + sWhere + "%' or 工序名称 like '%" + sWhere + "%' or 检测项目 like '%" + sWhere + "%' ) ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("select * from h_v_Gy_EnvironmentTestSchemeBillList_PDA where 审核人 !='' and 关闭人='' " + sWhere + " Order by 单据号 ", "h_v_Gy_EnvironmentTestSchemeBillList_PDA");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败";
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}
			catch (Exception e)
			{

			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + e.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			/// <summary>
			/// 获取环境检测项目列表
			/// <summary>
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Web/Gy_EnvironmentTestItemList_Json")]
			[HttpGet]
			public object Gy_EnvironmentTestItemList_Json(string sWhere)
			{
			DataSet ds;

			if (sWhere != "")
			{
			sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("select HItemID ,HName 环境检测项目,HNumber 环境检测代码 from Gy_EnvironmentTestItem where ISNULL(HCheckTime,'')!='' and HStopflag =0 " + sWhere + " Order by HNumber ", "Gy_EnvironmentTestItem");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败";
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}
			catch (Exception e)
			{

			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + e.ToString();
			objjson.data = null;
			return objjson;
			}
			}


			/// <summary>
			/// 获取银行列表
			/// <summary>
			///参数：string sql。
			@@ -2587,7 +2691,7 @@
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_BadReason where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_BadReason");
			ds = oCN.RunProcReturn("select * from Gy_BadReason where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID='" + oItem.HUSEORGID + "'", "Gy_BadReason");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			@@ -2607,7 +2711,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.Message = "保存失败！相同使用组织下代码不能重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -2658,6 +2762,23 @@
			return objJsonResult;
			}
			}
			if (ds.Tables[0].Rows.Count > 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！相同使用组织下代码不能重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			//已审核的不允许保存
			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能进行保存！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//得到短代码
			string sShortNumber;
			@@ -2692,7 +2813,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";;
			objJsonResult.Message = "保存成功！"; ;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -2768,18 +2889,22 @@
			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;
			//}


			if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
			{
			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");
			@@ -2832,7 +2957,7 @@
			}
			//==================================================================================



			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -3142,7 +3267,7 @@

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into " + "Gy_BadReason " +
			oCN.RunProc("Insert into " + "Gy_BadReason " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HDeptID,HProcID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HBadTypeID) " +
			@@ -3152,7 +3277,7 @@
			}
			else
			{
			oCN.RunProc("Update Gy_BadReason"+ " set " +
			oCN.RunProc("Update Gy_BadReason" + " set " +
			"HName='" + HName + "'" +
			",HShortNumber='" + sShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			@@ -3263,7 +3388,7 @@
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_BadType where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_BadType");
			ds = oCN.RunProcReturn("select * from Gy_BadType where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID= '" + oItem.HUSEORGID + "' ", "Gy_BadType");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			@@ -3283,7 +3408,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.Message = "保存失败！相同使用组织下代码不能重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -3334,7 +3459,26 @@
			return objJsonResult;
			}
			}
			if (ds.Tables[0].Rows.Count > 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！相同使用组织下代码不能重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			//已审核的不允许保存
			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能进行保存！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			@@ -3414,7 +3558,6 @@
			public object DeltetGy_BadType(string HItemID, string user)
			{
			DataSet ds;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			try
			{
			//删除权限
			@@ -3446,17 +3589,22 @@
			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;
			//}

			if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
			{
			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");
			@@ -3509,7 +3657,7 @@
			}
			//==================================================================================



			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -3646,7 +3794,7 @@
			{
			tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			if(HGroupNumber != "")
			if (HGroupNumber != "")
			{
			//查询班组
			ds = oCN.RunProcReturn("select * from Gy_Group where HNumber='" + HGroupNumber + "' and Hname='" + HGroupName + "'", "Gy_Group");
			@@ -3788,13 +3936,13 @@

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into Gy_BadType" + " " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HGroupID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HUSEORGID,HCREATEORGID,HUseFlag,HMakeEmp,HMakeTime) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + sShortNumber + "'," + 0 +
			"," + HGroupID.ToString() +
			"," + HLevel.ToString() + "," + HEndFlag + "," + 0 + ",'" + HRemark + "'," + HOrgID + "," + HOrgID + ",'" + "未检测" + "','" + user + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.RunProc("Insert into Gy_BadType" + " " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HGroupID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HUSEORGID,HCREATEORGID,HUseFlag,HMakeEmp,HMakeTime) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + sShortNumber + "'," + 0 +
			"," + HGroupID.ToString() +
			"," + HLevel.ToString() + "," + HEndFlag + "," + 0 + ",'" + HRemark + "'," + HOrgID + "," + HOrgID + ",'" + "未检测" + "','" + user + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);

			}
			else
			@@ -3983,6 +4131,17 @@
			}
			}
			}

			//已审核的不允许保存
			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能进行保存！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			@@ -4018,7 +4177,6 @@
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -4553,7 +4711,7 @@
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_BadResult where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_BadResult");
			ds = oCN.RunProcReturn("select * from Gy_BadResult where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID= '" + oItem.HUSEORGID + "' ", "Gy_BadResult");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			@@ -4562,6 +4720,7 @@
			objJsonResult.data = 1;
			return objJsonResult;
			}

			//新增时判断
			if (oItem.HItemID == 0)
			{
			@@ -4573,7 +4732,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.Message = "保存失败！相同使用组织下代码不能重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -4624,7 +4783,26 @@
			return objJsonResult;
			}
			}
			if (ds.Tables[0].Rows.Count > 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！相同使用组织下代码不能重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			//已审核的不允许保存
			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能进行保存！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			@@ -4648,7 +4826,7 @@
			//保存完毕后处理
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			{
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			@@ -4660,7 +4838,6 @@
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -4735,16 +4912,23 @@
			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;
			//}

			if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已禁用!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//删除前控制=========================================
			string sql1 = "exec h_p_Gy_BadResult_BeforeDelCtrl " + HItemID + ",'" + user + "'";
			@@ -4797,7 +4981,7 @@
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -5043,7 +5227,7 @@

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into Gy_BadResult" +
			oCN.RunProc("Insert into Gy_BadResult" +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HISsystemSet,HCREATEORGID,HERPItemID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + sShortNumber + "'," + 0 +
			@@ -5162,7 +5346,7 @@
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_InspectValue where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_InspectValue");
			ds = oCN.RunProcReturn("select * from Gy_InspectValue where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID='" + oItem.HUSEORGID + "'", "Gy_InspectValue");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			@@ -5182,7 +5366,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.Message = "保存失败！相同使用组织下代码不能重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -5234,6 +5418,14 @@
			}
			}
			}
			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！已审核不允许修改！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			@@ -5259,7 +5451,6 @@
			string sExeReturnInfo = "";
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew(ref sExeReturnInfo);
			}
			else
			@@ -5271,7 +5462,6 @@
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -5347,16 +5537,22 @@
			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;
			//}
			if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "基础资料已审核!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "基础资料已禁用!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}


			//删除前控制=========================================
			@@ -5701,7 +5897,7 @@
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_InspectMethod where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_InspectMethod");
			ds = oCN.RunProcReturn("select * from Gy_InspectMethod where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID='" + oItem.HUSEORGID + "'", "Gy_InspectMethod");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			@@ -5721,7 +5917,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.Message = "保存失败！相同使用组织下代码不能重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -5773,6 +5969,14 @@
			}
			}
			}
			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！已审核不允许修改！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			@@ -5797,7 +6001,6 @@
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			}
			else
			@@ -5809,7 +6012,6 @@
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -5885,16 +6087,22 @@
			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;
			//}
			if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "基础资料已审核!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "基础资料已禁用!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.RunProc("delete Gy_InspectMethod where HItemID=" + HItemID);
			oCN.Commit();//提交事务
			@@ -5990,7 +6198,7 @@
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_QualityStd where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_QualityStd");
			ds = oCN.RunProcReturn("select * from Gy_QualityStd where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID='" + oItem.HUSEORGID + "'", "Gy_QualityStd");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			@@ -6010,7 +6218,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.Message = "保存失败！相同组织下代码不能重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -6061,6 +6269,16 @@
			return objJsonResult;
			}
			}
			}

			//已审核不允许保存
			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！已审核不允许修改！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//得到短代码
			string sShortNumber;
			@@ -6174,16 +6392,22 @@
			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;
			//}
			if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "基础资料已审核!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "基础资料已禁用!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.RunProc("delete Gy_QualityStd where HItemID=" + HItemID);
			oCN.Commit();//提交事务
			@@ -6279,7 +6503,7 @@
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_InspectInstruMent where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_InspectInstruMent");
			ds = oCN.RunProcReturn("select * from Gy_InspectInstruMent where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID='" + oItem.HUSEORGID + "'", "Gy_InspectInstruMent");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			@@ -6299,7 +6523,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.Message = "保存失败！相同使用组织下代码不能重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -6351,6 +6575,16 @@
			}
			}
			}

			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！已审核不允许修改！";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			@@ -6376,7 +6610,6 @@
			string sExeReturnInfo = "";
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew(ref sExeReturnInfo);
			}
			else
			@@ -6388,7 +6621,6 @@
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -6464,16 +6696,22 @@
			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;
			//}
			if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "基础资料已审核!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "基础资料已禁用!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//删除前控制=========================================
			ds = oCN.RunProcReturn("Exec h_p_Gy_InspectInstruMent_BeforeDelCtrl " + HItemID + ",'" + User + "'", "h_p_Gy_InspectInstruMent_BeforeDelCtrl");
			@@ -6799,7 +7037,7 @@
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_InspectBasis where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_InspectBasis");
			ds = oCN.RunProcReturn("select * from Gy_InspectBasis where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID='" + oItem.HUSEORGID + "'", "Gy_InspectBasis");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			@@ -6819,7 +7057,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.Message = "保存失败！相同组织下代码不能重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -6871,6 +7109,14 @@
			}
			}
			}
			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！已审核不允许修改！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			@@ -6895,7 +7141,7 @@
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);

			bResult = oBill.AddNew();
			}
			else
			@@ -6907,7 +7153,6 @@
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -6983,16 +7228,22 @@
			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;
			//}
			if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "基础资料已审核!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "基础资料已禁用!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.RunProc("delete Gy_InspectBasis where HItemID=" + HItemID);
			oCN.Commit();//提交事务
			@@ -7137,6 +7388,18 @@
			}
			else//编辑时判断
			{
			//已审核不允许修改
			DataSet dss;
			dss = oCN.RunProcReturn("select * from Gy_PostSkill where HItemID=" + oItem.HItemID, "Gy_Group");
			//判断是否可编辑
			if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此单据状态已经审核，不允许修改！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//检查父级是否存在
			string sParent;
			sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
			@@ -7237,7 +7500,7 @@
			[HttpGet]
			public object DeltetGy_PostSkill(string HItemID, string user)
			{
			DataSet ds;
			DataSet ds;
			try
			{
			//删除权限
			@@ -7321,7 +7584,7 @@
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -7463,7 +7726,7 @@
			}
			string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();
			//查询岗位
			ds = oCN.RunProcReturn("select * from Gy_Post where HNumber='" + HPostNumber + "' and Hname='" + HPostName + "' and HUSEORGID = "+ HORGid, "Gy_Post");
			ds = oCN.RunProcReturn("select * from Gy_Post where HNumber='" + HPostNumber + "' and Hname='" + HPostName + "' and HUSEORGID = " + HORGid, "Gy_Post");

			if (ds.Tables[0].Rows.Count == 0)
			{
			@@ -7767,6 +8030,18 @@
			}
			else//编辑时判断
			{
			//已审核不允许修改
			DataSet dss;
			dss = oCN.RunProcReturn("select * from Gy_Post where HItemID=" + oItem.HItemID, "Gy_Post");
			//判断是否可编辑
			if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此单据状态已经审核，不允许修改！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//检查父级是否存在
			string sParent;
			sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
			@@ -7952,7 +8227,7 @@
			}
			//==================================================================================



			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -10431,11 +10706,11 @@

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into " + "Gy_SupType " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + sShortNumber + "'," + 0 +
			"," + HLevel.ToString() + "," + HEndFlag + "," + 0 + ",'" + HRemark + "','" + DateTime.Now + "','" + HOrgID + "','" + "未检测" + "','" + user + "','" + HOrgID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.RunProc("Insert into " + "Gy_SupType " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + sShortNumber + "'," + 0 +
			"," + HLevel.ToString() + "," + HEndFlag + "," + 0 + ",'" + HRemark + "','" + DateTime.Now + "','" + HOrgID + "','" + "未检测" + "','" + user + "','" + HOrgID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			@@ -10773,7 +11048,7 @@
			}
			//==================================================================================



			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -11809,7 +12084,7 @@
			//保存完毕后处理
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			{
			bResult = oBill.AddNew();
			}
			else
			@@ -11968,7 +12243,7 @@
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -12911,10 +13186,10 @@

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into " + "Gy_ErrMsgBackType " +
			oCN.RunProc("Insert into " + "Gy_ErrMsgBackType " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID) " +
			" Values('" + HProcessNum + "','" + HProcessName + "','" + "','" + sShortNumber + "'," + 0 +
			" Values('" + HProcessNum + "','" + HProcessName + "','" + "','" + sShortNumber + "'," + 0 +
			"," + HLevel + "," + HEndFlag + "," + 0 + ",'" + HRemark + "','" + DateTime.Now + "','" + HOrgID + "','" + "未检测" + "','" + user + "','" + HOrgID + "')");
			}
			else
			@@ -13021,7 +13296,7 @@
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_BadPhenomena where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_BadPhenomena");
			ds = oCN.RunProcReturn("select * from Gy_BadPhenomena where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID= '" + oItem.HUSEORGID + "' ", "Gy_BadPhenomena");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			@@ -13030,6 +13305,7 @@
			objJsonResult.data = 1;
			return objJsonResult;
			}

			//新增时判断
			if (oItem.HItemID == 0)
			{
			@@ -13041,7 +13317,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.Message = "保存失败！相同使用组织下代码不能重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -13092,7 +13368,27 @@
			return objJsonResult;
			}
			}

			if (ds.Tables[0].Rows.Count > 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！相同使用组织下代码不能重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			//已审核的不允许保存
			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能进行保存！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			@@ -13117,19 +13413,17 @@
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID,ref DBUtility.ClsPub.sExeReturnInfo);
			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;
			}
			@@ -13278,7 +13572,7 @@
			}
			//==================================================================================



			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -14516,7 +14810,7 @@
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_PreventErrMould where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_PreventErrMould");
			//ds = oCN.RunProcReturn("select * from Gy_PreventErrMould where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_PreventErrMould");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			@@ -14525,21 +14819,32 @@
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//查询数据中是否存在重复代码
			ds = oCN.RunProcReturn("Select HItemID from Gy_PreventErrMould Where HItemID<>" + oItem.HItemID + " and HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID=" + oItem.HUSEORGID, "Gy_PreventErrMould");

			if (ds.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//新增时判断
			if (oItem.HItemID == 0)
			{
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			//if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			//{

			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//}
			//else
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "保存失败！代码重复！";
			// objJsonResult.data = 1;
			// return objJsonResult;
			//}
			//检查父级是否存在
			string sParent;
			sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
			@@ -14565,6 +14870,18 @@
			}
			else//编辑时判断
			{
			//已审核不允许修改
			DataSet dss;
			dss = oCN.RunProcReturn("select * from Gy_PreventErrMould where HItemID=" + oItem.HItemID, "Gy_PreventErrMould");
			//判断是否可编辑
			if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此单据状态已经审核，不允许修改！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//检查父级是否存在
			string sParent;
			sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
			@@ -14741,7 +15058,7 @@
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -14984,7 +15301,7 @@
			[Route("DeltetGy_MaintainLev")]
			[HttpGet]
			public object DeltetGy_MaintainLev(string HItemID, string user)
			{
			{
			try
			{
			//删除权限
			@@ -15154,7 +15471,7 @@
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_CheckNoteItem where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CheckNoteItem");
			//ds = oCN.RunProcReturn("select * from Gy_CheckNoteItem where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CheckNoteItem");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			@@ -15163,21 +15480,21 @@
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//查询数据中是否存在重复代码
			ds = oCN.RunProcReturn("Select HItemID from Gy_CheckNoteItem Where HItemID<>" + oItem.HItemID + " and HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID=" + oItem.HUSEORGID, "Gy_CheckNoteItem");

			if (ds.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//新增时判断
			if (oItem.HItemID == 0)
			{
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{

			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//检查父级是否存在
			string sParent;
			sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
			@@ -15203,6 +15520,18 @@
			}
			else//编辑时判断
			{
			//已审核不允许修改
			DataSet dss;
			dss = oCN.RunProcReturn("select * from Gy_CheckNoteItem where HItemID=" + oItem.HItemID, "Gy_CheckNoteItem");
			//判断是否可编辑
			if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此单据状态已经审核，不允许修改！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//检查父级是否存在
			string sParent;
			sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
			@@ -15378,7 +15707,7 @@
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -15626,7 +15955,7 @@

			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RunProc("Insert into " + "Gy_CheckNoteItem" +
			oCN.RunProc("Insert into " + "Gy_CheckNoteItem" +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID,HCheckPostID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + 0 +
			@@ -15637,7 +15966,7 @@
			else
			{
			oCN.RunProc("Update " + "Gy_CheckNoteItem" + " set " +


			"HName='" + HName + "'" +
			",HShortNumber='" + HShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			@@ -15764,7 +16093,7 @@
			// 定义星期几的中文映射关系
			Dictionary<DayOfWeek, string> chineseDayOfWeek = new Dictionary<DayOfWeek, string>
			{
			{ DayOfWeek.Sunday, "星期日" },
			{ DayOfWeek.Sunday, "星期日" },
			{ DayOfWeek.Saturday, "星期六" }
			};

			@@ -15841,18 +16170,18 @@

			JObject msgObj = JObject.Parse(msg1);
			string HYear = msgObj["HYear"].ToString();
			string HNumber1 = msgObj["HDeptNumber"].ToString()+'-' + msgObj["HOrgNumber"].ToString();
			string HName1 = msgObj["HDeptName"].ToString()+'-'+msgObj["HOrgName"].ToString();
			string HNumber1 = msgObj["HDeptNumber"].ToString() + '-' + msgObj["HOrgNumber"].ToString();
			string HName1 = msgObj["HDeptName"].ToString() + '-' + msgObj["HOrgName"].ToString();
			string HOrgID = msgObj["HOrgID"].ToString();
			string HDeptID = msgObj["HDeptID"].ToString();
			string HDeptID = msgObj["HDeptID"].ToString();
			bool HStopflag = bool.Parse(msgObj["HStopflag"].ToString());
			string HRemark= msgObj["HRemark"].ToString();
			string HUSEORGID= msgObj["HUSEORGID"].ToString();
			string HHelpCode= msgObj["HHelpCode"].ToString();
			string HRemark = msgObj["HRemark"].ToString();
			string HUSEORGID = msgObj["HUSEORGID"].ToString();
			string HHelpCode = msgObj["HHelpCode"].ToString();
			string HMakeEmp = msg2; //创建人
			bool Sunday = Convert.ToBoolean(msgObj["Sunday"]);
			bool Saturday = Convert.ToBoolean(msgObj["Saturday"]);
			List<Tuple<DateTime, string>> sundaysInYear = GetSundaysInYear(Convert.ToInt32(HYear), Sunday, Saturday);
			List<Tuple<DateTime, string>> sundaysInYear = GetSundaysInYear(Convert.ToInt32(HYear), Sunday, Saturday);

			foreach (var oItem in sundaysInYear)
			{
			@@ -15873,11 +16202,11 @@
			string HNumber = "";
			string HName = "";
			HNumber = HNumber1 + '-' + HDate;

			HName = HName1 + '-' + HDate;

			HName = HName1 + '-' + HDate;
			//先查看数据库有没有
			ds = oCN.RunProcReturn("select * from Gy_RestDay where HRestDay='" + HRestDay + "' and HOrgID='" + HOrgID + "' and HDeptID='" + HDeptID + "'", "Gy_RestDay");
			if (ds.Tables[0].Rows.Count<1)
			if (ds.Tables[0].Rows.Count < 1)
			{
			oCN.RunProc("Insert into Gy_RestDay " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			@@ -15886,7 +16215,7 @@
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "',''," + 0 +
			"," + 0 + "," + 0 + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + DateTime.Now + "','" + HUSEORGID + "',' 未检测','" + HMakeEmp + "','" + HUSEORGID + "'" +
			",'" + HOrgID.ToString() + "','" + HDeptID.ToString() + "','" + HRestDay.ToString() + "','" + HWeekDay.ToString() + "')");
			}
			}
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -15972,7 +16301,7 @@
			}

			//获取一年中的周六,周日或者两个同时获取
			public List<Tuple<DateTime, string>> GetSundaysInYear(int HYear, bool Sunday,bool Saturday)
			public List<Tuple<DateTime, string>> GetSundaysInYear(int HYear, bool Sunday, bool Saturday)
			{
			List<Tuple<DateTime, string>> Days = new List<Tuple<DateTime, string>>();
			DateTime startDate = new DateTime(HYear, 1, 1);
			@@ -16012,16 +16341,16 @@
			{
			weekdayChinese = "星期天";
			Days.Add(Tuple.Create(startDate, weekdayChinese));
			}
			}
			else if (startDate.DayOfWeek == DayOfWeek.Saturday)
			{
			weekdayChinese = "星期六";
			Days.Add(Tuple.Create(startDate, weekdayChinese));
			}
			}
			}
			startDate = startDate.AddDays(1);
			}
			}
			}
			return Days;
			}

			@@ -16833,7 +17162,7 @@
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_EnvironmentTestItem where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_EnvironmentTestItem");
			ds = oCN.RunProcReturn("select * from Gy_EnvironmentTestItem where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID='" + oItem.HUSEORGID + "'", "Gy_EnvironmentTestItem");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			@@ -16853,7 +17182,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.Message = "保存失败！相同组织下代码不能重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -16905,6 +17234,16 @@
			}
			}
			}
			//已审核不允许修改
			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！已审核不允许修改！";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			@@ -17014,6 +17353,24 @@
			objJsonResult.data = null;
			return objJsonResult; ;
			}

			if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "基础资料已审核!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			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");
			@@ -17065,7 +17422,7 @@
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -17791,6 +18148,193 @@
			}
			#endregion

			#region 设备节拍维护设置列表/保存/编辑/删除方法
			/// <summary>
			/// 项目费用分类保存
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("SaveSb_EqiupMaterWorkTime")]
			[HttpPost]
			public object SaveSb_EqiupMaterWorkTime([FromBody] JObject msg)
			{
			DataSet ds;
			var _value = msg["msg"].ToString();
			string msg3 = _value.ToString();
			string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg1 = sArray[0].ToString();
			string msg2 = sArray[1].ToString();


			Int64 HItemID = 0;
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//获取最大ID值赋值
			DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from EqiupMaterWorkTimes ", "EqiupMaterWorkTimes");
			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;
			}
			ListModels oListModels = new ListModels();
			try
			{
			//保存权限
			if (!DBUtility.ClsPub.Security_Log("EqiupMaterWorkTimes_Edit", 1, false, msg2))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}


			WebAPI.DLL.ClsEqiupMaterWorkTimes_Ctl oBill = new WebAPI.DLL.ClsEqiupMaterWorkTimes_Ctl();
			List<Model.ClsEqiupMaterWorkTimes_Model> lsmain = new List<Model.ClsEqiupMaterWorkTimes_Model>();
			msg1 = msg1.Replace("\\", "");
			msg1 = msg1.Replace("\n", "");
			lsmain = oListModels.getObjectByJson_EqiupMaterWorkTimes(msg1);
			foreach (ClsEqiupMaterWorkTimes_Model item in lsmain)
			{
			oBill.oModel = item;
			}

			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			bResult = oBill.AddNew();
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 设备节拍维护获取信息
			/// </summary>
			/// <returns></returns>
			[Route("GetEqiupMaterWorkTimeDetail")]
			[HttpGet]
			public ApiResult<DataSet> GetEqiupMaterWorkTimeDetail(string HID)
			{
			var model = LuBaoSevice.GetEqiupMaterWorkTimeDetail(HID);
			return model;
			}

			/// <summary>
			/// 设备节拍维护删除功能
			/// </summary>
			/// <returns></returns>
			[Route("DeltetEqiupMaterWorkTime")]
			[HttpGet]
			public object DeltetEqiupMaterWorkTime(string HItemID, string user)
			{
			DataSet ds;
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("EqiupMaterWorkTimes_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 EqiupMaterWorkTimes where HItemID=" + HItemID, "EqiupMaterWorkTimes");
			if (ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已禁用!不能进行删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据不存在!";
			objJsonResult.data = null;
			return objJsonResult;
			}


			oCN.RunProc("delete from EqiupMaterWorkTimes 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


			/// <summary>
			/// 用关联工序获取信息
			@@ -18063,7 +18607,7 @@
			ClsCN oCn = new ClsCN();
			DataSet oDs = new DataSet();
			//==========
			oDs = oCn.RunProcReturn("select HItemID ID,Hname Name,HStopflag Stopflag from Xt_ORGANIZATIONS", "Xt_ORGANIZATIONS");
			oDs = oCn.RunProcReturn("select HItemID ID,Hname Name,HStopflag Stopflag from Xt_ORGANIZATIONS with(nolock)", "Xt_ORGANIZATIONS");
			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功！";
			@@ -18109,7 +18653,7 @@
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}catch(Exception e)
			} catch (Exception e)
			{
			objjson.code = "0";
			objjson.count = 0;
			@@ -18683,6 +19227,60 @@
			}

			/// <summary>
			/// 根据模具仓库编号获取模具数据
			/// </summary>
			/// <param name="sWhere">筛选条件</param>
			/// <param name="user">操作用户</param>
			/// <param name="Organization">组织</param>
			/// <returns>模具数据清单</returns>
			[Route("Web/Get_Sc_MouldStatusAnalysisList")]
			[HttpGet]
			public object Get_Sc_MouldStatusAnalysisList(string sWhere, string user, string Organization)
			{
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("Select * from h_v_Sc_MouldStatusAnalysisList where 1=1 Order by HInterID DESC", "h_v_Sc_MouldStatusAnalysisList");
			}
			else
			{
			string sql1 = "Select * from h_v_Sc_MouldStatusAnalysisList where 1=1 ";
			string sql = sql1 + sWhere + " Order by HInterID DESC";
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldStatusAnalysisList");
			}


			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}
			catch (Exception ex)
			{

			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			/// <summary>
			/// 获取器具列表
			/// </summary>
			/// <returns></returns>
			@@ -18793,6 +19391,51 @@



			}

			/// <summary>
			/// 获取巡检项目列表
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetPatrolCheckItemList_Json")]
			[HttpGet]
			public object GetPatrolCheckItemList_Json(string CheckItem)
			{
			DataSet ds;
			try
			{
			sWhere = " Where HStopFlag=0 and HEndFlag=1";
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (CheckItem != "" && CheckItem != null)
			{
			sWhere = sWhere + " and ( HNumber like '%" + CheckItem + "%' or HName like '%" + CheckItem + "%' ) ";
			}
			ds = oCN.RunProcReturn("Select HItemID,HNumber,HName from Gy_PatrolCheck " + sWhere + " Order by HItemID ", "Gy_DotCheck");
			if (ds == null)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功";
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}
			catch (Exception ex)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			/// <summary>
			@@ -19007,23 +19650,19 @@
			/// <returns></returns>
			[Route("Web/GetSc_ProcessExchangeBillListView")]
			[HttpGet]
			public object GetSc_ProcessExchangeBillListView(string ICMOBill, int OrganizationID)
			public object GetSc_ProcessExchangeBillListView(string sWhere, int OrganizationID)
			{
			if (ICMOBill != "" & ICMOBill != null)
			{
			sWhere = " where 1=1 and 单据号 like '%" + ICMOBill + "%' ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessExchangeBillList where 1=1 order by 单据号 desc,hsubid", "h_v_Sc_ProcessExchangeBillList");
			ds = oCN.RunProcReturn("select top 300 * from h_v_Sc_ProcessExchangeBillList_PDA where 1=1 order by 单据号 desc,hsubid", "h_v_Sc_ProcessExchangeBillList_PDA");
			}
			else
			{
			string sql = "select * from h_v_Sc_ProcessExchangeBillList " + sWhere + " order by 单据号 desc,hsubid ";
			ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBillList");
			string sql = "select * from h_v_Sc_ProcessExchangeBillList_PDA where 1=1 " + sWhere + " order by 单据号 desc,hsubid ";
			ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBillList_PDA");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			@@ -19322,12 +19961,12 @@
			/// <returns></returns>
			[Route("Web/GetCheckItemID")]
			[HttpGet]
			public object GetCheckItemID(string HName,string HProName,string HSourceID)
			{
			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 + "' and HSourceID='" + HSourceID + "' 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");
			@@ -19336,7 +19975,7 @@
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objjson.Message = "获取失败,未设置默认检验方案";
			objjson.data = null;
			return objjson;
			}
			@@ -19896,7 +20535,7 @@
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败,查无数据" + DBUtility.ClsPub.sErrInfo;
			objjson.Message = "获取失败,明细查无数据";
			objjson.data = null;
			return objjson;
			}
			@@ -20006,6 +20645,9 @@
			break;
			case "QD":
			HView = "h_v_Sb_EquipRepairSignBillList";
			break;
			case "XJ":
			HView = "h_v_Sb_EquipPatrolCheckBillList";
			break;
			default:
			objjson.code = "0";
			@@ -20454,6 +21096,118 @@
			return objjson; ;
			}
			}
			#region [从数据库加载菜单 APP]

			//public class AppMenuLoad
			//{
			// public string HitemID { get; set; } // 主键
			// public string HPartentID { get; set; } = "0"; // 父节点ID
			// public string HEntryID { get; set; } // 菜单节点id
			// public string HIndex { get; set; }
			// public string HName { get; set; }
			// public string HMenuName { get; set; }
			// public string HPicNum { get; set; }
			// public string HShowMode { get; set; }
			// public string HTranslationText_English { get; set; }
			// public string HTranslationText_Spain { get; set; }
			// public string HMaker { get; set; }
			// public List<MenuLoad> childMenus { get; set; }
			//}
			//[Route("Web/MenuList_APP")]
			//[HttpGet]
			//public object MenuList_APP(string HMaker, string HType)
			//{
			// try {
			// DataSet ds = oCN.RunProcReturn("exec h_p_Gy_MenuDefineSet_APP_Get" +
			// "@HMaker = '" + HMaker + "'" +
			// "@HType = '" + HType + "'"
			// , "h_p_Gy_MenuDefineSet_APP_Get");

			// if((bool)ds.Tables[0].Rows[0]["returntype"] == true)
			// {
			// objJsonResult.code = "1";
			// objJsonResult.count = 1;
			// objJsonResult.Message = ds.Tables[0].Rows[0]["mesg"].ToString();
			// objJsonResult.data = ds.Tables[1];
			// return objJsonResult;
			// }
			// else
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = ds.Tables[0].Rows[0]["mesg"].ToString();
			// return objJsonResult;
			// }

			// }
			// catch(Exception e)
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = e.ToString();
			// objJsonResult.data = null;
			// return objJsonResult;
			// }

			//}

			//[Route("Web/SetMenuList_APP")]
			//[HttpPost]
			//public object SetMenuList_APP([FromBody] JObject oMain)
			//{
			// var _value = oMain["oMain"].ToString();
			// string msg1 = _value.ToString();
			// string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			// try
			// {
			// string msg2 = sArray[0];
			// string user = sArray[1].ToString();
			// string MenuName = sArray[2].ToString();
			// string type = sArray[3].ToString();

			// if (String.Equals(type, "APP", StringComparison.InvariantCultureIgnoreCase))
			// {
			// oCN.BeginTran();
			// List<AppMenuLoad> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<AppMenuLoad>>(msg2);
			// string sql1 = "delete from Gy_MenuDefineSet_APP where HMenuName = '" + MenuName + "' and HMaker = '" + user + "'";
			// oCN.RunProcReturn(sql1, "Gy_MenuDefineSet_APP");
			// list.ForEach(one =>
			// {
			// string sql2 = "insert into Gy_MenuDefineSet_APP( HEntryID, HIndex, HName, HMenuName, HPicNum, HShowMode, HMaker)" +
			// "Values('" + one.HEntryID + "','" + one.HIndex + "','" + one.HName + "','" + one.HName +
			// "','" + MenuName + "','" + one.HPicNum + "','" + one.HShowMode + "','" + user + "')";
			// oCN.RunProcReturn(sql2, "Gy_MenuDefineSet_APP");
			// });

			// oCN.Commit();

			// objJsonResult.code = "1";
			// objJsonResult.count = 1;
			// objJsonResult.Message = "设置成功！";
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			// else
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// 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


			#region [从数据库加载菜单]
			public class MenuLoad
			@@ -20481,18 +21235,24 @@
			{
			List<MenuLoad> mu = new List<MenuLoad>(); //以父子级结构存放菜单清单信息
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); //数据库操作工具
			string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HShowMode from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' order by HPosition";
			string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HShowMode,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' order by HPosition";
			ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //查询当前用户的自定义菜单数据
			if (ds.Tables[0] == null \|\| ds.Tables[0].Rows.Count == 0) //判断当前用户是否有设置过自定义信息，若记录数为0，则没有设置过，加载所有的菜单信息
			{
			string sql1 = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HShowMode from Gy_MenuDefineSet where HMakeName=" +
			string sql1 = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HShowMode,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Gy_MenuDefineSet where HMakeName=" +
			"(select top 1 c.GroupName from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId " +
			"left join System_UserGroup c on b.GroupId = c.GroupID where a.Czymc ='"+HMakeName+"' order by len(c.GroupName ))";
			ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet"); //查询用户绑定的角色是否设置菜单信息取角色名称最短的一个
			if ((ds.Tables[0] == null \|\| ds.Tables[0].Rows.Count == 0))
			{
			sql = "Select HitemID,HNumber,HName,HPartentID,HLevel,Hurl,HShowMode,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain,HPicNum from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
			ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
			sql1 = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HShowMode,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Gy_MenuDefineSet where HMakeName = 'admin' and HType = '" + HType + "' order by HPosition";
			ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet"); //查询admin 是否设置菜单信息
			if ((ds.Tables[0] == null \|\| ds.Tables[0].Rows.Count == 0))
			{
			sql = "Select HitemID,HNumber,HName,HPartentID,HLevel,Hurl,HShowMode,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain,HPicNum from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
			ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
			}

			}
			}

			@@ -20687,6 +21447,51 @@
			return objJsonResult;
			}
			}

			//获取所有模块页面
			[Route("Web/ModePageList")]
			[HttpGet]
			public object ModePageList(string HMakeName, string HType)
			{
			try
			{

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


			string sql = "select * from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' and isnull(Hurl,'') like'%html%' order by HPosition";
			ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //查询当前用户的自定义菜单数据
			if (ds.Tables[0] == null \|\| ds.Tables[0].Rows.Count == 0) //判断当前用户是否有设置过自定义信息，若记录数为0，则没有设置过，加载所有的菜单信息
			{
			string sql1 = "select * from Gy_MenuDefineSet where HMakeName=" +
			"(select top 1 c.GroupName from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId " +
			"left join System_UserGroup c on b.GroupId = c.GroupID where a.Czymc ='" + HMakeName + "' order by len(c.GroupName )) and isnull(Hurl,'') like'%html%'";
			ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet"); //查询用户绑定的角色是否设置菜单信息取角色名称最短的一个
			if ((ds.Tables[0] == null \|\| ds.Tables[0].Rows.Count == 0))
			{
			sql = "Select * from h_v_Gy_Menu_1 Order by HPosition,len(HitemID),HitemID ";
			ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
			}
			}


			//ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where isnull(Hurl,'') like'%html%' Order by HItemID ", "Gy_Menu_1"); //获取Gy_Menu_1中的所有菜单信息，用于为menuInitList列表充

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "查询成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查询失败！";
			objJsonResult.data = e.ToString();
			return objJsonResult;
			}
			}
			#endregion

			#region 保存自定义数据
			@@ -20736,16 +21541,18 @@
			string Hurl = ds.Tables[0].Rows[0]["Hurl"].ToString();
			string HType = ds.Tables[0].Rows[0]["HType"].ToString();
			string HPicNum = ds.Tables[0].Rows[0]["HPicNum"].ToString();
			string HTranslationText_English = ds.Tables[0].Rows[0]["HTranslationText_English"].ToString();
			string HTranslationText_Spain = ds.Tables[0].Rows[0]["HTranslationText_Spain"].ToString();

			if (HPartentID == "0" \|\| HPartentID == ds.Tables[0].Rows[0]["HItemID"].ToString())
			{
			string HPosition = ds.Tables[0].Rows[0]["HPosition"].ToString();
			sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','" + HPosition + "')";
			sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition,HTranslationText_English,HTranslationText_Spain) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','" + HPosition + "','"+ HTranslationText_English + "','" + HTranslationText_Spain + "')";
			oCN.RunProc(sql);
			}
			else
			{
			sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','z')";
			sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition,HTranslationText_English,HTranslationText_Spain) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','z','" + HTranslationText_English + "','" + HTranslationText_Spain + "')";
			oCN.RunProc(sql);
			}

			@@ -20784,7 +21591,7 @@
			//快捷方式自定义菜单：获取树组件数据
			[Route("Web/Xt_UserFastMenu_Display")]
			[HttpGet]
			public object Xt_UserFastMenu_Display(string HMakeName, string HType)
			public object Xt_UserFastMenu_Display(string HMakeName, string HType,string HModelAtributos)
			{
			try
			{
			@@ -20809,7 +21616,7 @@
			menuInit.HSelected = false;

			//判断用户是否选中显示该菜单
			String sql = "Select * from Xt_UserFastMenu where HSubFuncID = '" + ds.Tables[0].Rows[i]["HItemID"] + "' and HUserID='" + HMakeName + "'";
			String sql = "Select * from Xt_UserFastMenu where HSubFuncID = '" + ds.Tables[0].Rows[i]["HItemID"] + "' and HUserID='" + HMakeName + "' and HModelAtributos='" + HModelAtributos + "'";
			ds1 = oCn.RunProcReturn(sql, "Xt_UserFastMenu");
			if (ds1.Tables[0].Rows.Count > 0) //对于Gy_Menu_1表中的菜单节点，通过检索在Gy_MenuDefineSet表中对应用户是否存在该节点的信息，判断该用户是否选中该节点需要加载显示在侧菜单栏
			{
			@@ -20877,6 +21684,7 @@
			string HMakeName = sArray[1].ToString();
			string saveData = sArray[0].ToString();
			string HTypes = sArray[2].ToString();
			string HModelAtributos = sArray[3].ToString();
			List<SaveDefineMenu> saveDataList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SaveDefineMenu>>(saveData);

			//声明数据库操作工具
			@@ -20886,7 +21694,7 @@
			oCN.BeginTran();

			//删除当前用户的自定义数据
			string sql = "delete from Xt_UserFastMenu where HUserID = '" + HMakeName + "' and HType = '" + HTypes + "'";
			string sql = "delete from Xt_UserFastMenu where HUserID = '" + HMakeName + "' and HType = '" + HTypes + "' and HModelAtributos = '" + HModelAtributos + "'";
			oCN.RunProc(sql);

			//插入当前用户最新的自定义数据
			@@ -20905,7 +21713,7 @@
			string HCaption = ds.Tables[0].Rows[0]["HName"].ToString();
			string HType = ds.Tables[0].Rows[0]["HType"].ToString();

			sql = "insert into Xt_UserFastMenu(HUserID,HSubFuncID,HCaption,HType) values('" + HUserID + "','" + HSubFuncID + "','" + HCaption + "','" + HType + "')";
			sql = "insert into Xt_UserFastMenu(HUserID,HSubFuncID,HCaption,HType,HModelAtributos) values('" + HUserID + "','" + HSubFuncID + "','" + HCaption + "','" + HType + "','"+ HModelAtributos + "')";
			oCN.RunProc(sql);
			}
			}
			@@ -20935,17 +21743,17 @@
			//快捷方式自定义菜单：获取树组件数据
			[Route("Web/Xt_UserFastMenu_Init")]
			[HttpGet]
			public object Xt_UserFastMenu_Init(string HMakeName, string HType)
			public object Xt_UserFastMenu_Init(string HMakeName, string HType,string HModelAtributos)
			{
			try
			{
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			string sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = '" + HMakeName + "' and b.HType = '" + HType + "' Order by a.HItemID";
			string sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = '" + HMakeName + "' and b.HType = '" + HType + "' and a.HModelAtributos = '" + HModelAtributos + "' Order by a.HItemID";
			ds = oCn.RunProcReturn(sql, "Xt_UserFastMenu"); //获取Xt_UserFastMenu中该用户设置的自定义菜单信息，用于在前端加载

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = 'admin' and b.HType = '" + HType + "' Order by a.HItemID";
			sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = 'admin' and b.HType = '" + HType + "' and a.HModelAtributos = '" + HModelAtributos + "' Order by a.HItemID";
			ds = oCn.RunProcReturn(sql, "Xt_UserFastMenu"); //获取Xt_UserFastMenu中该用户设置的自定义菜单信息，用于在前端加载
			}