From 2e0421bc2278345b45d5b041fff4cce3d6146a46 Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期一, 17 六月 2024 17:13:44 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/WebAPIController.cs | 115 +++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 83 insertions(+), 32 deletions(-) diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs index b0419ce..e2c8636 100644 --- a/WebAPI/Controllers/WebAPIController.cs +++ b/WebAPI/Controllers/WebAPIController.cs @@ -11983,19 +11983,24 @@ List<object> list = new List<object>(); DataSet ds2; DataSet ds1; - string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark - from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID - left join Gy_Maintain m on m.HItemID=t.HMaintainItemID - left join Gy_Employee e on e.HItemID=t.HManagerID - where a.HInterID=" + MouldMaintainRuleID); - string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a - left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID - left join h_v_IF_Material m on b.HMaterID=m.HItemID - left join h_v_IF_Unit u on b.HUnitID=u.HItemID - where a.HInterID=" + MouldMaintainRuleID); - ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//淇濆吇 - ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢 + // string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark + // from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID + // left join Gy_Maintain m on m.HItemID=t.HMaintainItemID + // left join Gy_Employee e on e.HItemID=t.HManagerID + // where a.HInterID=" + MouldMaintainRuleID); + + // string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a + //left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID + // left join h_v_IF_Material m on b.HMaterID=m.HItemID + //left join h_v_IF_Unit u on b.HUnitID=u.HItemID + // where a.HInterID=" + MouldMaintainRuleID); + + string sql1 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub_Item where hmainid=" + MouldMaintainRuleID); + string sql2 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub where hmainid=" + MouldMaintainRuleID); + + ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainRuleBillSub_Item");//淇濆吇 + ds2 = oCN.RunProcReturn(sql2, "h_v_Sc_MouldMaintainRuleBillSub");//閰嶄欢 list.Add(ds1.Tables[0]); list.Add(ds2.Tables[0]); objJsonResult.code = "0"; @@ -12129,19 +12134,22 @@ List<object> list = new List<object>(); DataSet ds2; DataSet ds1; - string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark - from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID - left join Gy_Maintain m on m.HItemID=t.HMaintainItemID - left join Gy_Employee e on e.HItemID=t.HManagerID - where a.HInterID=" + EquipProjectID); - string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a - left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID - left join h_v_IF_Material m on b.HMaterID=m.HItemID - left join h_v_IF_Unit u on b.HUnitID=u.HItemID - where a.HInterID=" + EquipProjectID); + // string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark + // from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID + // left join Gy_Maintain m on m.HItemID=t.HMaintainItemID + // left join Gy_Employee e on e.HItemID=t.HManagerID + // where a.HInterID=" + EquipProjectID); + // string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a + //left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID + // left join h_v_IF_Material m on b.HMaterID=m.HItemID + //left join h_v_IF_Unit u on b.HUnitID=u.HItemID + // where a.HInterID=" + EquipProjectID); - ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//淇濆吇 - ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢 + string sql1 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleBillList where HInterID=" + EquipProjectID); + string sql2 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleSub where hmainid=" + EquipProjectID); + + ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainRuleBillList");//淇濆吇 + ds2 = oCN.RunProcReturn(sql2, "h_v_Sb_EquipMaintainRuleSub");//閰嶄欢 list.Add(ds1.Tables[0]); list.Add(ds2.Tables[0]); objJsonResult.code = "0"; @@ -12495,13 +12503,56 @@ try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); - string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim, - b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain a - left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID - left join Gy_DotCheck c on c.HItemID=b.HDotCheckItemID - left join Gy_Employee e on e.HItemID=b.HManagerID - where a.HInterID=" + HDotCheckRuleInterID); - ds = oCN.RunProcReturn(sql, "Sb_EquipDotCheckRuleBillMain"); + string sql = string.Format(@"select * from h_v_Sb_EquipDotCheckRuleBillList_PDA where HInterID=" + HDotCheckRuleInterID); + ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckRuleBillList_PDA"); + 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> + /// 鏍规嵁璁惧淇濆吇瑙勭▼鏄剧ず璁惧淇濆吇绋嬮」鐩� + /// </summary> + /// <returns></returns> + [Route("Web/GetMaintainItemByMaintainRuleID")] + [HttpGet] + public object GetMaintainItemByMaintainRuleID(int HEquipMaintainRuleInterID) + { + if (HEquipMaintainRuleInterID <= 0) + { + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "璁惧淇濆吇瑙勭▼鏈�夋嫨"; + objjson.data = null; + return objjson; + } + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + string sql = string.Format(@"select * from h_v_Sb_EquipMaintainRuleBillList_PDA where HInterID=" + HEquipMaintainRuleInterID); + ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainRuleBillList_PDA"); if (ds == null || ds.Tables[0].Rows.Count <= 0) { objjson.code = "0"; @@ -12757,7 +12808,7 @@ ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //鏌ヨ褰撳墠鐢ㄦ埛鐨勮嚜瀹氫箟鑿滃崟鏁版嵁 if (ds.Tables[0]==null || ds.Tables[0].Rows.Count == 0) //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁鏈夎缃繃鑷畾涔変俊鎭紝鑻ヨ褰曟暟涓�0锛屽垯娌℃湁璁剧疆杩囷紝鍔犺浇鎵�鏈夌殑鑿滃崟淇℃伅 { - sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition "; + sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID "; ds = oCn.RunProcReturn(sql, "Gy_Menu"); } -- Gitblit v1.9.1