From 62c7287e0ca2c548e6ab8c2a2f4e676042ba8519 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 27 十一月 2023 14:03:47 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs index 1d99e51..54dbcbe 100644 --- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs +++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs @@ -355,6 +355,45 @@ } #endregion + #region[璁惧鐐规璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁--鐐规璁″垝] + [Route("Sb_EquipDotCheckPlanBill/GetPlanList")] + [HttpGet] + public object GetPlanList(string sqlWhere) + { + DataSet ds; + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sqlWhere == null || sqlWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_Sb_EquipDotCheckPlanList", "h_v_Sb_EquipDotCheckPlanList"); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + } + else + { + string sql1 = "select * from h_v_Sb_EquipDotCheckPlanList where 1 = 1 "; + string sql = sql1 + sqlWhere; + ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckPlanList"); + objJsonResult.code = "0"; + objJsonResult.count = 1; + 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_EquipDotCheckPlanBill/CheckSb_EquipDotCheckPlanBill")] [HttpGet] @@ -395,6 +434,8 @@ objJsonResult.data = null; return objJsonResult; } + //鑷姩鐢熸垚鐐规璁″垝鍗� + oCN.RunProc("exec h_p_Sb_EquipDotCheckPlan_Auto " + HInterID); } else { -- Gitblit v1.9.1