From 54cf93766639d96ed2bdd101440d2ce9f2538e7e Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 12 九月 2023 18:54:44 +0800
Subject: [PATCH] 正清和质量看板接口功能 修改存货查询功能

---
 VueWebApi/Controllers/BasicSettingController.cs |   37 ++++++++++++++++++++++++++++---------
 1 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/VueWebApi/Controllers/BasicSettingController.cs b/VueWebApi/Controllers/BasicSettingController.cs
index 2d860d2..5ad62a2 100644
--- a/VueWebApi/Controllers/BasicSettingController.cs
+++ b/VueWebApi/Controllers/BasicSettingController.cs
@@ -94,12 +94,13 @@
         /// 缁勭粐鏋舵瀯鍒犻櫎
         /// </summary>
         /// <param name="orgid">缁勭粐id</param>
+        /// <param name="orgcode">缁勭粐缂栫爜</param>
         /// <returns></returns>
         [Route(template: "DeleteOrganization")]
         [HttpPost]
-        public HttpResponseMessage DeleteOrganization(int orgid)
+        public HttpResponseMessage DeleteOrganization(int orgid,string orgcode)
         {
-            mes = BasicSettingBLL.DeleteOrganization(orgid);
+            mes = BasicSettingBLL.DeleteOrganization(orgid, orgcode);
             return TJson.toJson(mes);
         }
         #endregion
@@ -313,6 +314,10 @@
         /// <summary>
         /// 鐢ㄦ埛缁勫垪琛ㄦ煡璇�
         /// </summary>
+        /// <param name="groupcode">鐝粍缂栫爜</param>
+        /// <param name="groupname">鐝粍鍚嶇О</param>
+        /// <param name="stu_torgcode">鎵�灞炵粍缁�</param>
+        /// <param name="description">鎵�灞炵粍缁囩被鍨�</param>
         /// <param name="page">椤电爜</param>
         /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
         /// <param name="prop">鎺掑簭瀛楁</param>
@@ -320,29 +325,28 @@
         /// <returns></returns>
         [Route(template: "UserGroupSearch")]
         [HttpGet]
-        public HttpResponseMessage UserGroupSearch(int page = 0, int rows = 0, string prop = null, string order = null)
+        public HttpResponseMessage UserGroupSearch(string groupcode, string groupname,string stu_torgcode=null,string description=null,  int page = 0, int rows = 0, string prop = null, string order = null)
         {
-            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
-            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
             int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
             int endNum = rows * page;   //缁撴潫璁板綍 rowNum
-            mes = BasicSettingBLL.UserGroupSearch(stu_torgcode, description, startNum, endNum, prop, order);
+            mes = BasicSettingBLL.UserGroupSearch(groupcode, groupname, stu_torgcode, description, startNum, endNum, prop, order);
             return TJson.toJson(mes);
         }
         #endregion
 
-        #region[鐢ㄦ埛缁勬柊澧瀅
+        #region[鐢ㄦ埛缁勬柊澧炪�佷慨鏀筣
         /// <summary>
         /// 鐢ㄦ埛缁勬柊澧�
         /// </summary>
+        ///  <param name="type">鎻愪氦绫诲瀷(Add/Update)</param>
         /// <param name="json">鐢ㄦ埛缁勬柊澧炴彁浜ゆ暟鎹�</param>
         /// <returns></returns>
         [Route(template: "UserGroupAdd")]
         [HttpPost]
-        public HttpResponseMessage UserGroupAdd(List<StepDefect> json)
+        public HttpResponseMessage UserGroupAdd(string type,List<GroupUser> json)
         {
             var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
-            mes = BasicSettingBLL.UserGroupAdd(json, username);
+            mes = BasicSettingBLL.UserGroupAdd(type,json, username);
             return TJson.toJson(mes);
         }
         #endregion
@@ -362,6 +366,21 @@
         }
         #endregion
 
+        #region[鐢ㄦ埛缁勬煡鐪嬪叧鑱斾汉鍛榏
+        /// <summary>
+        /// 鐢ㄦ埛缁勬煡鐪嬪叧鑱斾汉鍛�
+        /// </summary>
+        /// <param name="groupcode">鐝粍缂栫爜</param>
+        /// <returns></returns>
+        [Route(template: "GroupUserProject")]
+        [HttpGet]
+        public HttpResponseMessage GroupUserProject(string groupcode)
+        {
+            mes = BasicSettingBLL.GroupUserProject(groupcode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
 
 
         #region[瑙掕壊绫诲瀷鍒楄〃鏌ヨ]

--
Gitblit v1.9.3