1.移出班组功能，单独关联人员 2.用户清单取消指定班组 3.生产开报工增加扫码后选择设备 4.用户清单导入取消班组 5.erp订单查询、订单下达 ...

yl

2023-08-07 48aa43a04f8d8a0964d9d8a206e329f400fd5b89

 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,10 +237,17 @@



        #region[安灯系统/自定义安灯呼叫类型查询]
        public static ToMessage AnDengTypeSearch(int startNum, int endNum, string prop, string order)
        #region[安灯系统/车间查询]
        public static ToMessage AnDengShopSearch(string stu_torgcode,string description)
        {
            return BasicSettingDAL.AnDengTypeSearch(startNum,endNum,prop,order);
            return BasicSettingDAL.AnDengShopSearch(stu_torgcode, description);
        }
        #endregion

        #region[安灯系统/自定义安灯呼叫类型查询]
        public static ToMessage AnDengTypeSearch()
        {
            return BasicSettingDAL.AnDengTypeSearch();
        }
        #endregion

@@ -285,5 +299,15 @@
            return BasicSettingDAL.AnDengResponUserDeleteSeave(id, ando_cogfigid);
        }
        #endregion




        #region[通过车间编码查找设备信息]
        public static ToMessage WhkspIsEqpSearch(string wkshpcode)
        {
            return BasicSettingDAL.WhkspIsEqpSearch(wkshpcode);
        }
        #endregion
    }
}