From 9c634fd767aec36ef97c3a814bf7a29c67d20ee1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 29 三月 2024 10:57:35 +0800
Subject: [PATCH] 修改单据重复显示问题，增加工单源单id关联

---
 VueWebApi/DLL/BLL/BasicSettingBLL.cs |   70 +++++++++++++++++++++--------------
 1 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/VueWebApi/DLL/BLL/BasicSettingBLL.cs b/VueWebApi/DLL/BLL/BasicSettingBLL.cs
index 85222f8..b5ce3c0 100644
--- a/VueWebApi/DLL/BLL/BasicSettingBLL.cs
+++ b/VueWebApi/DLL/BLL/BasicSettingBLL.cs
@@ -12,9 +12,9 @@
     public class BasicSettingBLL
     {
         #region [缁勭粐鏋舵瀯鏁版嵁鏌ヨ]
-        public static ToMessage OrganizationSearch(string orgCode, string orgName, string orgType, string userName, int startNum, int endNum, string prop, string order)
+        public static ToMessage OrganizationSearch(string stu_torgcode,string description, string orgCode, string orgName, string orgType, string userName, int startNum, int endNum, string prop, string order)
         {
-            return BasicSettingDAL.OrganizationSearch(orgCode, orgName, orgType, userName, startNum, endNum, prop, order);
+            return BasicSettingDAL.OrganizationSearch(stu_torgcode, description, orgCode, orgName, orgType, userName, startNum, endNum, prop, order);
         }
         #endregion
 
@@ -33,9 +33,9 @@
         #endregion
 
         #region [缁勭粐鏋舵瀯鍒犻櫎]
-        public static ToMessage DeleteOrganization(int orgid)
+        public static ToMessage DeleteOrganization(int orgid,string orgcode)
         {
-            return BasicSettingDAL.DeleteOrganization(orgid);
+            return BasicSettingDAL.DeleteOrganization(orgid, orgcode);
         }
         #endregion
 
@@ -43,23 +43,23 @@
 
 
         #region[鐢ㄦ埛娓呭崟鏁版嵁鏌ヨ]
-        public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
+        public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg,string description, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
         {
-            return BasicSettingDAL.UserSearch(UserCode, UserName, StuOrg, wagetype, Enable, startNum, endNum, prop, order);
+            return BasicSettingDAL.UserSearch(UserCode, UserName, StuOrg, description, wagetype, Enable, startNum, endNum, prop, order);
         }
         #endregion
 
         #region [鐢ㄦ埛鎵�灞炵粍缁嘳
-        public static ToMessage UserOrganization()
+        public static ToMessage UserOrganization(string stu_torgcode,string description)
         {
-            return BasicSettingDAL.UserOrganization();
+            return BasicSettingDAL.UserOrganization(stu_torgcode, description);
         }
         #endregion
 
         #region[鐢ㄦ埛鎵�灞炵彮缁刔
-        public static ToMessage UserGroup()
+        public static ToMessage UserGroup(string stu_torgcode,string description)
         {
-            return BasicSettingDAL.UserGroup();
+            return BasicSettingDAL.UserGroup(stu_torgcode, description);
         }
         #endregion
 
@@ -78,16 +78,16 @@
         #endregion
 
         #region[鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊鏌ヨ]
-        public static ToMessage UserAssociationRole(string usercode)
+        public static ToMessage UserAssociationRole(string usercode,string stu_torgcode,string description)
         {
-            return BasicSettingDAL.UserAssociationRole(usercode);
+            return BasicSettingDAL.UserAssociationRole(usercode, stu_torgcode, description);
         }
         #endregion
 
         #region[鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊淇濆瓨]
-        public static ToMessage SaveUserAssoctRole(string usercode, List<RoleUserSubmit> json)
+        public static ToMessage SaveUserAssoctRole(string usercode,string stu_torgcode,string description, List<RoleUserSubmit> json)
         {
-            return BasicSettingDAL.SaveUserAssoctRole(usercode, json);
+            return BasicSettingDAL.SaveUserAssoctRole(usercode, stu_torgcode, description, json);
         }
         #endregion
 
@@ -100,16 +100,16 @@
 
 
         #region[鐢ㄦ埛缁勫垪琛ㄦ煡璇
-        public static ToMessage UserGroupSearch(int startNum, int endNum, string prop, string order)
+        public static ToMessage UserGroupSearch(string groupcode, string groupname,string stu_torgcode,string description,int startNum, int endNum, string prop, string order)
         {
-            return BasicSettingDAL.UserGroupSearch(startNum, endNum, prop, order);
+            return BasicSettingDAL.UserGroupSearch(groupcode, groupname,stu_torgcode, description,startNum, endNum, prop, order);
         }
         #endregion
 
         #region[鐢ㄦ埛缁勬柊澧瀅
-        public static ToMessage UserGroupAdd(List<StepDefect> json,string username)
+        public static ToMessage UserGroupAdd(string type, List<GroupUser> json,string username)
         {
-            return BasicSettingDAL.UserGroupAdd(json,username);
+            return BasicSettingDAL.UserGroupAdd(type,json, username);
         }
         #endregion
 
@@ -120,11 +120,18 @@
         }
         #endregion
 
+        #region[鐢ㄦ埛缁勬煡鐪嬪叧鑱斾汉鍛榏
+        public static ToMessage GroupUserProject(string groupcode)
+        {
+            return BasicSettingDAL.GroupUserProject(groupcode);
+        }
+        #endregion
+
 
         #region[瑙掕壊绫诲瀷鏌ヨ]
-        public static ToMessage RoleTypeSearch(int startNum, int endNum, string prop, string order)
+        public static ToMessage RoleTypeSearch(string stu_torgcode, string description,int startNum, int endNum, string prop, string order)
         {
-            return BasicSettingDAL.RoleTypeSearch(startNum, endNum, prop, order);
+            return BasicSettingDAL.RoleTypeSearch(stu_torgcode, description, startNum, endNum, prop, order);
         }
         #endregion
 
@@ -143,16 +150,16 @@
         #endregion
 
         #region[瑙掕壊绫诲瀷涓嬫媺鎺ュ彛]
-        public static ToMessage RoleTypeSelect()
+        public static ToMessage RoleTypeSelect(string stu_torgcode,string description)
         {
-            return BasicSettingDAL.RoleTypeSelect();
+            return BasicSettingDAL.RoleTypeSelect(stu_torgcode, description);
         }
         #endregion
 
         #region[瑙掕壊娓呭崟鏌ヨ]
-        public static ToMessage RoleSearch(string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
+        public static ToMessage RoleSearch(string stu_torgcode,string description,string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
         {
-            return BasicSettingDAL.RoleSearch(RoleCode, RoleName, RoleTypeCode, CreateUser, startNum, endNum, prop, order);
+            return BasicSettingDAL.RoleSearch(stu_torgcode, description,RoleCode, RoleName, RoleTypeCode, CreateUser, startNum, endNum, prop, order);
         }
         #endregion
 
@@ -164,9 +171,9 @@
         #endregion
 
         #region[瑙掕壊娓呭崟鏂板缂栬緫]
-        public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName, string RoleTypeCode, string description, string Usercode, string OperType)
+        public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName,string stu_torgcode, string RoleTypeCode, string description, string Usercode, string OperType)
         {
-            return BasicSettingDAL.AddUpdateRole(RoleId, RoleCode, RoleName, RoleTypeCode, description, Usercode, OperType);
+            return BasicSettingDAL.AddUpdateRole(RoleId, RoleCode, RoleName, stu_torgcode, RoleTypeCode, description, Usercode, OperType);
         }
         #endregion
 
@@ -215,9 +222,9 @@
         #endregion
 
         #region[寰�鏉ュ崟浣嶆柊澧炵紪杈慮
-        public static ToMessage AddUpdateCurrentUnit(string unitid, string unitcode, string unitname, string mtypecode, string btypecode, string htypecode, string person, string contact, string description, string usercode, string OperType)
+        public static ToMessage AddUpdateCurrentUnit(string unitid, string unitcode, string unitname, string typecode, string person, string contact, string description, string usercode, string OperType)
         {
-            return BasicSettingDAL.AddUpdateCurrentUnit(unitid, unitcode, unitname, mtypecode, btypecode, htypecode, person, contact, description, usercode, OperType);
+            return BasicSettingDAL.AddUpdateCurrentUnit(unitid, unitcode, unitname,typecode, person, contact, description, usercode, OperType);
         }
         #endregion
 
@@ -230,6 +237,13 @@
 
 
 
+        #region[瀹夌伅绯荤粺/杞﹂棿鏌ヨ]
+        public static ToMessage AnDengShopSearch(string stu_torgcode,string description)
+        {
+            return BasicSettingDAL.AnDengShopSearch(stu_torgcode, description);
+        }
+        #endregion
+
         #region[瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫煡璇
         public static ToMessage AnDengTypeSearch()
         {

--
Gitblit v1.9.3