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
			{
			@@ -1143,7 +1150,52 @@
			}
			}

			/// <summary>
			/// 获取仓库列表 --添加模具仓库条件用于只查询模具仓库
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetWarehouseList_Json_MJ")]
			[HttpGet]
			public object GetWarehouseList_Json_MJ(string Warehouse, Int64 HOrgID)
			{
			sWhere = " Where HStopFlag=0 and HEndFlag=1 and HWarehouseType='模具仓库' and HUSEORGID =" + HOrgID + "";
			//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
			if (Warehouse != "")
			{
			sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%' or HUSEORGID like '%" + Warehouse + "%' ) ";
			}

			try
			{
			WebS.WebService1 oWeb = new WebS.WebService1();
			ds = oWeb.GetWarehouseList(sWhere, ref DBUtility.ClsPub.sErrInfo);
			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>
			/// 获取仓位列表
			@@ -1207,7 +1259,7 @@
			return objjson;
			}
			}


			/// <summary>
			/// 获取仓位列表
			/// </summary>
			@@ -1417,14 +1469,110 @@
			}
			}

			/// <summary>
			/// 获取生产资源列表下拉框
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetSouceList_Select")]
			[HttpGet]
			public object GetSouceList_Select(string HMaterID,Int64 HOrgID)
			{
			sWhere = " and HStopFlag=0 and HUSEORGID =" + HOrgID + "";
			try
			{
			string sql = "EXEC h_p_Gy_SouceList_PC " + HMaterID + ",'" + sWhere + "'";
			ds = oCN.RunProcReturn(sql, "h_p_Gy_SouceList_PC");

			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 = "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;
			}
			}

			#region 获取职员列表 (添加车间筛选)
			[Route("Web/GetEmployeeList_Json")]
			[HttpGet]
			public object GetEmployeeList_Json3(string Employee, Int64 HGroupID, Int64 HDeptID = -1)
			{
			// 给部门(车间)ID设置默认值，当没有传入值或者值为0的时候，走旧有的函数，否则走新的逻辑
			if(HDeptID == -1 \|\| HDeptID == 0)
			{
			return GetEmployeeList_Json2(Employee, HGroupID);
			}else
			{
			sWhere = $" Where HStopFlag=0 and HEndFlag=1 and HDeptID=${HDeptID}";

			if(Employee != "")
			{
			sWhere += " and ( HNumber like '%" + Employee + "%' or HName like '%" + Employee + "%' )";
			}
			if(HGroupID != 0)
			{
			sWhere += " and HGroupID=" + HGroupID.ToString();
			}

			try
			{
			string sql = $"Select * from h_v_IF_Emp {sWhere} Order by HNumber";
			ds = oCN.RunProcReturn(sql, "h_v_IF_Emp");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			// 如果递入部门没有维护人员列表则降级使用老方案
			return GetEmployeeList_Json2(Employee, HGroupID);
			}
			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;
			}

			}
			}
			#endregion


			/// <summary>
			/// 获取职员列表
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetEmployeeList_Json")]
			[HttpGet]
			public object GetEmployeeList_Json(string Employee, Int64 HGroupID)
			// [Route("Web/GetEmployeeList_Json")]
			// [HttpGet]
			public object GetEmployeeList_Json2(string Employee, Int64 HGroupID)
			{
			sWhere = " Where HStopFlag=0 and HEndFlag=1";
			//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
			@@ -1443,11 +1591,11 @@
			{
			if (Employee != "")
			{
			sWhere = " Where HStopFlag=0 and HWHID=" + HGroupID.ToString() + " and ( HNumber like '%" + Employee + "%' or HName like '%" + Employee + "%' ) ";
			sWhere = " Where HStopFlag=0 and HGroupID=" + HGroupID.ToString() + " and ( HNumber like '%" + Employee + "%' or HName like '%" + Employee + "%' ) ";
			}
			else
			{
			sWhere = " Where HStopFlag=0 and HWHID=" + HGroupID.ToString();
			sWhere = " Where HStopFlag=0 and HGroupID=" + HGroupID.ToString();
			}
			}
			try
			@@ -1482,6 +1630,7 @@
			}
			}



			/// <summary>
			/// 获取班次列表
			@@ -2229,7 +2378,7 @@
			public object Gy_EnvironmentTestSchemeBillList_Json(string sWhere)
			{
			DataSet ds;


			if (sWhere != "")
			{
			sWhere = " and ( 生产部门 like '%" + sWhere + "%' or 工作中心 like '%" + sWhere + "%' or 工序名称 like '%" + sWhere + "%' or 检测项目 like '%" + sWhere + "%' ) ";
			@@ -2692,7 +2841,7 @@
			objJsonResult.Message = "保存失败！代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			//新增时判断
			if (oItem.HItemID == 0)
			{
			@@ -2806,7 +2955,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";;
			objJsonResult.Message = "保存成功！"; ;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -2950,7 +3099,7 @@
			}
			//==================================================================================



			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -3260,7 +3409,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) " +
			@@ -3270,7 +3419,7 @@
			}
			else
			{
			oCN.RunProc("Update Gy_BadReason"+ " set " +
			oCN.RunProc("Update Gy_BadReason" + " set " +
			"HName='" + HName + "'" +
			",HShortNumber='" + sShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			@@ -3389,7 +3538,7 @@
			objJsonResult.Message = "保存失败！代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			//新增时判断
			if (oItem.HItemID == 0)
			{
			@@ -3550,7 +3699,7 @@
			[HttpGet]
			public object DeltetGy_BadType(string HItemID, string user)
			{
			DataSet ds;
			DataSet ds;
			try
			{
			//删除权限
			@@ -3650,7 +3799,7 @@
			}
			//==================================================================================



			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -3787,7 +3936,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");
			@@ -3929,13 +4078,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
			@@ -4819,7 +4968,7 @@
			//保存完毕后处理
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			{
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			@@ -4974,7 +5123,7 @@
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -5220,7 +5369,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 +
			@@ -6290,7 +6439,7 @@
			oItem.HMakeEmp = msg2; //创建人

			oBill.oModel = oItem;
			}
			}

			//保存
			//保存完毕后处理
			@@ -7134,7 +7283,7 @@
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{


			bResult = oBill.AddNew();
			}
			else
			@@ -7493,7 +7642,7 @@
			[HttpGet]
			public object DeltetGy_PostSkill(string HItemID, string user)
			{
			DataSet ds;
			DataSet ds;
			try
			{
			//删除权限
			@@ -7577,7 +7726,7 @@
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -7719,7 +7868,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)
			{
			@@ -8220,7 +8369,7 @@
			}
			//==================================================================================



			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -10699,11 +10848,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
			{
			@@ -11041,7 +11190,7 @@
			}
			//==================================================================================



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


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -13179,10 +13328,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
			@@ -13298,7 +13447,7 @@
			objJsonResult.data = 1;
			return objJsonResult;
			}


			//新增时判断
			if (oItem.HItemID == 0)
			{
			@@ -13410,7 +13559,7 @@
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID,ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			@@ -13565,7 +13714,7 @@
			}
			//==================================================================================



			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -15051,7 +15200,7 @@
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -15294,7 +15443,7 @@
			[Route("DeltetGy_MaintainLev")]
			[HttpGet]
			public object DeltetGy_MaintainLev(string HItemID, string user)
			{
			{
			try
			{
			//删除权限
			@@ -15487,7 +15636,7 @@
			//新增时判断
			if (oItem.HItemID == 0)
			{


			//检查父级是否存在
			string sParent;
			sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
			@@ -15700,7 +15849,7 @@
			return objJsonResult;
			}
			//==================================================================================


			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -15948,7 +16097,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 +
			@@ -15959,7 +16108,7 @@
			else
			{
			oCN.RunProc("Update " + "Gy_CheckNoteItem" + " set " +


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

			@@ -16163,18 +16312,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)
			{
			@@ -16195,11 +16344,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" +
			@@ -16208,7 +16357,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;
			@@ -16294,7 +16443,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);
			@@ -16334,16 +16483,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;
			}

			@@ -17415,7 +17564,7 @@
			return objJsonResult;
			}
			//==================================================================================


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

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



			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -18326,6 +18475,229 @@
			return objJsonResult;
			}
			}
			#endregion

			#region 白标基础信息表设置列表/保存/编辑/删除方法
			/// <summary>
			/// 保存白标基础信息表
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("SaveSc_PackUnionBillBarCode_tempList")]
			[HttpPost]
			public object SaveSc_PackUnionBillBarCode_tempList([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();

			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Sc_PackUnionBillBarCode_temp_Edit", 1, false, msg2))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			Int64 HItemID = 0;
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			ListModels oListModels = new ListModels();
			try
			{
			WebAPI.DLL.ClsSc_PackUnionBillBarCode_temp_Ctl oBill = new WebAPI.DLL.ClsSc_PackUnionBillBarCode_temp_Ctl();
			List<Model.ClsSc_PackUnionBillBarCode_temp_Model> lsmain = new List<Model.ClsSc_PackUnionBillBarCode_temp_Model>();
			msg1 = msg1.Replace("\\", "");
			msg1 = msg1.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Sc_PackUnionBillBarCode_temp(msg1);
			foreach (Model.ClsSc_PackUnionBillBarCode_temp_Model oItem in lsmain)
			{
			if (oItem.HMaterNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码不能为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (oItem.HMaterName.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！名称不能为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (!DBUtility.ClsPub.AllowNumber(oItem.HMaterNumber.Trim()))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Sc_PackUnionBillBarCode_temp where HMaterNumber='" + oItem.HMaterNumber.Trim() + "' and HUSEORGID= '" + oItem.HUSEORGID + "' ", "Sc_PackUnionBillBarCode_temp");
			if (oItem.HMaterNumber.Trim() == "")
			{
			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;
			}
			oItem.HMakeEmp = msg2; //创建人

			oBill.oModel = oItem;
			}

			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.oModel.HInterID == 0)
			{
			bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			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("GetSc_PackUnionBillBarCode_tempDetail")]
			[HttpGet]
			public ApiResult<DataSet> GetSc_PackUnionBillBarCode_tempDetail(string HID)
			{
			var model = LuBaoSevice.GetSc_PackUnionBillBarCode_tempBillDetail(HID);
			return model;
			}

			/// <summary>
			/// 白标基础信息表删除功能
			/// </summary>
			/// <returns></returns>
			[Route("DeltetSc_PackUnionBillBarCode_temp")]
			[HttpGet]
			public object DeltetSc_PackUnionBillBarCode_temp(string HItemID, string user)
			{
			DataSet ds;
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("Sc_PackUnionBillBarCode_temp_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 Sc_PackUnionBillBarCode_temp where HInterID=" + HItemID, "Sc_PackUnionBillBarCode_temp");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			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 from Sc_PackUnionBillBarCode_temp where HInterID=" + 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


			@@ -18646,7 +19018,8 @@
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}catch(Exception e)
			}
			catch (Exception e)
			{
			objjson.code = "0";
			objjson.count = 0;
			@@ -19220,6 +19593,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>
			@@ -19340,17 +19767,17 @@
			[HttpGet]
			public object GetPatrolCheckItemList_Json(string CheckItem)
			{
			DataSet ds;
			DataSet ds;
			try
			{
			sWhere = " Where HStopFlag=0 and HEndFlag=1";
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if(CheckItem != "" && CheckItem != null)
			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 )
			if (ds == null)
			{
			objjson.code = "0";
			objjson.count = 0;
			@@ -19367,7 +19794,7 @@
			return objjson;
			}
			}
			catch(Exception ex)
			catch (Exception ex)
			{
			objjson.code = "0";
			objjson.count = 0;
			@@ -19589,15 +20016,15 @@
			/// <returns></returns>
			[Route("Web/GetSc_ProcessExchangeBillListView")]
			[HttpGet]
			public object GetSc_ProcessExchangeBillListView(string sWhere,int OrganizationID)
			{
			public object GetSc_ProcessExchangeBillListView(string sWhere, int OrganizationID)
			{
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			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_PDA where 1=1 " + sWhere + " order by 单据号 desc,hsubid ";
			@@ -19743,7 +20170,7 @@
			List<object> columnNameList = new List<object>();

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = "Select * from h_v_Gy_GetSampleSchemeListView where 1 = 1 " + sWhere + "Order by hmainid ";
			string sql = "Select * from h_v_Gy_GetSampleSchemeListView where 1 = 1 and HUSEORGID = "+OrganizationID + sWhere + "Order by hmainid ";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_GetSampleSchemeListView");

			//添加列名
			@@ -19894,18 +20321,19 @@
			}
			}


			/// <summary>
			/// 根据物料+工序获取检验方案
			/// </summary>
			/// <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");
			@@ -19914,7 +20342,7 @@
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objjson.Message = "获取失败,未设置默认检验方案";
			objjson.data = null;
			return objjson;
			}
			@@ -19944,21 +20372,70 @@
			/// <returns></returns>
			[Route("Web/GetCheckItemByCheckProjectID")]
			[HttpGet]
			public object GetCheckItemByCheckProjectID(int CheckProjectID, int HBatchQty)
			public object GetCheckItemByCheckProjectID(int CheckProjectID, int HBatchQty, int HMaterID, string HBillType)
			{
			if (CheckProjectID <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "检验方案未选择";
			objjson.data = null;
			return objjson;
			}
			//if (CheckProjectID <= 0)
			//{
			// objjson.code = "0";
			// objjson.count = 0;
			// objjson.Message = "检验方案未选择";
			// objjson.data = null;
			// return objjson;
			//}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = "exec h_p_Gy_GetQCCheckItemByProject " + CheckProjectID + "," + HBatchQty;
			string sql = "exec h_p_Gy_GetQCCheckItemByProject " + CheckProjectID + "," + HBatchQty + "," + HMaterID + ",'" + HBillType + "'";
			ds = oCN.RunProcReturn(sql, "h_p_Gy_GetQCCheckItemByProject");
			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 = "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>
			/// 根据检验方案主内码获取检验项目,前面的会把先获取物料的默认质检方案，APP只根据检验方案ID获取对应检验项目
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetCheckItemByCheckProjectID_Sec")]
			[HttpGet]
			public object GetCheckItemByCheckProjectID_Sec(int CheckProjectID, int HBatchQty, int HMaterID, string HBillType)
			{
			//if (CheckProjectID <= 0)
			//{
			// objjson.code = "0";
			// objjson.count = 0;
			// objjson.Message = "检验方案未选择";
			// objjson.data = null;
			// return objjson;
			//}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			string sql = "exec h_p_Gy_GetQCCheckItemByProject_Sec " + CheckProjectID + "," + HBatchQty + "," + HMaterID + ",'" + HBillType + "'";
			ds = oCN.RunProcReturn(sql, "h_p_Gy_GetQCCheckItemByProject_Sec");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			@@ -20218,6 +20695,7 @@
			}
			else
			{
			sWhere = sWhere.Replace("\"", "''");
			ds = oCN.RunProcReturn("exec h_p_IF_BarCodeBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_IF_BarCodeBillList");
			}

			@@ -20474,7 +20952,7 @@
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败,查无数据" + DBUtility.ClsPub.sErrInfo;
			objjson.Message = "获取失败,明细查无数据";
			objjson.data = null;
			return objjson;
			}
			@@ -20553,6 +21031,80 @@
			}
			}

			#region
			[Route("Web/GetMouldBillsList")]
			[HttpGet]
			public object GetMouldBillsList(string sWhere, string Type, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			string HView = "";
			switch (Type)
			{
			case "RC": // 模具维修检验单
			HView = "h_v_Sc_MouldRepairCheckBillList";
			break;
			case "PG": // 模具维修派工单
			HView = "h_v_Sc_MouldRepairSendWorkBill";
			break;
			default:
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "设备模块类型错误！";
			objjson.data = null;
			return objjson;
			}

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

			ds = oCN.RunProcReturn("select ManagerFlag from gy_czygl where czymc='" + user.Trim() + "'", "gy_czygl");
			if (!(bool)ds.Tables[0].Rows[0]["ManagerFlag"]) //是否管理员
			{
			//不是管理员
			sWhere += " and 制单人 = '" + user + "'";
			}


			string sql = string.Format(@"select * from " + HView + " where 1 = 1 " + sWhere + " order by 日期 desc, hmainid desc");
			ds = oCN.RunProcReturn(sql, HView);
			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取失败,查无数据";
			objjson.data = null;
			objjson.list = columnNameList;
			return objjson;
			}
			else
			{
			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			objjson.list = columnNameList;
			return objjson;
			}
			}
			catch (Exception ex)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}
			#endregion

			/// <summary>
			/// 查询各类设备单据列表（设备点检，设备维修，设备保养......）
			/// </summary>
			@@ -20588,6 +21140,9 @@
			case "XJ":
			HView = "h_v_Sb_EquipPatrolCheckBillList";
			break;
			case "PG": // 设备维修派工单
			HView = "h_v_Sb_EquipRepairSendWorkBillList";
			break;
			default:
			objjson.code = "0";
			objjson.count = 0;
			@@ -20606,7 +21161,7 @@
			}


			string sql = string.Format(@"select * from " + HView + " where 1 = 1 " + sWhere);
			string sql = string.Format(@"select * from " + HView + " where 1 = 1 " + sWhere + " order by 日期 desc, hmainid desc");
			ds = oCN.RunProcReturn(sql, HView);
			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			@@ -21006,6 +21561,50 @@


			/// <summary>
			/// 获取选单号的源单类型通过选单号单据类型
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetHSourceBillTypeByBillType")]
			[HttpGet]
			public object GetHSourceBillTypeByBillType(string HBillType, int Num)
			{
			try
			{
			ClsCN oCn = new ClsCN();
			DataSet oDs = new DataSet();
			//有的单子源单分为红蓝单 0代表蓝单 1代表红单
			if (Num == 0)
			{ //源单为蓝单
			oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HNumber='" + HBillType + "'and HRedBlueFlag ='" + Num + "' ", "Xt_BillSourceSet");
			}
			else if (Num == 1)
			{ //源单为红单
			oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HNumber='" + HBillType + "' and HRedBlueFlag ='" + Num + "' ", "Xt_BillSourceSet");
			}
			else if (Num == 2)
			{ //不分红蓝单
			oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HNumber='" + HBillType + "'", "Xt_BillSourceSet");
			}

			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功！";
			objjson.data = oDs.Tables[0];
			return objjson; ;
			}
			catch (Exception e)
			{

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


			/// <summary>
			/// 获取选单号的源单类型
			/// </summary>
			/// <returns></returns>
			@@ -21035,6 +21634,120 @@
			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, string HMenuListName)
			{
			try
			{
			DataSet ds = oCN.RunProcReturn("exec [h_p_Gy_MenuDefineSet_APP_Get] " +
			"@HMaker = N'" + HMaker + "'," +
			"@HType = N'" + HType + "'," +
			"@HMenuListName = N'" + HMenuListName + "'"
			, "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 + "','" + 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
			@@ -21068,13 +21781,19 @@
			{
			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 ))";
			"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");
			}

			}
			}

			for (int i = 0; i < ds.Tables[0].Rows.Count; i++) //将菜单的根节点保存到列表menu中
			@@ -21276,7 +21995,7 @@
			{
			try
			{


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


			@@ -21368,7 +22087,7 @@
			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,HTranslationText_English,HTranslationText_Spain) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','" + HPosition + "','"+ HTranslationText_English + "','" + HTranslationText_Spain + "')";
			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
			@@ -21412,7 +22131,7 @@
			//快捷方式自定义菜单：获取树组件数据
			[Route("Web/Xt_UserFastMenu_Display")]
			[HttpGet]
			public object Xt_UserFastMenu_Display(string HMakeName, string HType,string HModelAtributos)
			public object Xt_UserFastMenu_Display(string HMakeName, string HType, string HModelAtributos)
			{
			try
			{
			@@ -21534,7 +22253,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,HModelAtributos) values('" + HUserID + "','" + HSubFuncID + "','" + HCaption + "','" + HType + "','"+ HModelAtributos + "')";
			sql = "insert into Xt_UserFastMenu(HUserID,HSubFuncID,HCaption,HType,HModelAtributos) values('" + HUserID + "','" + HSubFuncID + "','" + HCaption + "','" + HType + "','" + HModelAtributos + "')";
			oCN.RunProc(sql);
			}
			}
			@@ -21564,7 +22283,7 @@
			//快捷方式自定义菜单：获取树组件数据
			[Route("Web/Xt_UserFastMenu_Init")]
			[HttpGet]
			public object Xt_UserFastMenu_Init(string HMakeName, string HType,string HModelAtributos)
			public object Xt_UserFastMenu_Init(string HMakeName, string HType, string HModelAtributos)
			{
			try
			{
			@@ -21964,7 +22683,7 @@
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			ds = oCN.RunProcReturn("Select * from Xt_BillType where HNumber = '" + HModuleType + "'", "Xt_BillType");
			ds = oCN.RunProcReturn("Select * from Xt_BillType with(nolock) where HNumber = '" + HModuleType + "'", "Xt_BillType");

			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			@@ -21992,6 +22711,116 @@
			return objjson;
			}
			}

			#region 通过单据类型、单据号查询单据信息
			/// <summary>
			/// 通过单据类型获取对应视图并通过单据号查询单据信息
			/// </summary>
			/// <param name="HBillNo"></param>
			/// <param name="HBillType"></param>
			/// <param name="HStoreOrgID"></param>
			/// <returns></returns>
			[Route("Web/GetBillInfo")]
			[HttpGet]
			public object GetBillInfo(string HBillNo, string HBillType, int HStockOrgID)
			{
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			ds = oCN.RunProcReturn("exec h_p_Gy_GetBillInfoByHBillTypeAndHBillNo N'" + HBillType + "',N'" + HBillNo +
			"'," + HStockOrgID, "h_p_Gy_GetBillInfoByHBillTypeAndHBillNo");

			if (ds == null)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objjson.data = null;
			return objjson;
			}
			else if ((bool)ds.Tables[1].Rows[0]["returnType"] == false)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ds.Tables[1].Rows[1]["payload"];
			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;
			}
			}
			#endregion

			#region 通过单据类型、单据内码、子内码查询单据信息
			/// <summary>
			/// 通过单据类型获取对应视图并通过单据号查询单据信息
			/// </summary>
			/// <param name="HBillNo"></param>
			/// <param name="HBillType"></param>
			/// <param name="HStoreOrgID"></param>
			/// <returns></returns>
			[Route("Web/GetBillInfo_GenerateBillCode")]
			[HttpGet]
			public object GetBillInfo_GenerateBillCode(string HBillType, string HInterID, int HEntryID)
			{
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			ds = oCN.RunProcReturn("exec h_p_Gy_GetBillInfo_GenerateCode N'" + HBillType + "'," + HInterID +
			"," + HEntryID, "h_p_Gy_GetBillInfo_GenerateCode");

			if (ds == null)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objjson.data = null;
			return objjson;
			}
			else if ((bool)ds.Tables[1].Rows[0]["returnType"] == false)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ds.Tables[1].Rows[1]["payload"];
			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;
			}
			}
			#endregion


			/// <summary>
			@@ -22054,6 +22883,800 @@
			}
			}

			}
			#region 小卫电器获取物料条码对应单据
			/// <summary>
			/// 小卫电器获取物料条码对应单据
			/// </summary>
			/// <param name="sWhere">自定义过滤条件</param>
			/// <param name="HBillType">单据号</param>
			/// <param name="HSourceBillType">源单号</param>
			/// <returns></returns>
			[Route("web/XiaoWeiBarCodeQuery")]
			[HttpGet]
			public object XiaoWeiBarCodeQuery(string sWhere, int HBillType, int HSourceBillType)
			{
			try
			{
			ds = oCN.RunProcReturn("exec h_p_XiaoWeiBarCodeQuery '" + sWhere + "'," + HBillType + "," + HSourceBillType, "h_p_XiaoWeiBarCodeQuery");

			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 = "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;
			}
			}

			#endregion


			#region 费用项目设置列表/保存/编辑/删除方法
			/// <summary>
			/// 项目费用保存
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("SaveGy_ItemMoney")]
			[HttpPost]
			public object SaveGy_ItemMoney([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();

			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Gy_ItemMoney_Edit", 1, false, msg2))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			Int64 HItemID = 0;
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//获取最大ID值赋值
			DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from Gy_ItemMoney_1 ", "Gy_ItemMoney_1");
			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
			{

			WebAPI.DLL.ClsGy_ItemMoney_Ctl oBill = new WebAPI.DLL.ClsGy_ItemMoney_Ctl();
			List<Model.ClsGy_ItemMoney_Model> lsmain = new List<Model.ClsGy_ItemMoney_Model>();
			msg1 = msg1.Replace("\\", "");
			msg1 = msg1.Replace("\n", "");
			lsmain = oListModels.getObjectByJson_Gy_ItemMoney(msg1);
			foreach (Model.ClsGy_ItemMoney_Model oItem in lsmain)
			{
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码不能为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (oItem.HName.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！名称不能为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_ItemMoney_1 where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_ItemMoney_1");
			if (oItem.HNumber.Trim() == "")
			{
			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());
			if (sParent.Trim() == "")
			{
			oBill.oModel.HParentID = 0;
			}
			else
			{
			if (oBill.HavParentCode(sParent.Trim(), HItemID))
			{
			oBill.oModel.HParentID = oBill.oModel.HItemID;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！上级代码不存在或被禁用！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			}
			else//编辑时判断
			{
			//检查父级是否存在
			string sParent;
			sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
			if (sParent.Trim() == "")
			{
			oBill.oModel.HParentID = 0;
			}
			else
			{
			if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
			{
			oBill.oModel.HParentID = oBill.oModel.HItemID;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！上级代码不存在或被禁用！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			}
			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			if (sShortNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！短代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oItem.HShortNumber = sShortNumber;//短代码
			oItem.HEndFlag = true;//末级标志
			oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
			oItem.HMakeEmp = msg2; //创建人

			oBill.oModel = oItem;
			}

			//保存
			//保存完毕后处理
			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("Web/GetGy_ItemMoneyDetail")]
			[HttpGet]
			public ApiResult<DataSet> GetGy_ItemMoneyDetail(string HID)
			{
			var model = LuBaoSevice.GetGy_ItemMoneyDetail(HID);
			return model;
			}

			/// <summary>
			/// 项目费用删除功能
			/// </summary>
			/// <returns></returns>
			[Route("DeltetGy_ItemMoney")]
			[HttpGet]
			public object DeltetGy_ItemMoney(string HItemID, string user)
			{
			DataSet ds;
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("Gy_ItemMoney_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_ItemMoney_1 where HItemID=" + HItemID, "Gy_ItemMoney_1");
			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;
			}


			//删除前控制=========================================
			string sql1 = "exec h_p_Gy_ItemMoney_BeforeDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_ItemMoney_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_ItemMoney_1 where HItemID=" + HItemID);


			//删除后控制=========================================
			string sql2 = "exec h_p_Gy_ItemMoney_AfterDelCtrl " + HItemID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_Gy_ItemMoney_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;
			}
			}
			#endregion

			#region 用于连接的健康度检验，只要能访问通这个接口，则表明连接可用
			[Route("Health")]
			[HttpGet]
			public IHttpActionResult CheckHealth()
			{
			// 返回 200 状态码确认健康状态
			return Ok();
			}
			#endregion

			#region 登录用户与设备ClientID 的关系写入数据库
			[Route("Web/SetGy_UserClientIdConnection")]
			[HttpPost]
			public object SetGy_UserClientIdConnection([FromBody] JObject msg)
			{
			DataSet ds;
			oCN.BeginTran();
			try
			{
			ds = oCN.RunProcReturn($@"exec h_p_SetGy_UserClientIdRelation
			@HUserbm=N'{msg["HUserbm"].ToString()}',
			@HUserName=N'{msg["HUserName"].ToString()}',
			@HClientID=N'{msg["HClientID"].ToString()}',
			@HOnline={msg["HOnline"].ToString()}
			", "h_p_SetGy_UserClientIdRelation");

			if(ds.Tables[0].Rows[0]["HStatus"].ToString() == "1")
			{
			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存设备信息成功！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存设备信息失败！" + ds.Tables[0].Rows[0]["msg"];
			objJsonResult.data = null;
			return objJsonResult;
			}
			}catch(Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存设备信息失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region APP 根据模块获取该模块下需要显示消息标识的子模块
			[Route("Web/getMessageIdentified")]
			[HttpGet]
			public object getMessageIdentified(string user, string moduleName)
			{
			DataSet oDs = oCN.RunProcReturn($"exec h_p_getMessageIdentifier_APP '{user}', '{moduleName}'", "h_p_getMessageIdentifier_APP");
			if(oDs == null \|\| oDs.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "获取消息标识失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取消息标识成功！";
			objJsonResult.data = oDs.Tables[0];
			return objJsonResult;
			}
			}
			#endregion

			#region 模具待上模查询获取
			[Route("Web/getSc_MouldUpperAwaitQuery")]
			[HttpGet]
			public object getSc_MouldUpperAwaitQuery(string user, string HBeginDate = "", string HEndDate = "")
			{
			if(HBeginDate == "") // 默认7天间距
			{
			HBeginDate = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd");
			}

			if(HEndDate == "")
			{
			HEndDate = DateTime.Today.ToString("yyyy-MM-dd");
			}
			List<object> columnNameList = new List<object>();
			try
			{
			DataSet oDs = oCN.RunProcReturn($" exec h_p_Sc_MouldUpperAwaitQuery '{user}', '{HBeginDate}', '{HEndDate}'", "h_p_Sc_MouldUpperAwaitQuery");
			if(oDs == null \|\| oDs.Tables[0].Rows.Count == 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败, 单据无返回值!";
			objjson.data = null;
			return objjson;
			}else
			{
			//添加列名
			foreach (DataColumn col in oDs.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = oDs.Tables[0];
			objjson.list = columnNameList;
			return objjson;
			}

			}catch(Exception ex)
			{
			LogService.Write(ex.ToString());
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ex.Message.ToString();
			objjson.data = null;
			return objjson;
			}
			}
			#endregion

			#region 待开工列表获取
			[Route("Web/getCj_StationInBillAwaitQuery")]
			[HttpGet]
			public object getCj_StationInBillAwaitQuery(string user, string HBeginDate = "", string HEndDate = "")
			{
			if (HBeginDate == "") // 默认7天间距
			{
			HBeginDate = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd");
			}

			if (HEndDate == "")
			{
			HEndDate = DateTime.Today.ToString("yyyy-MM-dd");
			}
			List<object> columnNameList = new List<object>();
			try
			{
			DataSet oDs = oCN.RunProcReturn($" exec h_p_Cj_StationInBillAwaitQuery '{user}', '{HBeginDate}', '{HEndDate}'", "h_p_Cj_StationInBillAwaitQuery");
			if (oDs == null \|\| oDs.Tables[0].Rows.Count == 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败, 单据无返回值!";
			objjson.data = null;
			return objjson;
			}
			else
			{
			//添加列名
			foreach (DataColumn col in oDs.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = oDs.Tables[0];
			objjson.list = columnNameList;
			return objjson;
			}

			}
			catch (Exception ex)
			{
			LogService.Write(ex.ToString());
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ex.Message.ToString();
			objjson.data = null;
			return objjson;
			}
			}
			#endregion

			#region 模具待下模查询获取
			[Route("Web/getSc_MouldLowerBillAwaitQuery")]
			[HttpGet]
			public object getSc_MouldLowerBillAwaitQuery(string user, string HBeginDate = "", string HEndDate = "")
			{
			if (HBeginDate == "") // 默认7天间距
			{
			HBeginDate = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd");
			}

			if (HEndDate == "")
			{
			HEndDate = DateTime.Today.ToString("yyyy-MM-dd");
			}
			List<object> columnNameList = new List<object>();
			try
			{
			DataSet oDs = oCN.RunProcReturn($" exec h_p_Sc_MouldLowerBillAwaitQuery '{user}', '{HBeginDate}', '{HEndDate}'", "h_p_Sc_MouldLowerBillAwaitQuery");
			if (oDs == null \|\| oDs.Tables[0].Rows.Count == 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败, 单据无返回值!";
			objjson.data = null;
			return objjson;
			}
			else
			{
			//添加列名
			foreach (DataColumn col in oDs.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = oDs.Tables[0];
			objjson.list = columnNameList;
			return objjson;
			}

			}
			catch (Exception ex)
			{
			LogService.Write(ex.ToString());
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ex.Message.ToString();
			objjson.data = null;
			return objjson;
			}
			}
			#endregion

			#region 获取设备绑定职员信息(带出模具职员信息) 华舟
			[Route("Web/getEquipBindingEmp")]
			[HttpGet]
			public object getEquipBindingEmp(string HEquipNumber)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			ds = oCN.RunProcReturn($"exec h_p_getEquipBindingEmp_huazhou {HEquipNumber}", "h_p_getEquipBindingEmp_huazhou");
			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前设备没有上模信息";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception ex)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查询数据异常，请与管理员联系！" + ex.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region APP 获取异常反馈单获取检验单内容通用方法
			[Route("Web/getCheckBillStatus")]
			[HttpGet]
			public object getCheckBillStatus(Int64 HInterID, string HBillType)
			{
			try {
			string sql = "";
			List<object> columnNameList = new List<object>();
			if(HBillType == "7505")
			{
			// 首检
			sql = $@"SELECT
			a.HInterID AS hmainid,b.HEntryID hsubid, a.HDate AS 日期, a.HBillNo AS 单据号,
			a.HRemark AS 表头备注,s.HName 生产资源名称,s.HNumber 生产资源代码, m.HNumber AS 产品内码, m.HName AS 产品名称, m.HModel AS 产品型号,e.HNumber as 检验员代码, e.HName as 检验员名称,
			a.HMaker AS 制单人, a.HMakeDate AS 制单日期, a.HChecker AS 审核人, a.HCheckDate AS 审核日期, a.HUpDater AS 修改人,
			a.HUpDateDate AS 修改日期, a.HCloseMan AS 关闭人, a.HCloseDate AS 关闭日期, a.HDeleteMan AS 作废人, a.HDeleteDate AS 作废日期,
			a.HBillType AS 单据类型,b.HEntryID hsubid, a.HCheckQty 检验数量, a.HSourceID HSourceID,
			a.HProcExchInterID HProcExchInterID, a.HProcExchEntryID HProcExchEntryID, a.HProcExchBillNo 工序流转卡号,
			a.HICMOInterID HICMOInterID, a.HICMOEntryID HICMOEntryID, a.HICMOBillNo 生产订单号
			FROM
			dbo.QC_FirstPieceCheckBillMain AS a INNER JOIN
			dbo.QC_FirstPieceCheckBillSub AS b ON a.HInterID = b.HInterID LEFT OUTER JOIN
			dbo.Gy_Source s on a.HSourceID =s.HItemID LEFT OUTER JOIN
			dbo.Gy_Material m on a.HMaterID = m.HItemID LEFT OUTER JOIN
			dbo.Gy_Employee AS e ON a.HFirstCheckEmp = e.HItemID ";
			sql += $" where a.HInterID = {HInterID}";

			ds = oCN.RunProcReturn(sql, "QC_FirstPieceCheckBillMain");

			}
			else if (HBillType == "7520")
			{
			// 巡检
			sql = $@"SELECT
			a.HInterID AS hmainid,b.HEntryID hsubid, a.HDate AS 日期, a.HBillNo AS 单据号,
			a.HRemark AS 表头备注,s.HName 生产资源名称,s.HNumber 生产资源代码, m.HNumber AS 产品内码, m.HName AS 产品名称, m.HModel AS 产品型号,e.HNumber as 检验员代码, e.HName as 检验员名称,
			a.HMaker AS 制单人, a.HMakeDate AS 制单日期, a.HChecker AS 审核人, a.HCheckDate AS 审核日期, a.HUpDater AS 修改人,
			a.HUpDateDate AS 修改日期, a.HCloseMan AS 关闭人, a.HCloseDate AS 关闭日期, a.HDeleteMan AS 作废人, a.HDeleteDate AS 作废日期,
			a.HBillType AS 单据类型,b.HEntryID hsubid, a.HCheckQty 检验数量, a.HSourceID HSourceID,
			a.HProcExchInterID HProcExchInterID, a.HProcExchEntryID HProcExchEntryID, a.HProcExchBillNo 工序流转卡号,
			a.HICMOInterID HICMOInterID, a.HICMOEntryID HICMOEntryID, a.HICMOBillNo 生产订单号
			FROM
			dbo.QC_PatrolProcCheckOtherBillMain AS a INNER JOIN
			dbo.QC_PatrolProcCheckOtherBillSub AS b ON a.HInterID = b.HInterID LEFT OUTER JOIN
			dbo.Gy_Source s on a.HSourceID =s.HItemID LEFT OUTER JOIN
			dbo.Gy_Material m on a.HMaterID = m.HItemID LEFT OUTER JOIN
			dbo.Gy_Employee AS e ON a.HFirstCheckEmp = e.HItemID ";
			sql += $" where a.HInterID = {HInterID}";

			ds = oCN.RunProcReturn(sql, "QC_PatrolProcCheckOtherBillMain");
			}
			else if(HBillType == "7507")
			{
			// 末检
			sql = $@"SELECT
			a.HInterID AS hmainid,b.HEntryID hsubid, a.HDate AS 日期, a.HBillNo AS 单据号,
			a.HRemark AS 表头备注,s.HName 生产资源名称,s.HNumber 生产资源代码, m.HNumber AS 产品内码, m.HName AS 产品名称, m.HModel AS 产品型号,e.HNumber as 检验员代码, e.HName as 检验员名称,
			a.HMaker AS 制单人, a.HMakeDate AS 制单日期, a.HChecker AS 审核人, a.HCheckDate AS 审核日期, a.HUpDater AS 修改人,
			a.HUpDateDate AS 修改日期, a.HCloseMan AS 关闭人, a.HCloseDate AS 关闭日期, a.HDeleteMan AS 作废人, a.HDeleteDate AS 作废日期,
			a.HBillType AS 单据类型,b.HEntryID hsubid, a.HCheckQty 检验数量, a.HSourceID HSourceID,
			a.HProcExchInterID HProcExchInterID, a.HProcExchEntryID HProcExchEntryID, a.HProcExchBillNo 工序流转卡号,
			a.HICMOInterID HICMOInterID, a.HICMOEntryID HICMOEntryID, a.HICMOBillNo 生产订单号
			, HRemarkSN 条码
			FROM
			dbo.QC_ProcessCheckBillMain AS a INNER JOIN
			dbo.QC_ProcessCheckBillSub AS b ON a.HInterID = b.HInterID LEFT OUTER JOIN
			dbo.Gy_Source s on a.HSourceID =s.HItemID LEFT OUTER JOIN
			dbo.Gy_Material m on a.HMaterID = m.HItemID LEFT OUTER JOIN
			dbo.Gy_Employee AS e ON a.HFirstCheckEmp = e.HItemID ";
			sql += $" where a.HInterID = {HInterID}";

			ds = oCN.RunProcReturn(sql, "QC_ProcessCheckBillMain");
			}
			if(ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查询数据异常，无检验单！";
			objJsonResult.data = null;
			return objJsonResult;
			}

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

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception ex)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查询数据异常，请与管理员联系！" + ex.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}