~yxj/MES-WEB-API.git

			@@ -219,7 +219,18 @@

			public static DataSet Sc_MouldMaintainBillList_s(string sWhere)
			{
			return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainBillList ", "h_v_Sc_MouldMaintainBillList");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintain", "h_v_Sc_MouldMaintain");
			}
			else
			{
			string sql1 = "select * from h_v_Sc_MouldMaintain where 1 = 1 ";
			string sql = sql1 + sWhere;
			return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMaintain");

			}
			//return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainBillList ", "h_v_Sc_MouldMaintainBillList");
			}
			#endregion

			@@ -317,7 +328,7 @@

			public static DataSet Sc_MouldDotCheckBillList_s(string sWhere)
			{
			return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList ", "h_v_Sc_MouldDotCheckBillList");
			return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 "+sWhere+" ", "h_v_Sc_MouldDotCheckBillList");
			}
			#endregion

			@@ -1362,7 +1373,7 @@
			if (sqlWhere == null \|\| sqlWhere.Equals(""))
			{
			//ds = oCN.RunProcReturn("select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub", "Sc_MouldRepairWorkBillSub");
			ds = oCN.RunProcReturn("select HRepairSonID HRepairID, 子维修项目代码 HRepairCode,子维修项目 HRepairName,子维修要求 HRepairExplanation,HManagerSonID HManagerID,子负责人代码 HManagerCode,子负责人 HManagerName,维修费用 HMoney,表体备注 HRemark from h_v_Sc_MouldRepairWorkBillList_Edit", "h_v_Sc_MouldRepairWorkBillList_Edit");
			ds = oCN.RunProcReturn("select HRepairID, 子维修项目代码 HRepairCode,子维修项目 HRepairName,子维修要求 HRepairExplanation,HManagerSonID HManagerID,子负责人代码 HManagerCode,子负责人 HManagerName,维修费用 HMoney,表体备注 HRemark from h_v_Sc_MouldRepairWorkBillList_Edit", "h_v_Sc_MouldRepairWorkBillList_Edit");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			@@ -1371,7 +1382,7 @@
			else
			{
			//string sql1 = "select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub where 1 = 1 ";
			string sql1 = "select HRepairSonID HRepairID, 子维修项目代码 HRepairCode,子维修项目 HRepairName,子维修要求 HRepairExplanation,HManagerSonID HManagerID,子负责人代码 HManagerCode,子负责人 HManagerName,维修费用 HMoney,表体备注 HRemark from h_v_Sc_MouldRepairWorkBillList_Edit where 1 = 1 ";
			string sql1 = "select HRepairID,子维修项目代码 HRepairCode,子维修项目 HRepairName,子维修要求 HRepairExplanation,HManagerSonID HManagerID,子负责人代码 HManagerCode,子负责人 HManagerName,维修费用 HMoney,表体备注 HRemark from h_v_Sc_MouldRepairWorkBillList_Edit where 1 = 1 ";
			string sql = sql1 + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList_Edit");
			objJsonResult.code = "0";
			@@ -2441,6 +2452,7 @@
			#endregion

			#endregion

			#region 模具保养记录表

			#region 模具保养记录表保存/编辑
			@@ -2458,7 +2470,7 @@
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();

			string msg4 = sArray[2].ToString();

			string UserName = "";
			ListModels oListModels = new ListModels();
			@@ -2471,10 +2483,10 @@
			lsmain = oListModels.getObjectByJson_Sc_MouldMaintainBillMain(msg2);
			foreach (Model.ClsSc_MouldMaintainBillMain oItem in lsmain)
			{
			//oItem.HMaker = "";
			UserName = oItem.HMaker; //制单人
			oItem.HBillType = "3818";
			oItem.HBillSubType = "3818";
			DBUtility.ClsPub.CurUserName = UserName;
			oItem.HBillType = "3819";
			oItem.HBillSubType = "3819";

			//oItem.HInterID =0;
			//oItem.HBillNo = "";
			@@ -2502,16 +2514,16 @@
			}
			oBill.omodel = oItem;
			}
			//表体数据
			//保养项表体数据
			//按 },{来拆分数组 //去掉【和】
			msg3 = msg3.Substring(1, msg3.Length - 2);
			msg3 = msg3.Replace("\\", "");
			msg3 = msg3.Replace("\n", ""); //\n
			//msg2 = msg2.Replace("'", "’");
			List<Model.ClsSc_MouldMaintainBillSub> ls = new List<Model.ClsSc_MouldMaintainBillSub>();
			ls = oListModels.getObjectByJson_Sc_MouldMaintainBillSub(msg3);
			List<Model.ClsSc_MouldMaintainRuleBillSub_Item> ls = new List<Model.ClsSc_MouldMaintainRuleBillSub_Item>();
			ls = oListModels.getObjectByJson_Sc_MouldMaintainRuleBillSub_Item(msg3);
			int i = 0;
			foreach (Model.ClsSc_MouldMaintainBillSub oItemSub in ls)
			foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oItemSub in ls)
			{

			i++;
			@@ -2525,6 +2537,32 @@
			//oItemSub.HSourceBillNo = ""; //源单单号
			//oItemSub.HSourceBillType = ""; //源单类型
			oItemSub.HRelationQty = 0; //关联数量
			oBill.DetailCol.Add(oItemSub);

			}
			//配件项表体数据
			//按 },{来拆分数组 //去掉【和】
			msg4 = msg4.Substring(1, msg4.Length - 2);
			msg4 = msg4.Replace("\\", "");
			msg4 = msg4.Replace("\n", ""); //\n
			//msg2 = msg2.Replace("'", "’");
			List<Model.ClsSc_MouldMaintainBillSub> ls1 = new List<Model.ClsSc_MouldMaintainBillSub>();
			ls1 = oListModels.getObjectByJson_Sc_MouldMaintainBillSub(msg4);
			int j = 0;
			foreach (Model.ClsSc_MouldMaintainBillSub Sub in ls1)
			{

			j++;
			Sub.HEntryID = j;
			//oItemSub.HCloseMan = ""; //行关闭
			Sub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			Sub.HCloseType = false; //关闭类型
			//oItemSub.HRemark = ""; //备注
			Sub.HSourceInterID = 0; // 源单主内码
			Sub.HSourceEntryID = 0; //源单子内码
			//oItemSub.HSourceBillNo = ""; //源单单号
			//oItemSub.HSourceBillType = ""; //源单类型
			Sub.HRelationQty = 0; //关联数量
			//oItemSub.HRelationMoney = 0; //关联金额
			//HMaterID = "";//配件代码
			//HUnitID = "";//单位代码
			@@ -2532,7 +2570,7 @@
			//HQtyMust = "";//单位用量
			//HRemark = "";//备注

			oBill.DetailColl.Add(oItemSub);
			oBill.DetailColl.Add(Sub);

			}
			//保存
			@@ -2576,7 +2614,6 @@
			}
			#endregion


			#region[模具保养记录表编辑时获取表头数据]
			[Route("Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai")]
			[HttpGet]
			@@ -2585,12 +2622,13 @@
			if (string.IsNullOrEmpty(HID))
			return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldMaintainBillList where hmainid= " + HID + " ", "h_v_Sc_MouldMaintainBillList");
			var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldMaintain where hmainid= " + HID + " ", "h_v_Sc_MouldMaintain");
			if (dataSet == null \|\| dataSet.Tables[0].Rows.Count == 0)
			return new ApiResult<DataSet> { code = -1, msg = "不存在保养记录表" };
			return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
			}
			#endregion

			#region[模具保养记录表编辑时获取表题数据]
			[Route("Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetai")]
			[HttpGet]
			@@ -2630,13 +2668,56 @@
			}
			#endregion

			#region[模具保养记录表编辑时获取表体数据新(保养项列表、配件项列表)]
			[Route("Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew")]
			[HttpGet]
			public object Sc_MouldMaintainBillListProjectDetaiNew(string HInterID)
			{

			DataSet ds,ds1;
			List<object> list = new List<object>();
			string Swhere = "";
			try
			{
			if (HInterID != "" \|\| HInterID != null)
			{
			Swhere = " and hmainid='" + HInterID + "'";
			}
			else
			{
			Swhere = HInterID;
			}
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//获取保养项目编辑数据
			string sql = "select HMaintainItemID, 保养项目代码 HMaintainItemNumber,保养项目名称 HMaintainItem,保养部位 HMaintainPart,具体要求 HClaim,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName,表体备注 HRemark from h_v_Sc_MouldMaintainBillListItem where 1 = 1 " + Swhere + "";
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainBillListItem");
			//获取配件项目编辑数据
			string sql1 = "select HMaterID, 配件代码 HMaterNumber,配件名称 HMaterName,规格型号 HMaterSpec,HUnitID,单位代码 HUnitNumber,单位名称 HUnitName,实际用量 HQty,标准用量 HQtyMust,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName,表体备注 HRemark from h_v_Sc_MouldMaintainBillList where 1 = 1 " + Swhere + "";
			ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainBillList");
			list.Add(ds.Tables[0]);
			list.Add(ds1.Tables[0]);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.list = list;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			}
			return objJsonResult;
			}
			#endregion

			#region [模具保养记录表删除功能]
			/// <summary>
			/// 模具维修单删除功能
			/// </summary>
			/// <returns></returns>
			[Route("Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill")]
			/// <summary>
			/// 模具维修单删除功能
			/// </summary>
			/// <returns></returns>
			[Route("Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill")]
			[HttpGet]
			public object DeltetSc_MouldMaintainBill(string HInterID)
			{
			@@ -2711,8 +2792,8 @@
			}
			#endregion


			#endregion

			#region 模具点检记录表

			#region 模具点检记录表保存/编辑
			@@ -2874,7 +2955,7 @@
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sqlWhere == null \|\| sqlWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select HDotCheckItem,HDotCheckPart,HClaim,HRemark,HManagerID from Sc_MouldDotCheckBillSub", "Sc_MouldMaintainBillSub");
			ds = oCN.RunProcReturn("select 点检项目 HDotCheckItem,点检部位 HDotCheckPart,具体要求 HClaim,表体备注 HRemark,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName from h_v_Sc_MouldDotCheckBillList", "h_v_Sc_MouldDotCheckBillList");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			@@ -2882,9 +2963,9 @@
			}
			else
			{
			string sql1 = "select HDotCheckItem,HDotCheckPart,HClaim,HRemark,HManagerID from Sc_MouldDotCheckBillSub where 1 = 1 ";
			string sql1 = "select 点检项目 HDotCheckItem,点检部位 HDotCheckPart,具体要求 HClaim,表体备注 HRemark,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName from h_v_Sc_MouldDotCheckBillList where 1 = 1 ";
			string sql = sql1 + sqlWhere;
			ds = oCN.RunProcReturn(sql, "Sc_MouldDotCheckBillSub");
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckBillList");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			@@ -2901,7 +2982,6 @@
			return objJsonResult;
			}
			#endregion


			#region [模具点检记录表删除功能]
			/// <summary>
			@@ -2985,6 +3065,7 @@


			#endregion

			#region 模具点检计划表

			#region 模具点检计划表保存/编辑