From eddeff0b81ea84c3b66ab1b8b7943146f953b0e1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 13 二月 2023 17:17:05 +0800
Subject: [PATCH] 1.往来单位同步修改(客户、供应商、客户/供应商) 2.往来单位新增/编修 :单位属性改为(客户、供应商、客户/供应商) 3.生产开报工PC端、APP端:外协工序时外协供应商(供应商、客户/供应商) 4.委外工序明细报表:(供应商、客户/供应商) 5.工序定义关联工作站(供应商、客户/供应商) 6.综合看板右上角字段(供应商、客户/供应商) 7.采购订单看板(供应商、客户/供应商) 8.采购订单关闭接口开发

---
 VueWebApi/DLL/BLL/BasicSettingBLL.cs |  147 +++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 129 insertions(+), 18 deletions(-)

diff --git a/VueWebApi/DLL/BLL/BasicSettingBLL.cs b/VueWebApi/DLL/BLL/BasicSettingBLL.cs
index f38d30e..bd73b48 100644
--- a/VueWebApi/DLL/BLL/BasicSettingBLL.cs
+++ b/VueWebApi/DLL/BLL/BasicSettingBLL.cs
@@ -1,5 +1,6 @@
 锘縰sing System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Web;
 using VueWebApi.DLL.DAL;
@@ -11,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 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(orgCode, orgName, orgType, userName, startNum, endNum, prop, order);
         }
         #endregion
 
@@ -25,9 +26,9 @@
         #endregion
 
         #region [缁勭粐鏋舵瀯鏂板缂栬緫]
-        public static ToMessage AddUpdateOrganization(string organType, string organCode, string organName,string Operator, int supUnit, string operType)
+        public static ToMessage AddUpdateOrganization(string organType, string organCode, string organName, string Operator, int supUnit, string RightCode, string numvalue, string operType)
         {
-            return BasicSettingDAL.AddUpdateOrganization(organType, organCode, organName, Operator, supUnit,operType);
+            return BasicSettingDAL.AddUpdateOrganization(organType, organCode, organName, Operator, supUnit, RightCode, numvalue, operType);
         }
         #endregion
 
@@ -42,7 +43,7 @@
 
 
         #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 wagetype, string Enable, int startNum, int endNum, string prop, string order)
         {
             return BasicSettingDAL.UserSearch(UserCode, UserName, StuOrg, wagetype, Enable, startNum, endNum, prop, order);
         }
@@ -55,10 +56,17 @@
         }
         #endregion
 
-        #region[鐢ㄦ埛娓呭崟鏂板缂栬緫]
-        public static ToMessage AddUpdateUser(string UserId, string UserCode, string UserName,string Password, string Enable,string LoginOrg,string wagetype, string Mobile,string Email, string Operator, string OperType)
+        #region[鐢ㄦ埛鎵�灞炵彮缁刔
+        public static ToMessage UserGroup()
         {
-            return BasicSettingDAL.AddUpdateUser(UserId, UserCode, UserName, Password, Enable, LoginOrg, wagetype, Mobile, Email, Operator, OperType);
+            return BasicSettingDAL.UserGroup();
+        }
+        #endregion
+
+        #region[鐢ㄦ埛娓呭崟鏂板缂栬緫]
+        public static ToMessage AddUpdateUser(string UserId, string UserCode, string UserName, string Password, string Enable, string LoginOrg,string groupcode, string wagetype, string Mobile, string Email, string Operator, string OperType)
+        {
+            return BasicSettingDAL.AddUpdateUser(UserId, UserCode, UserName, Password, Enable, LoginOrg, groupcode, wagetype, Mobile, Email, Operator, OperType);
         }
         #endregion
 
@@ -79,7 +87,7 @@
         #region[鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊淇濆瓨]
         public static ToMessage SaveUserAssoctRole(string usercode, List<RoleUserSubmit> json)
         {
-            return BasicSettingDAL.SaveUserAssoctRole(usercode,json);
+            return BasicSettingDAL.SaveUserAssoctRole(usercode, json);
         }
         #endregion
 
@@ -90,6 +98,27 @@
         }
         #endregion
 
+
+        #region[鐢ㄦ埛缁勫垪琛ㄦ煡璇
+        public static ToMessage UserGroupSearch(int startNum, int endNum, string prop, string order)
+        {
+            return BasicSettingDAL.UserGroupSearch(startNum, endNum, prop, order);
+        }
+        #endregion
+
+        #region[鐢ㄦ埛缁勬柊澧瀅
+        public static ToMessage UserGroupAdd(List<StepDefect> json,string username)
+        {
+            return BasicSettingDAL.UserGroupAdd(json,username);
+        }
+        #endregion
+
+        #region[鐢ㄦ埛缁勫垹闄
+        public static ToMessage UserGroupDelete(string UserGrupCode)
+        {
+            return BasicSettingDAL.UserGroupDelete(UserGrupCode);
+        }
+        #endregion
 
 
         #region[瑙掕壊绫诲瀷鏌ヨ]
@@ -113,6 +142,13 @@
         }
         #endregion
 
+        #region[瑙掕壊绫诲瀷涓嬫媺鎺ュ彛]
+        public static ToMessage RoleTypeSelect()
+        {
+            return BasicSettingDAL.RoleTypeSelect();
+        }
+        #endregion
+
         #region[瑙掕壊娓呭崟鏌ヨ]
         public static ToMessage RoleSearch(string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
         {
@@ -120,8 +156,15 @@
         }
         #endregion
 
+        #region[瑙掕壊娓呭崟鏌ヨ1]
+        public static ToMessage RoleAssociationUserTwo(string rolecode)
+        {
+            return BasicSettingDAL.RoleAssociationUserTwo(rolecode);
+        }
+        #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 RoleTypeCode, string description, string Usercode, string OperType)
         {
             return BasicSettingDAL.AddUpdateRole(RoleId, RoleCode, RoleName, RoleTypeCode, description, Usercode, OperType);
         }
@@ -137,7 +180,7 @@
         #region[瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛鏌ヨ]
         public static ToMessage RoleAssociationUser(string rolecode, string usercode, string username, string orgcode, string isrole, int startNum, int endNum, string prop, string order)
         {
-            return BasicSettingDAL.RoleAssociationUser(rolecode,usercode,username,orgcode,isrole, startNum,endNum,prop,order);
+            return BasicSettingDAL.RoleAssociationUser(rolecode, usercode, username, orgcode, isrole, startNum, endNum, prop, order);
         }
         #endregion
 
@@ -149,14 +192,14 @@
         #endregion
 
         #region[瑙掕壊娓呭崟鍏宠仈鍔熻兘鏌ヨ]
-        public static ToMessage RoleAssociationRight(string rolecode,string type)
+        public static ToMessage RoleAssociationRight(string rolecode, string type)
         {
             return BasicSettingDAL.RoleAssociationRight(rolecode, type);
         }
         #endregion
 
         #region [瑙掕壊娓呭崟鍏宠仈鍔熻兘淇濆瓨]
-        public static ToMessage SaveUserAssoctRight(string rolecode,string usercode, List<TreeDM> json)
+        public static ToMessage SaveUserAssoctRight(string rolecode, string usercode, List<TreeDM> json)
         {
             return BasicSettingDAL.SaveUserAssoctRight(rolecode, usercode, json);
         }
@@ -167,21 +210,89 @@
         #region[寰�鏉ュ崟浣嶆煡璇
         public static ToMessage CurrentUnitSearch(string cuntUnitCode, string cuntUnitName, string unitAttr, string createUser, int startNum, int endNum, string prop, string order)
         {
-            return BasicSettingDAL.CurrentUnitSearch(cuntUnitCode,cuntUnitName,unitAttr,createUser,startNum, endNum,prop,order);
+            return BasicSettingDAL.CurrentUnitSearch(cuntUnitCode, cuntUnitName, unitAttr, createUser, startNum, endNum, prop, order);
         }
         #endregion
 
         #region[寰�鏉ュ崟浣嶆柊澧炵紪杈慮
-        public static ToMessage AddUpdateCurrentUnit(string unitid, string unitcode, string unitname, string unitattr, 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, unitattr, person, contact, description, usercode, OperType);
+            return BasicSettingDAL.AddUpdateCurrentUnit(unitid, unitcode, unitname,typecode, person, contact, description, usercode, OperType);
         }
         #endregion
 
         #region[寰�鏉ュ崟浣嶅垹闄
-        public static ToMessage DeleteCurrentUnit(string unitid)
+        public static ToMessage DeleteCurrentUnit(string unitcode)
         {
-            return BasicSettingDAL.DeleteCurrentUnit(unitid);
+            return BasicSettingDAL.DeleteCurrentUnit(unitcode);
+        }
+        #endregion
+
+
+
+        #region[瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫煡璇
+        public static ToMessage AnDengTypeSearch()
+        {
+            return BasicSettingDAL.AnDengTypeSearch();
+        }
+        #endregion
+
+        #region[瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫柊澧瀅
+        public static ToMessage AddUpdateAnDengType(List<ObjectData> json, string username)
+        {
+            return BasicSettingDAL.AddUpdateAnDengType(json, username);
+        }
+        #endregion
+
+        #region[瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬪垹闄
+        public static ToMessage DeleteAnDengType(string andengtypecode)
+        {
+            return BasicSettingDAL.DeleteAnDengType(andengtypecode);
+        }
+        #endregion
+
+        #region[瀹夌伅绯荤粺/鏌ヨ缁戝畾鐨勫搷搴斾汉鍛榏
+        public static ToMessage AnDengResponUserSearch(string wkshopcode, string calltypecode)
+        {
+            return BasicSettingDAL.AnDengResponUserSearch(wkshopcode,calltypecode);
+        }
+        #endregion
+
+        #region[瀹夌伅绯荤粺/鏂板鍝嶅簲浜哄憳鏌ヨ宸茬粦瀹氱殑鍝嶅簲浜哄憳]
+        public static ToMessage AnDengDialogResponUserSearch(string wkshopcode, string calltypecode)
+        {
+            return BasicSettingDAL.AnDengDialogResponUserSearch(wkshopcode, calltypecode);
+        }
+        #endregion
+
+        #region[瀹夌伅绯荤粺/鏂板鍝嶅簲浜哄憳鎻愪氦]
+        public static ToMessage AnDengDigoResponUserSeave(string wkshopcode, string calltypecode,string enable, string usercode, DataTable json)
+        {
+            return BasicSettingDAL.AnDengDigoResponUserSeave(wkshopcode, calltypecode, enable, usercode, json);
+        }
+        #endregion
+
+        #region[瀹夌伅绯荤粺/鍝嶅簲浜哄憳鍏佽鍏抽棴]
+        public static ToMessage AnDengResponUserCloseSeave(string wkshopcode, string calltypecode, string enable, string usercode)
+        {
+            return BasicSettingDAL.AnDengResponUserCloseSeave(wkshopcode, calltypecode, enable, usercode);
+        }
+        #endregion
+
+        #region[瀹夌伅绯荤粺/鍝嶅簲浜哄憳鍒犻櫎]
+        public static ToMessage AnDengResponUserDeleteSeave(string id,string ando_cogfigid)
+        {
+            return BasicSettingDAL.AnDengResponUserDeleteSeave(id, ando_cogfigid);
+        }
+        #endregion
+
+
+
+
+        #region[閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅]
+        public static ToMessage WhkspIsEqpSearch(string wkshpcode)
+        {
+            return BasicSettingDAL.WhkspIsEqpSearch(wkshpcode);
         }
         #endregion
     }

--
Gitblit v1.9.3