From 32c0daf9a78039004bb6c39d578f7734f13d54b1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 10 十月 2023 10:54:47 +0800
Subject: [PATCH] 1.工单派发校验工价，工价未提前设置或设置部分，如果开关关闭时,不校验是否未设置 或者未设置全，工价复制表中都会写入，没有设置的工价就默认0 如果开关打开就必须要设置工价
---
VueWebApi/DLL/BLL/BasicSettingBLL.cs | 221 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 195 insertions(+), 26 deletions(-)
diff --git a/VueWebApi/DLL/BLL/BasicSettingBLL.cs b/VueWebApi/DLL/BLL/BasicSettingBLL.cs
index d59c5a6..b5ce3c0 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 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
@@ -25,16 +26,16 @@
#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
#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
@@ -42,23 +43,30 @@
#region[鐢ㄦ埛娓呭崟鏁版嵁鏌ヨ]
- public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg, 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, 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(string stu_torgcode,string description)
+ {
+ return BasicSettingDAL.UserGroup(stu_torgcode, description);
}
#endregion
#region[鐢ㄦ埛娓呭崟鏂板缂栬緫]
- public static ToMessage AddUpdateUser(string UserId, string UserCode, string UserName, string Enable,string LoginOrg,string Mobile,string Email, string Operator, string OperType)
+ 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, Enable, LoginOrg, Mobile, Email, Operator, OperType);
+ return BasicSettingDAL.AddUpdateUser(UserId, UserCode, UserName, Password, Enable, LoginOrg, groupcode, wagetype, Mobile, Email, Operator, OperType);
}
#endregion
@@ -70,25 +78,60 @@
#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
+
+ #region[鐢ㄦ埛娓呭崟瀵煎叆]
+ public static ToMessage ImportUserExcel(string username, string filesName)
+ {
+ return BasicSettingDAL.ImportUserExcel(username, filesName);
}
#endregion
+ #region[鐢ㄦ埛缁勫垪琛ㄦ煡璇
+ public static ToMessage UserGroupSearch(string groupcode, string groupname,string stu_torgcode,string description,int startNum, int endNum, string prop, string order)
+ {
+ return BasicSettingDAL.UserGroupSearch(groupcode, groupname,stu_torgcode, description,startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[鐢ㄦ埛缁勬柊澧瀅
+ public static ToMessage UserGroupAdd(string type, List<GroupUser> json,string username)
+ {
+ return BasicSettingDAL.UserGroupAdd(type,json, username);
+ }
+ #endregion
+
+ #region[鐢ㄦ埛缁勫垹闄
+ public static ToMessage UserGroupDelete(string UserGrupCode)
+ {
+ return BasicSettingDAL.UserGroupDelete(UserGrupCode);
+ }
+ #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
@@ -106,17 +149,31 @@
}
#endregion
- #region[瑙掕壊娓呭崟鏌ヨ]
- public static ToMessage RoleSearch(string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
+ #region[瑙掕壊绫诲瀷涓嬫媺鎺ュ彛]
+ public static ToMessage RoleTypeSelect(string stu_torgcode,string description)
{
- return BasicSettingDAL.RoleSearch(RoleCode, RoleName, RoleTypeCode, CreateUser, startNum, endNum, prop, order);
+ return BasicSettingDAL.RoleTypeSelect(stu_torgcode, description);
+ }
+ #endregion
+
+ #region[瑙掕壊娓呭崟鏌ヨ]
+ 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(stu_torgcode, description,RoleCode, RoleName, RoleTypeCode, CreateUser, startNum, endNum, prop, order);
+ }
+ #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 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
@@ -130,14 +187,126 @@
#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
#region[瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛淇濆瓨]
- public static ToMessage SaveRoleAssociationUser(string rolecode, List<ObjectData> json)
+ public static ToMessage SaveRoleAssoctUser(string rolecode, List<ObjectData> json)
{
- return BasicSettingDAL.SaveRoleAssociationUser(rolecode, json);
+ return BasicSettingDAL.SaveRoleAssoctUser(rolecode, json);
+ }
+ #endregion
+
+ #region[瑙掕壊娓呭崟鍏宠仈鍔熻兘鏌ヨ]
+ 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)
+ {
+ return BasicSettingDAL.SaveUserAssoctRight(rolecode, usercode, json);
+ }
+ #endregion
+
+
+
+ #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);
+ }
+ #endregion
+
+ #region[寰�鏉ュ崟浣嶆柊澧炵紪杈慮
+ 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,typecode, person, contact, description, usercode, OperType);
+ }
+ #endregion
+
+ #region[寰�鏉ュ崟浣嶅垹闄
+ public static ToMessage DeleteCurrentUnit(string unitcode)
+ {
+ return BasicSettingDAL.DeleteCurrentUnit(unitcode);
+ }
+ #endregion
+
+
+
+ #region[瀹夌伅绯荤粺/杞﹂棿鏌ヨ]
+ public static ToMessage AnDengShopSearch(string stu_torgcode,string description)
+ {
+ return BasicSettingDAL.AnDengShopSearch(stu_torgcode, description);
+ }
+ #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