From 7a0d98456b4ecaf1867cd62ecb7c8169ec15d042 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 22 六月 2022 18:20:34 +0800
Subject: [PATCH] 设备清单查询、新增、编辑、删除接口开发 设备类型(新增、删除)、设备组(新增、删除)接口开发 仓库定义(新增、编辑、删除)、库位定义(新增、编辑、删除) 存货类型、存货档案接口开发

---
 VueWebApi/Controllers/BasicSettingController.cs |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/VueWebApi/Controllers/BasicSettingController.cs b/VueWebApi/Controllers/BasicSettingController.cs
index e466f9c..e796224 100644
--- a/VueWebApi/Controllers/BasicSettingController.cs
+++ b/VueWebApi/Controllers/BasicSettingController.cs
@@ -281,9 +281,9 @@
 
 
 
-        #region[瑙掕壊绫诲瀷鏌ヨ]
+        #region[瑙掕壊绫诲瀷鍒楄〃鏌ヨ]
         /// <summary>
-        /// 瑙掕壊绫诲瀷鏌ヨ
+        /// 瑙掕壊绫诲瀷鍒楄〃鏌ヨ
         /// </summary>
         /// <param name="page">椤电爜</param>
         /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
@@ -327,6 +327,28 @@
         public HttpResponseMessage RoleTypeDelete(string RoleTypeCode)
         {
             mes = BasicSettingBLL.RoleTypeDelete(RoleTypeCode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[瑙掕壊绫诲瀷涓嬫媺鎺ュ彛]
+        /// <summary>
+        /// 瑙掕壊绫诲瀷涓嬫媺鎺ュ彛
+        /// </summary>
+        /// <returns></returns>
+        [Route(template: "RoleTypeSelect")]
+        [HttpGet]
+        public HttpResponseMessage RoleTypeSelect()
+        {
+            try
+            {
+                mes = BasicSettingBLL.RoleTypeSelect();
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.Message = e.Message;
+            }
             return TJson.toJson(mes);
         }
         #endregion
@@ -461,7 +483,7 @@
         /// <returns></returns>
         [Route(template: "RoleAssociationRight")]
         [HttpGet]
-        public HttpResponseMessage RoleAssociationRight(string rolecode,string type)
+        public HttpResponseMessage RoleAssociationRight(string rolecode,string type=null)
         {
             mes = BasicSettingBLL.RoleAssociationRight(rolecode,type);
             return TJson.toJson(mes);
@@ -524,13 +546,15 @@
             string unitid = obj["id"].ToString();    //寰�鏉ュ崟浣峣d(涓婚敭)
             string unitcode = obj["unitcode"].ToString(); //寰�鏉ュ崟浣嶇紪鐮佺紪鐮�
             string unitname = obj["unitname"].ToString(); //寰�鏉ュ崟浣嶅悕绉�
-            string unitattr = obj["unitattr"].ToString(); //寰�鏉ュ崟灞炴��
+            string mtypecode = obj["mtypecode"].ToString(); //澶栬喘渚涙柟缂栫爜
+            string btypecode = obj["btypecode"].ToString(); //澶栧崗渚涙柟缂栫爜
+            string htypecode = obj["htypecode"].ToString(); //瀹㈡埛缂栫爜
             string person = obj["person"].ToString(); //鑱旂郴浜�
             string contact = obj["contact"].ToString(); //鑱旂郴鏂瑰紡
             string description = obj["description"].ToString(); //琛ュ厖鎻忚堪
-            var usercode = HttpContext.Current.Request.Cookies["navTabId"].Value.ToString();
+            var usercode = "Admin";//HttpContext.Current.Request.Cookies["admin"].Value.ToString();
             string OperType = obj["OperType"].ToString();  //鎿嶄綔绫诲瀷
-            mes = BasicSettingBLL.AddUpdateCurrentUnit(unitid, unitcode, unitname, unitattr, person, contact, description, usercode, OperType);
+            mes = BasicSettingBLL.AddUpdateCurrentUnit(unitid, unitcode, unitname, mtypecode, btypecode,htypecode, person, contact, description, usercode, OperType);
             return TJson.toJson(mes);
         }
         #endregion

--
Gitblit v1.9.3