From 0e10409fd2badcc71ed5a001565f230422373c31 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 10 九月 2024 10:02:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/WebAPIController.cs |   43 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 618f380..1ad140f 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -11330,10 +11330,44 @@
                 return objjson; ;
             }
         }
-
-
-
         #endregion
+
+        /// <summary>
+        /// 鑾峰彇鍩烘湰淇℃伅
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/BaseInfo")]
+        [HttpGet]
+        public object GetBaseInfo()
+        {
+            try
+            {
+                ds = oCN.RunProcReturn("select * from xt_BaseInfo", "xt_BaseInfo");
+                if (ds is null)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }catch(Exception e)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + e.Message;
+                objjson.data = null;
+                return objjson;
+            }
+        }
 
         /// <summary>
         /// 鑾峰彇鑱屽姟鍒楄〃
@@ -13093,6 +13127,9 @@
                     case "YS":
                         HView = "h_v_Sb_EquipRepairCheckBillList";
                         break;
+                    case "QD":
+                        HView = "h_v_Sb_EquipRepairSignBillList";
+                        break;
                     default:
                         objjson.code = "0";
                         objjson.count = 0;

--
Gitblit v1.9.1