~yxj/MES-WEB-API.git

			@@ -113,7 +113,7 @@
			{
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList" + sWhere+ "order by hmainid desc", "h_v_Sb_EquipRepairCheckBillList");
			return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList " + sWhere+ " order by hmainid desc", "h_v_Sb_EquipRepairCheckBillList");
			}
			else
			{
			@@ -346,7 +346,7 @@
			if (sqlWhere == null \|\| sqlWhere.Equals(""))
			{
			//ds = oCN.RunProcReturn("select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub", "Sc_MouldRepairWorkBillSub");
			ds = oCN.RunProcReturn("select HManagerID1,表体负责人代码 HManagerCode,表体负责人 HManagerName,HRepairID1, 表体维修项目代码 HRepairCode,表体维修项目 HRepairName,表体维修要求 HRepairExplanation,表体备注 HRemark from h_v_Sc_EquipRepairWorkBillList_Edit", "h_v_Sc_EquipRepairWorkBillList_Edit");
			ds = oCN.RunProcReturn("select HRepairID,维修项目代码 HRepairCode,维修项目 HRepairName,HManagerID1 HManagerID,表体负责人代码 HManagerCode,表体负责人 HManagerName,HRepairID1 HRepairID, 表体维修项目代码 HRepairCode,表体维修项目 HRepairName,表体维修要求 HRepairExplanation,表体备注 HRemark,源单主内码 HSourceInterID,源单子内码 HSourceEntryID,源单单号 HSourceBillNo,源单类型 HSourceBillType from h_v_Sc_EquipRepairWorkBillList_Edit", "h_v_Sc_EquipRepairWorkBillList_Edit");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			@@ -355,7 +355,7 @@
			else
			{
			//string sql1 = "select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub where 1 = 1 ";
			string sql1 = "select HManagerID1,表体负责人代码 HManagerCode,表体负责人 HManagerName,HRepairID1, 表体维修项目代码 HRepairCode,表体维修项目 HRepairName,表体维修要求 HRepairExplanation,表体备注 HRemark from h_v_Sc_EquipRepairWorkBillList_Edit where 1 = 1 ";
			string sql1 = "select HRepairID,维修项目代码 HRepairCode,维修项目 HRepairName,HManagerID1 HManagerID,表体负责人代码 HManagerCode,表体负责人 HManagerName,HRepairID1 HRepairID, 表体维修项目代码 HRepairCode,表体维修项目 HRepairName,表体维修要求 HRepairExplanation,表体备注 HRemark ,源单主内码 HSourceInterID,源单子内码 HSourceEntryID,源单单号 HSourceBillNo,源单类型 HSourceBillType from h_v_Sc_EquipRepairWorkBillList_Edit where 1 = 1 ";
			string sql = sql1 + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipRepairWorkBillList_Edit");
			objJsonResult.code = "0";
			@@ -363,6 +363,32 @@
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			}
			return objJsonResult;
			}
			#endregion

			#region[新增编辑设备维修按选单号加载表体数据]
			[Route("Sb_EqpRepairWorkBill/Sb_EqpRepairWorkBillSubByHMainSourceBillNo")]
			[HttpGet]
			public object Sb_EqpRepairWorkBillSubByHMainSourceBillNo(string HMainSourceBillNo)
			{
			DataSet ds;
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("select 单据号,hmainid,hsubid,HBillType from h_v_Sb_EquipConkBookBillList where 单据号= '" + HMainSourceBillNo+"'", "h_v_Sb_EquipConkBookBillList");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			}
			catch (Exception e)
			{
			@@ -385,7 +411,7 @@
			public object DeltetEqpRepairWorkBill(string HInterID)
			{
			//编辑权限
			//if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
			//if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			@@ -665,7 +691,7 @@
			public object DeltetEqpRepairCheckBill(string HInterID)
			{
			//编辑权限
			//if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairCheckBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
			//if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairCheckBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			@@ -945,7 +971,7 @@
			public object DeltetEqpConkBookBill(string HInterID)
			{
			//编辑权限
			//if (!DBUtility.ClsPub.Security_Log("Sb_EquipConkBookBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
			//if (!DBUtility.ClsPub.Security_Log("Sb_EquipConkBookBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			@@ -1035,7 +1061,7 @@
			return objJsonResult;
			}
			//得到信息
			ds = oCN.RunProcReturn("select top 1 * from Gy_EquipMent where HNumber= '" + HBarCode + "'", "Gy_EquipMent");
			ds = oCN.RunProcReturn("select top 1 * from Gy_EquipFileBillMain where HEquipFileNumber= '" + HBarCode + "'", "Gy_EquipFileBillMain");
			//写入信息
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{