From c022f537f5b80dbe5294c0ea40e2d7933d4f4ce4 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 15 十一月 2023 17:57:38 +0800
Subject: [PATCH] 设备

---
 WebAPI/Controllers/WebAPIController.cs |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 6695dfb..ac0aa23 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -4209,6 +4209,12 @@
                     case "WX":
                         HView = "h_v_Sb_EquipRepairCheckBillList";
                         break;
+                    case "GZ":
+                        HView = "h_v_Sb_EquipConkBookBillList";
+                        break;
+                    case "YS":
+                        HView = "h_v_Sb_EquipRepairCheckBillList";
+                        break;
                     default:
                         objjson.code = "0";
                         objjson.count = 0;
@@ -4218,7 +4224,7 @@
                 }
 
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-                string sql = string.Format(@"select * from " + HView + " where 1 = 1 ");
+                string sql = string.Format(@"select * from " + HView + " where 1 = 1 " + sWhere);
                 ds = oCN.RunProcReturn(sql, HView);
                 //娣诲姞鍒楀悕
                 foreach (DataColumn col in ds.Tables[0].Columns)
@@ -4229,9 +4235,9 @@
                 }
                 if (ds == null || ds.Tables[0].Rows.Count <= 0)
                 {
-                    objjson.code = "0";
-                    objjson.count = 0;
-                    objjson.Message = "鑾峰彇澶辫触,鏌ユ棤鏁版嵁" + DBUtility.ClsPub.sErrInfo;
+                    objjson.code = "1";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇澶辫触,鏌ユ棤鏁版嵁";
                     objjson.data = null;
                     objjson.list = columnNameList;
                     return objjson;

--
Gitblit v1.9.1