From 2bdb683c8725fcbb7ea2e6d73a37f3d7a3b55573 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 09 六月 2021 18:56:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
index 65c6139..a35233a 100644
--- a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -53,7 +53,17 @@
#region 璁惧缁翠慨宸ュ崟鍒楄〃sql璇彞
public static DataSet Sb_EquipRepairWorkBill_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairWorkBillList ", "h_v_Sb_EquipRepairWorkBillList");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairWorkBillList "+sWhere, "h_v_Sb_EquipRepairWorkBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipRepairWorkBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipRepairWorkBillList");
+ }
+
}
#endregion
@@ -93,7 +103,17 @@
#region 璁惧缁翠慨楠屾敹鍗曞垪琛╯ql璇彞
public static DataSet Sb_EquipRepairCheckWorkBill_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList", "h_v_Sb_EquipRepairCheckBillList");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList" + sWhere, "h_v_Sb_EquipRepairCheckBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipRepairCheckBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipRepairCheckBillList");
+ }
+
}
#endregion
@@ -133,7 +153,16 @@
#region 璁惧鏁呴殰鐧昏鍗曞垪琛╯ql璇彞
public static DataSet Sb_EqpConkBookBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipConkBookBillList", "h_v_Sb_EquipConkBookBillList");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipConkBookBillList" + sWhere, "h_v_Sb_EquipConkBookBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipConkBookBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipConkBookBillList");
+ }
}
#endregion
--
Gitblit v1.9.1