diff --git a/VOL.DingTalk/Models/Biz/DingTalkDepartment.cs b/VOL.DingTalk/Models/Biz/DingTalkDepartment.cs new file mode 100644 index 0000000..eb9fdf9 --- /dev/null +++ b/VOL.DingTalk/Models/Biz/DingTalkDepartment.cs @@ -0,0 +1,33 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace VOL.DingTalk.Models.Biz +{ + + public class DingTalkDepartment + { + public bool auto_add_user { get; set; } + public bool create_dept_group { get; set; } + public int dept_id { get; set; } + public string name { get; set; } + public int parent_id { get; set; } + + public string ext { get; set; } + + [JsonIgnore] + public List subDepartments { get; set; } = []; + + /// + /// 递归获取部门ID列表 + /// + /// + public List GetDeptIds() + { + return [dept_id, ..subDepartments.SelectMany(i => i.GetDeptIds()).ToList()]; + } + } +} diff --git a/VOL.DingTalk/Models/Biz/DingTalkEmployee.cs b/VOL.DingTalk/Models/Biz/DingTalkEmployee.cs new file mode 100644 index 0000000..3673d93 --- /dev/null +++ b/VOL.DingTalk/Models/Biz/DingTalkEmployee.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace VOL.DingTalk.Models.Biz +{ + public class DingTalkEmployee + { + + public string? UserId { get; set; } + + public string? Name { get; set; } + public string? Email { get; set; } + public string? Mobile { get; set; } + public string? JobNumber { get; set; } + public string? ReportManager { get; set; } + public string? Position { get; set; } + public string? Dept { get; set; } + + public static DingTalkEmployee TranFrom(DingTalkEmployeeRsp emp) + { + var obj = new DingTalkEmployee + { + UserId = emp.userid, + Name = emp.fieldDataList?.FirstOrDefault(f => f.fieldCode == "sys00-name")?.fieldValueList?.First()?.label, + Email = emp.fieldDataList?.FirstOrDefault(f => f.fieldCode == "sys00-email")?.fieldValueList?.First()?.label, + Mobile = emp.fieldDataList?.FirstOrDefault(f => f.fieldCode == "sys00-mobile")?.fieldValueList?.First()?.label, + JobNumber = emp.fieldDataList?.FirstOrDefault(f => f.fieldCode == "sys00-jobNumber")?.fieldValueList?.First()?.label, + ReportManager = emp.fieldDataList?.FirstOrDefault(f => f.fieldCode == "sys00-reportManager")?.fieldValueList?.First()?.label, + Position = emp.fieldDataList?.FirstOrDefault(f => f.fieldCode == "sys00-position")?.fieldValueList?.First()?.label, + Dept = emp.fieldDataList?.FirstOrDefault(f => f.fieldCode == "sys00-dept")?.fieldValueList?.First()?.label, + }; + return obj; + } + } +} diff --git a/VOL.DingTalk/Models/Biz/DingTalkEmployeeRsp.cs b/VOL.DingTalk/Models/Biz/DingTalkEmployeeRsp.cs new file mode 100644 index 0000000..b55a825 --- /dev/null +++ b/VOL.DingTalk/Models/Biz/DingTalkEmployeeRsp.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace VOL.DingTalk.Models.Biz +{ + public class DingTalkEmployeeRsp + { + + public FieldDataList[] fieldDataList { get; set; } + public string corpId { get; set; } + public string userid { get; set; } + } + + public class FieldDataList + { + public string fieldCode { get; set; } + public string fieldName { get; set; } + public string groupId { get; set; } + public string label { get; set; } + public string value { get; set; } + + public List fieldValueList { get; set;} + } + + public class FieldValueList + { + public int itemIndex { get; set; } + public string label { get; set; } + public string value { get; set; } + } + + public class EmployeeQuery { + + public List data_list { get; set; } + public long? next_cursor { get; set; } + } + +} diff --git a/VOL.DingTalk/Models/Biz/DingTalkResponse.cs b/VOL.DingTalk/Models/Biz/DingTalkResponse.cs new file mode 100644 index 0000000..e1d11ef --- /dev/null +++ b/VOL.DingTalk/Models/Biz/DingTalkResponse.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace VOL.DingTalk.Models.Biz +{ + internal class DingTalkResponse + { + public int errcode { get; set; } + public string errmsg { get; set; } + public T result { get; set; } + public string request_id { get; set; } + public bool? success { get; set; } + + } +} diff --git a/VOL.DingTalk/Models/DingTalkConfig.cs b/VOL.DingTalk/Models/DingTalkConfig.cs new file mode 100644 index 0000000..cdd5f5f --- /dev/null +++ b/VOL.DingTalk/Models/DingTalkConfig.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace VOL.DingTalk.Models +{ + /* + "dingtalk": { + "corp_id": "dingec656045526ce9c0ee0f45d8e4f7c288", + "app_key": "dingtl9hb00ktdkguzrh", + "app_secret": "NkWagc8VEhdZyjEPkK0oYbi_ZzqVMHLelmFWdGswBjh2zGgSt0UWLj1W58xNHwfv", + "agent_id": 3973173455 + }, + */ + public class DingTalkConfig + { + public string CorpId = "dingec656045526ce9c0ee0f45d8e4f7c288"; + public string AppKey = "dingtl9hb00ktdkguzrh"; + public string AppSecret = "NkWagc8VEhdZyjEPkK0oYbi_ZzqVMHLelmFWdGswBjh2zGgSt0UWLj1W58xNHwfv"; + public long AgentId = 3973173455; + + public List fields = [ + + "sys00-name", // 姓名 + "sys00-email", // 邮箱 + "sys00-mobile", // 手机号 + "sys02-certNo", // 证件号码 + "sys02-birthTime", // 出生日期 + "sys02-sexType", // 性别 + "sys00-dept", // 部门 + "sys00-jobNumber" // 工号 + ]; + } +} diff --git a/VOL.DingTalk/Models/SystemToken.cs b/VOL.DingTalk/Models/SystemToken.cs new file mode 100644 index 0000000..cff57e0 --- /dev/null +++ b/VOL.DingTalk/Models/SystemToken.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace VOL.DingTalk.Models +{ + public class SystemToken + { + public string Token { get; set; } + public int TokenExpiry { get; set; } + public DateTime TokenEndTime { get; set; } = DateTime.Now; + + public bool IsTokenExpiry() + { + //if (TokenEndTime == null) return true; + return TokenExpiry == 0 || TokenEndTime > DateTime.Now; + } + } +} diff --git a/VOL.HR/Services/DingTalk/DingTalkService.cs b/VOL.DingTalk/Services/Biz/DingTalkService.cs similarity index 75% rename from VOL.HR/Services/DingTalk/DingTalkService.cs rename to VOL.DingTalk/Services/Biz/DingTalkService.cs index 4684f90..958630a 100644 --- a/VOL.HR/Services/DingTalk/DingTalkService.cs +++ b/VOL.DingTalk/Services/Biz/DingTalkService.cs @@ -1,166 +1,164 @@ -using Microsoft.Extensions.Logging; -using Newtonsoft.Json; +using Newtonsoft.Json; using System.Globalization; +using System.Linq; using System.Net.Http.Headers; using System.Text; +using VOL.Core.Services; +using VOL.DingTalk.Models; +using VOL.DingTalk.Models.Biz; -namespace VOL.HR.Services.DingTalk +namespace VOL.DingTalk.Services.Biz { public class DingTalkService { - - private readonly string _corpId; - private readonly string _appKey; - private readonly string _appSecret; - private readonly string _agentId; - private string _accessToken; - private DateTime _tokenExpiry; - private readonly SemaphoreSlim _tokenLock = new SemaphoreSlim(1, 1); - private readonly ILogger _logger; - - // 钉钉API地址 - private readonly string _tokenUrl; private const string DepartmentSubUrl = "https://oapi.dingtalk.com/topapi/v2/department/listsub"; - private const string UserListIdUrl = "https://oapi.dingtalk.com/topapi/user/listid"; private const string RosterUrl = "https://api.dingtalk.com/v1.0/hrm/rosters/lists/query"; private const string UpdateEmployeeUrl = "https://oapi.dingtalk.com/topapi/smartwork/hrm/employee/v2/update"; - + private const string UserListIdUrl = "https://oapi.dingtalk.com/topapi/user/listid"; // 需要获取的花名册字段代码 - private readonly List _fieldCodes = new List - { - "sys00-name", // 姓名 - "sys00-email", // 邮箱 - "sys00-mobile", // 手机号 - "sys02-certNo", // 证件号码 - "sys02-birthTime", // 出生日期 - "sys02-sexType", // 性别 - "sys00-dept", // 部门 - "sys00-jobNumber" // 工号 - }; + private readonly List _fieldCodes = + [ + "sys00-name", // 姓名 + "sys00-email", // 邮箱 + "sys00-mobile", // 手机号 + "sys02-certNo", // 证件号码 + "sys02-birthTime", // 出生日期 + "sys02-sexType", // 性别 + "sys00-dept", // 部门 + "sys00-jobNumber", // 工号 + "sys00-reportManager", // 直接主管 + "sys00-position" // 职位 + ]; - public DingTalkService(string corpId, string appKey, string appSecret, string agentId, ILogger logger) + private readonly SemaphoreSlim _tokenLock = new SemaphoreSlim(1, 1); + // 钉钉API地址 + private readonly string _tokenUrl; + + private DingTalkConfig _config; + private SystemToken _token; + public DingTalkService(SystemToken token, DingTalkConfig config) { - _corpId = corpId; - _appKey = appKey; - _appSecret = appSecret; - _agentId = agentId; - _tokenUrl = $"https://api.dingtalk.com/v1.0/oauth2/{_corpId}/token"; - _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + _token = token; + _config = config; + //Init(); + _tokenUrl = $"https://api.dingtalk.com/v1.0/oauth2/{_config.CorpId}/token"; } - - private async Task GetAccessTokenAsync() + public List> ExtractEmployeeData(List> rosterData) { - var payload = new Dictionary - { - { "client_id", _appKey }, - { "client_secret", _appSecret }, - { "grant_type", "client_credentials" } - }; + var employees = new List>(); - using (var client = new HttpClient()) + foreach (var userData in rosterData) { - client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - var jsonPayload = JsonConvert.SerializeObject(payload); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var emp = new Dictionary { { "userid", userData["userId"].ToString() } }; - try - { - var response = await client.PostAsync(_tokenUrl, content); - response.EnsureSuccessStatusCode(); - var responseContent = await response.Content.ReadAsStringAsync(); - var data = JsonConvert.DeserializeObject>(responseContent); - return data["access_token"]; - } - catch (HttpRequestException ex) - { - _logger.LogError($"获取access_token失败: {ex.Message}"); - return null; - } - } - } + var fieldDataList = (Newtonsoft.Json.Linq.JArray)userData["fieldDataList"]; - public async Task GetValidTokenAsync() - { - await _tokenLock.WaitAsync(); - try - { - // 如果token不存在或已过期，重新获取 - if (string.IsNullOrEmpty(_accessToken) || DateTime.Now >= _tokenExpiry) + foreach (Newtonsoft.Json.Linq.JObject field in fieldDataList) { - _logger.LogInformation("钉钉access_token已过期，重新获取..."); - var token = await GetAccessTokenAsync(); - if (token != null) + string fieldCode = field["fieldCode"].ToString(); + string fieldValue = ""; + + var fieldValueList = (Newtonsoft.Json.Linq.JArray)field["fieldValueList"]; + if (fieldValueList != null && fieldValueList.Count > 0) { - _accessToken = token; - // 钉钉token有效期为7200秒，提前300秒刷新 - _tokenExpiry = DateTime.Now + TimeSpan.FromSeconds(6900); + // 处理部门信息 + if (fieldCode == "sys00-dept") + { + // 部门可能有多个，取第一个 + fieldValue = field["fieldValueList"][0]["label"].ToString(); + } + else + { + fieldValue = field["fieldValueList"][0]["label"].ToString(); + } } - else + + // 映射字段到中文名 + switch (fieldCode) { - _logger.LogError("无法获取有效的钉钉access_token"); - return null; + case "sys00-name": + emp["姓名"] = fieldValue; + break; + + case "sys00-email": + emp["邮箱"] = fieldValue; + break; + + case "sys00-dept": + emp["部门"] = fieldValue; + break; + + case "sys00-mobile": + emp["手机号"] = fieldValue; + break; + + case "sys02-certNo": + emp["证件号码"] = fieldValue; + break; + + case "sys02-birthTime": + emp["出生日期"] = fieldValue; + break; + + case "sys02-sexType": + emp["性别"] = fieldValue; + break; + + case "sys00-jobNumber": + emp["工号"] = fieldValue; + break; } } - return _accessToken; - } - finally - { - _tokenLock.Release(); + + employees.Add(emp); } + + return employees; } - public async Task>> GetSubDepartmentsAsync(long parentId = 1) + public async Task> GetAllEmployeesAsync() { + DateTime startTime = DateTime.Now; + + Logger.Info("正在获取钉钉访问凭证..."); var accessToken = await GetValidTokenAsync(); if (accessToken == null) { - return new List>(); + return new List(); } - var departments = new List>(); - var payload = new Dictionary { { "dept_id", parentId } }; - var queryParams = new Dictionary { { "access_token", accessToken } }; + Logger.Info("正在获取部门结构..."); + var departments = await GetSubDepartmentsAsync(); + Logger.Info($"共获取到 {departments.Count} 个部门"); - try + HashSet allUserIds = new HashSet(); + Logger.Info("正在获取部门用户列表..."); + foreach (var dept in departments) { - using (var client = new HttpClient()) - { - var jsonPayload = JsonConvert.SerializeObject(payload); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); - var uriBuilder = new UriBuilder(DepartmentSubUrl); - uriBuilder.Query = string.Join("&", queryParams.Select(kvp => $"{kvp.Key}={kvp.Value}")); - - var response = await client.PostAsync(uriBuilder.Uri, content); - response.EnsureSuccessStatusCode(); - var responseContent = await response.Content.ReadAsStringAsync(); - var data = JsonConvert.DeserializeObject>(responseContent); - - if (Convert.ToInt32(data["errcode"]) == 0) - { - var result = (Newtonsoft.Json.Linq.JArray)data["result"]; - foreach (Newtonsoft.Json.Linq.JObject dept in result) - { - long deptId = (long)dept["dept_id"]; - var department = new Dictionary - { - { "id", deptId }, - { "name", dept["name"].ToString() }, - { "parent_id", (long)dept["parent_id"] } - }; - departments.Add(department); - - // 递归获取子部门 - departments.AddRange(await GetSubDepartmentsAsync(deptId)); - } - } - return departments; - } + var userIds = await GetDeptUserIdsAsync(Convert.ToInt64(dept.dept_id)); + allUserIds.UnionWith(userIds); + Logger.Info($"部门 {dept.name} 有 {userIds.Count} 个用户"); } - catch (HttpRequestException ex) + + List userIdList = allUserIds.ToList(); + Logger.Info($"共获取到 {userIdList.Count} 个用户"); + + // 分批处理用户（每批100人） + var allEmployees = new List(); + int batchSize = 100; + for (int i = 0; i < userIdList.Count; i += batchSize) { - _logger.LogError($"获取部门列表失败: {ex.Message}"); - return new List>(); + var batch = userIdList.GetRange(i, Math.Min(batchSize, userIdList.Count - i)); + Logger.Info($"正在处理用户批次 {i / batchSize + 1}/{(userIdList.Count - 1) / batchSize + 1}"); + + var rosterData = await GetRosterInfoAsync(batch); + allEmployees.AddRange([.. rosterData.Select(DingTalkEmployee.TranFrom)]); } + + Logger.Info($"成功获取 {allEmployees.Count} 名员工信息"); + Logger.Info($"钉钉数据获取完成，耗时: {DateTime.Now.Subtract(startTime).TotalSeconds:.2f}秒"); + + return allEmployees; } public async Task> GetDeptUserIdsAsync(long deptId) @@ -198,30 +196,30 @@ namespace VOL.HR.Services.DingTalk } catch (HttpRequestException ex) { - _logger.LogError($"获取部门用户失败: {ex.Message}"); + Logger.Error($"获取部门用户失败: {ex.Message}"); return new List(); } } - public async Task>> GetRosterInfoAsync(List userIds) + public async Task> GetRosterInfoAsync(List userIds) { var accessToken = await GetValidTokenAsync(); if (accessToken == null) { - return new List>(); + return new List(); } var headers = new Dictionary { { "x-acs-dingtalk-access-token", accessToken }, - { "Content-Type", "application/json" } + //{ "Content-Type", "application/json" } }; var payload = new Dictionary { { "userIdList", userIds }, { "fieldFilterList", _fieldCodes }, - { "appAgentId", _agentId }, + { "appAgentId", _config.AgentId }, { "text2SelectConvert", true } }; @@ -229,6 +227,7 @@ namespace VOL.HR.Services.DingTalk { using (var client = new HttpClient()) { + client.DefaultRequestHeaders.Clear(); foreach (var header in headers) { client.DefaultRequestHeaders.Add(header.Key, header.Value); @@ -240,127 +239,111 @@ namespace VOL.HR.Services.DingTalk var response = await client.PostAsync(RosterUrl, content); response.EnsureSuccessStatusCode(); var responseContent = await response.Content.ReadAsStringAsync(); - var data = JsonConvert.DeserializeObject>(responseContent); - return ((Newtonsoft.Json.Linq.JArray)data["result"]).ToObject>>(); + //var data = JsonConvert.DeserializeObject>(responseContent); + //return ((Newtonsoft.Json.Linq.JArray)data["result"]).ToObject>(); + var rspResult = JsonConvert.DeserializeObject>>(responseContent); + return rspResult.result; } } catch (HttpRequestException ex) { - _logger.LogError($"获取花名册失败: {ex.Message}"); - return new List>(); + Logger.Error($"获取花名册失败: {ex.Message}"); + return new List(); } } - public List> ExtractEmployeeData(List> rosterData) + public async Task> GetSubDepartmentsAsync(long parentId = 1) { - var employees = new List>(); - - foreach (var userData in rosterData) - { - var emp = new Dictionary { { "userid", userData["userId"].ToString() } }; - - var fieldDataList = (Newtonsoft.Json.Linq.JArray)userData["fieldDataList"]; - - foreach (Newtonsoft.Json.Linq.JObject field in fieldDataList) - { - string fieldCode = field["fieldCode"].ToString(); - string fieldValue = ""; - - var fieldValueList = (Newtonsoft.Json.Linq.JArray)field["fieldValueList"]; - if (fieldValueList != null && fieldValueList.Count > 0) - { - // 处理部门信息 - if (fieldCode == "sys00-dept") - { - // 部门可能有多个，取第一个 - fieldValue = field["fieldValueList"][0]["label"].ToString(); - } - else - { - fieldValue = field["fieldValueList"][0]["label"].ToString(); - } - } - - // 映射字段到中文名 - switch (fieldCode) - { - case "sys00-name": - emp["姓名"] = fieldValue; - break; - case "sys00-email": - emp["邮箱"] = fieldValue; - break; - case "sys00-dept": - emp["部门"] = fieldValue; - break; - case "sys00-mobile": - emp["手机号"] = fieldValue; - break; - case "sys02-certNo": - emp["证件号码"] = fieldValue; - break; - case "sys02-birthTime": - emp["出生日期"] = fieldValue; - break; - case "sys02-sexType": - emp["性别"] = fieldValue; - break; - case "sys00-jobNumber": - emp["工号"] = fieldValue; - break; - } - } - - employees.Add(emp); - } - - return employees; - } - - public async Task<(List>, List>)> GetAllEmployeesAsync() - { - DateTime startTime = DateTime.Now; - - _logger.LogInformation("正在获取钉钉访问凭证..."); var accessToken = await GetValidTokenAsync(); if (accessToken == null) { - return (new List>(), new List>()); + return new List(); } - _logger.LogInformation("正在获取部门结构..."); - var departments = await GetSubDepartmentsAsync(); - _logger.LogInformation($"共获取到 {departments.Count} 个部门"); + var departments = new List(); + var payload = new Dictionary { { "dept_id", parentId } }; + var queryParams = new Dictionary { { "access_token", accessToken } }; - HashSet allUserIds = new HashSet(); - _logger.LogInformation("正在获取部门用户列表..."); - foreach (var dept in departments) + try { - var userIds = await GetDeptUserIdsAsync(Convert.ToInt64(dept["id"])); - allUserIds.UnionWith(userIds); - _logger.LogInformation($"部门 {dept["name"]} 有 {userIds.Count} 个用户"); + using (var client = new HttpClient()) + { + var jsonPayload = JsonConvert.SerializeObject(payload); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var uriBuilder = new UriBuilder(DepartmentSubUrl); + uriBuilder.Query = string.Join("&", queryParams.Select(kvp => $"{kvp.Key}={kvp.Value}")); + + var response = await client.PostAsync(uriBuilder.Uri, content); + response.EnsureSuccessStatusCode(); + var responseContent = await response.Content.ReadAsStringAsync(); + var data = JsonConvert.DeserializeObject>(responseContent); + + if (Convert.ToInt32(data["errcode"]) == 0) + { + var result = (Newtonsoft.Json.Linq.JArray)data["result"]; + foreach (Newtonsoft.Json.Linq.JObject dept in result) + { + long deptId = (long)dept["dept_id"]; + // var department = new DingTalkDepartment + //{ + // { "id", deptId }, + // { "name", dept["name"].ToString() }, + // { "parent_id", (long)dept["parent_id"] } + //}; + var department = new DingTalkDepartment + { + dept_id = (int)dept["dept_id"], + name = dept["name"].ToString(), + parent_id = (int)dept["parent_id"], + auto_add_user = (bool)dept["auto_add_user"], + create_dept_group = (bool)dept["create_dept_group"], + ext = dept["ext"]?.ToString() + }; + departments.Add(department); + + //await Task.Delay(1500); // 间隔1.5秒，避免请求过快 + // 递归获取子部门 + departments.AddRange(await GetSubDepartmentsAsync(deptId)); + } + } + return departments; + } } - - List userIdList = allUserIds.ToList(); - _logger.LogInformation($"共获取到 {userIdList.Count} 个用户"); - - // 分批处理用户（每批100人） - List> allEmployees = new List>(); - int batchSize = 100; - for (int i = 0; i < userIdList.Count; i += batchSize) + catch (HttpRequestException ex) { - var batch = userIdList.GetRange(i, Math.Min(batchSize, userIdList.Count - i)); - _logger.LogInformation($"正在处理用户批次 {i / batchSize + 1}/{(userIdList.Count - 1) / batchSize + 1}"); - - var rosterData = await GetRosterInfoAsync(batch); - var employees = ExtractEmployeeData(rosterData); - allEmployees.AddRange(employees); + Logger.Error($"获取部门列表失败: {ex.Message}"); + return new List(); } + } - _logger.LogInformation($"成功获取 {allEmployees.Count} 名员工信息"); - _logger.LogInformation($"钉钉数据获取完成，耗时: {DateTime.Now.Subtract(startTime).TotalSeconds:.2f}秒"); - - return (allEmployees, departments); + public async Task GetValidTokenAsync() + { + await _tokenLock.WaitAsync(); + try + { + // 如果token不存在或已过期，重新获取 + if (_token.IsTokenExpiry()) + { + Logger.Info("钉钉access_token已过期，重新获取..."); + var token = await GetAccessTokenAsync(); + if (token != null) + { + _token.Token = token; + // 钉钉token有效期为7200秒，提前300秒刷新 + _token.TokenExpiry = 6900; + } + else + { + Logger.Error("无法获取有效的钉钉access_token"); + return null; + } + } + return _token.Token; + } + finally + { + _tokenLock.Release(); + } } public async Task UpdateEmployeeAsync(string userId, Dictionary> fieldUpdates) @@ -421,7 +404,7 @@ namespace VOL.HR.Services.DingTalk var queryParams = new Dictionary { { "access_token", accessToken } }; var payload = new Dictionary { - { "agentid", _agentId }, + { "agentid", _config.AgentId }, { "param", new Dictionary { @@ -433,7 +416,7 @@ namespace VOL.HR.Services.DingTalk try { - _logger.LogInformation($"钉钉更新请求: {JsonConvert.SerializeObject(payload, Formatting.None)}"); + Logger.Info($"钉钉更新请求: {JsonConvert.SerializeObject(payload, Formatting.None)}"); using (var client = new HttpClient()) { @@ -444,8 +427,8 @@ namespace VOL.HR.Services.DingTalk var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); var response = await client.PostAsync(uriBuilder.Uri, content); - _logger.LogInformation($"钉钉更新响应状态: {response.StatusCode}"); - _logger.LogInformation($"钉钉更新响应内容: {await response.Content.ReadAsStringAsync()}"); + Logger.Info($"钉钉更新响应状态: {response.StatusCode}"); + Logger.Info($"钉钉更新响应内容: {await response.Content.ReadAsStringAsync()}"); response.EnsureSuccessStatusCode(); var responseContent = await response.Content.ReadAsStringAsync(); @@ -456,24 +439,40 @@ namespace VOL.HR.Services.DingTalk Convert.ToBoolean(data.GetValueOrDefault("result", false)) && Convert.ToBoolean(data.GetValueOrDefault("success", false))) { - _logger.LogInformation($"员工 {userId} 更新成功"); + Logger.Info($"员工 {userId} 更新成功"); return true; } else { string errorMsg = data.GetValueOrDefault("errmsg", "未知错误")?.ToString(); - _logger.LogError($"员工更新失败: {errorMsg}"); + Logger.Error($"员工更新失败: {errorMsg}"); return false; } } } catch (HttpRequestException ex) { - _logger.LogError($"更新员工信息失败: {ex.Message}"); + Logger.Error($"更新员工信息失败: {ex.Message}"); return false; } } + private string ConvertGenderForDingTalk(string gender) + { + if (gender == "男") + { + return "1"; + } + else if (gender == "女") + { + return "2"; + } + else + { + return gender; + } + } + private string FormatDate(string dateStr) { try @@ -505,21 +504,35 @@ namespace VOL.HR.Services.DingTalk } } - private string ConvertGenderForDingTalk(string gender) + private async Task GetAccessTokenAsync() { - if (gender == "男") + var payload = new Dictionary + { + { "client_id", _config.AppKey }, + { "client_secret", _config.AppSecret }, + { "grant_type", "client_credentials" } + }; + + using (var client = new HttpClient()) { - return "1"; - } - else if (gender == "女") - { - return "2"; - } - else - { - return gender; + client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + var jsonPayload = JsonConvert.SerializeObject(payload); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + try + { + var response = await client.PostAsync(_tokenUrl, content); + response.EnsureSuccessStatusCode(); + var responseContent = await response.Content.ReadAsStringAsync(); + var data = JsonConvert.DeserializeObject>(responseContent); + return data["access_token"]; + } + catch (HttpRequestException ex) + { + Logger.Error($"获取access_token失败: {ex.Message}"); + return null; + } } } - -} -} + } +} \ No newline at end of file diff --git a/VOL.DingTalk/VOL.DingTalk.csproj b/VOL.DingTalk/VOL.DingTalk.csproj new file mode 100644 index 0000000..4d4b247 --- /dev/null +++ b/VOL.DingTalk/VOL.DingTalk.csproj @@ -0,0 +1,13 @@ + + + + net8.0 + enable + enable + + + + + + + diff --git a/VOL.Entity/DomainModels/DeptShip/HR_DeptShip.cs b/VOL.Entity/DomainModels/DeptShip/HR_DeptShip.cs new file mode 100644 index 0000000..b409485 --- /dev/null +++ b/VOL.Entity/DomainModels/DeptShip/HR_DeptShip.cs @@ -0,0 +1,69 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *如果数据库字段发生变化，请在代码生器重新生成此Model + */ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +using VOL.Entity.SystemModels; + +namespace VOL.Entity.DomainModels +{ + [Entity(TableCnName = "跨系统部门关联",TableName = "HR_DeptShip")] + public partial class HR_DeptShip:BaseEntity + { + /// + ///关联关系ID + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + [Key] + [Display(Name ="关联关系ID")] + [Column(TypeName="int")] + [Editable(true)] + [Required(AllowEmptyStrings=false)] + public int ShipId { get; set; } + + /// + ///YSERP部门ID + /// + [Display(Name ="YSERP部门ID")] + [MaxLength(100)] + [Column(TypeName="nvarchar(100)")] + [Editable(true)] + public string YSDeptId { get; set; } + + /// + ///YS部门名称 + /// + [Display(Name ="YS部门名称")] + [MaxLength(100)] + [Column(TypeName="nvarchar(100)")] + [Editable(true)] + public string YSDeptName { get; set; } + + /// + ///钉钉部门ID + /// + [Display(Name ="钉钉部门ID")] + [MaxLength(100)] + [Column(TypeName="nvarchar(100)")] + [Editable(true)] + public string DingTalkDeptId { get; set; } + + /// + ///钉钉部门名称 + /// + [Display(Name ="钉钉部门名称")] + [MaxLength(100)] + [Column(TypeName="nvarchar(100)")] + [Editable(true)] + public string DingTalkDeptName { get; set; } + + + } +} \ No newline at end of file diff --git a/VOL.Entity/DomainModels/DeptShip/partial/HR_DeptShip.cs b/VOL.Entity/DomainModels/DeptShip/partial/HR_DeptShip.cs new file mode 100644 index 0000000..bd37a63 --- /dev/null +++ b/VOL.Entity/DomainModels/DeptShip/partial/HR_DeptShip.cs @@ -0,0 +1,22 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *如果数据库字段发生变化，请在代码生器重新生成此Model + */ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +using VOL.Entity.SystemModels; + +namespace VOL.Entity.DomainModels +{ + + public partial class HR_DeptShip + { + //此处配置字段(字段配置见此model的另一个partial),如果表中没有此字段请加上 [NotMapped]属性，否则会异常 + } +} \ No newline at end of file diff --git a/VOL.Entity/DomainModels/DeptSync/HR_DeptSync.cs b/VOL.Entity/DomainModels/DeptSync/HR_DeptSync.cs new file mode 100644 index 0000000..235598e --- /dev/null +++ b/VOL.Entity/DomainModels/DeptSync/HR_DeptSync.cs @@ -0,0 +1,64 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *如果数据库字段发生变化，请在代码生器重新生成此Model + */ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +using VOL.Entity.SystemModels; + +namespace VOL.Entity.DomainModels +{ + [Entity(TableCnName = "部门信息同步",TableName = "HR_DeptSync")] + public partial class HR_DeptSync:BaseEntity + { + /// + ///同步ID + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + [Key] + [Display(Name ="同步ID")] + [Column(TypeName="int")] + [Required(AllowEmptyStrings=false)] + public int DeptSyncId { get; set; } + + /// + ///YS部门ID + /// + [Display(Name ="YS部门ID")] + [MaxLength(100)] + [Column(TypeName="nvarchar(100)")] + public string YSDeptId { get; set; } + + /// + ///YS部门名称 + /// + [Display(Name ="YS部门名称")] + [MaxLength(100)] + [Column(TypeName="nvarchar(100)")] + public string YSDeptName { get; set; } + + /// + ///钉钉部门ID + /// + [Display(Name ="钉钉部门ID")] + [MaxLength(100)] + [Column(TypeName="nvarchar(100)")] + public string DingTalkDeptId { get; set; } + + /// + ///钉钉部门名称 + /// + [Display(Name ="钉钉部门名称")] + [MaxLength(100)] + [Column(TypeName="nvarchar(100)")] + public string DingTalkDeptName { get; set; } + + + } +} \ No newline at end of file diff --git a/VOL.Entity/DomainModels/DeptSync/partial/HR_DeptSync.cs b/VOL.Entity/DomainModels/DeptSync/partial/HR_DeptSync.cs new file mode 100644 index 0000000..fedf391 --- /dev/null +++ b/VOL.Entity/DomainModels/DeptSync/partial/HR_DeptSync.cs @@ -0,0 +1,22 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *如果数据库字段发生变化，请在代码生器重新生成此Model + */ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +using VOL.Entity.SystemModels; + +namespace VOL.Entity.DomainModels +{ + + public partial class HR_DeptSync + { + //此处配置字段(字段配置见此model的另一个partial),如果表中没有此字段请加上 [NotMapped]属性，否则会异常 + } +} \ No newline at end of file diff --git a/VOL.Entity/DomainModels/EmployeeSync/HR_EmployeeSync.cs b/VOL.Entity/DomainModels/EmployeeSync/HR_EmployeeSync.cs index 54179b4..fe6cc0f 100644 --- a/VOL.Entity/DomainModels/EmployeeSync/HR_EmployeeSync.cs +++ b/VOL.Entity/DomainModels/EmployeeSync/HR_EmployeeSync.cs @@ -15,6 +15,7 @@ using VOL.Entity.SystemModels; namespace VOL.Entity.DomainModels { [Entity(TableCnName = "员工信息同步",TableName = "HR_EmployeeSync")] + [SugarTable("HR_EmployeeSync")] public partial class HR_EmployeeSync:BaseEntity { /// diff --git a/VOL.MES/IRepositories/mes/IMES_ProcessRepository.cs b/VOL.HR/IRepositories/DeptShip/IHR_DeptShipRepository.cs similarity index 67% rename from VOL.MES/IRepositories/mes/IMES_ProcessRepository.cs rename to VOL.HR/IRepositories/DeptShip/IHR_DeptShipRepository.cs index 6c5eded..afd0276 100644 --- a/VOL.MES/IRepositories/mes/IMES_ProcessRepository.cs +++ b/VOL.HR/IRepositories/DeptShip/IHR_DeptShipRepository.cs @@ -1,6 +1,6 @@ /* *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_ProcessRepository编写接口 + *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IHR_DeptShipRepository编写接口 */ using System; using System.Collections.Generic; @@ -10,9 +10,9 @@ using System.Threading.Tasks; using VOL.Core.BaseProvider; using VOL.Entity.DomainModels; using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories +namespace VOL.HR.IRepositories { - public partial interface IMES_ProcessRepository : IDependency,IRepository + public partial interface IHR_DeptShipRepository : IDependency,IRepository { } } diff --git a/VOL.MES/IRepositories/mes/ITestServiceRepository.cs b/VOL.HR/IRepositories/DeptSync/IHR_DeptSyncRepository.cs similarity index 67% rename from VOL.MES/IRepositories/mes/ITestServiceRepository.cs rename to VOL.HR/IRepositories/DeptSync/IHR_DeptSyncRepository.cs index 0115960..daed029 100644 --- a/VOL.MES/IRepositories/mes/ITestServiceRepository.cs +++ b/VOL.HR/IRepositories/DeptSync/IHR_DeptSyncRepository.cs @@ -1,6 +1,6 @@ /* *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹ITestServiceRepository编写接口 + *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IHR_DeptSyncRepository编写接口 */ using System; using System.Collections.Generic; @@ -10,9 +10,9 @@ using System.Threading.Tasks; using VOL.Core.BaseProvider; using VOL.Entity.DomainModels; using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories +namespace VOL.HR.IRepositories { - public partial interface ITestServiceRepository : IDependency,IRepository + public partial interface IHR_DeptSyncRepository : IDependency,IRepository { } } diff --git a/VOL.MES/IServices/mes/IMES_ProcessService.cs b/VOL.HR/IServices/DeptShip/IHR_DeptShipService.cs similarity index 61% rename from VOL.MES/IServices/mes/IMES_ProcessService.cs rename to VOL.HR/IServices/DeptShip/IHR_DeptShipService.cs index 04e21c0..e70ab7d 100644 --- a/VOL.MES/IServices/mes/IMES_ProcessService.cs +++ b/VOL.HR/IServices/DeptShip/IHR_DeptShipService.cs @@ -4,9 +4,9 @@ using VOL.Core.BaseProvider; using VOL.Entity.DomainModels; -namespace VOL.MES.IServices +namespace VOL.HR.IServices { - public partial interface IMES_ProcessService : IService + public partial interface IHR_DeptShipService : IService { } } diff --git a/VOL.HR/IServices/DeptShip/Partial/IHR_DeptShipService.cs b/VOL.HR/IServices/DeptShip/Partial/IHR_DeptShipService.cs new file mode 100644 index 0000000..afb65b0 --- /dev/null +++ b/VOL.HR/IServices/DeptShip/Partial/IHR_DeptShipService.cs @@ -0,0 +1,15 @@ +/* +*所有关于HR_DeptShip类的业务代码接口应在此处编写 +*/ +using VOL.Core.BaseProvider; +using VOL.Entity.DomainModels; +using VOL.Core.Utilities; +using System.Linq.Expressions; +using VOL.YSErp.Models.Biz; +namespace VOL.HR.IServices +{ + public partial interface IHR_DeptShipService + { + Task> GetYSERPDepartments(); + } + } diff --git a/VOL.MES/IServices/mes/ITestServiceService.cs b/VOL.HR/IServices/DeptSync/IHR_DeptSyncService.cs similarity index 61% rename from VOL.MES/IServices/mes/ITestServiceService.cs rename to VOL.HR/IServices/DeptSync/IHR_DeptSyncService.cs index efc045f..985851d 100644 --- a/VOL.MES/IServices/mes/ITestServiceService.cs +++ b/VOL.HR/IServices/DeptSync/IHR_DeptSyncService.cs @@ -4,9 +4,9 @@ using VOL.Core.BaseProvider; using VOL.Entity.DomainModels; -namespace VOL.MES.IServices +namespace VOL.HR.IServices { - public partial interface ITestServiceService : IService + public partial interface IHR_DeptSyncService : IService { } } diff --git a/VOL.MES/IServices/mes/Partial/IMES_ProcessService.cs b/VOL.HR/IServices/DeptSync/Partial/IHR_DeptSyncService.cs similarity index 50% rename from VOL.MES/IServices/mes/Partial/IMES_ProcessService.cs rename to VOL.HR/IServices/DeptSync/Partial/IHR_DeptSyncService.cs index 1732f6f..0b13c3c 100644 --- a/VOL.MES/IServices/mes/Partial/IMES_ProcessService.cs +++ b/VOL.HR/IServices/DeptSync/Partial/IHR_DeptSyncService.cs @@ -1,13 +1,13 @@ /* -*所有关于MES_Process类的业务代码接口应在此处编写 +*所有关于HR_DeptSync类的业务代码接口应在此处编写 */ using VOL.Core.BaseProvider; using VOL.Entity.DomainModels; using VOL.Core.Utilities; using System.Linq.Expressions; -namespace VOL.MES.IServices +namespace VOL.HR.IServices { - public partial interface IMES_ProcessService + public partial interface IHR_DeptSyncService { } } diff --git a/VOL.HR/IServices/EmployeeSync/Partial/IHR_EmployeeSyncService.cs b/VOL.HR/IServices/EmployeeSync/Partial/IHR_EmployeeSyncService.cs index 67b8b89..47ac72f 100644 --- a/VOL.HR/IServices/EmployeeSync/Partial/IHR_EmployeeSyncService.cs +++ b/VOL.HR/IServices/EmployeeSync/Partial/IHR_EmployeeSyncService.cs @@ -5,9 +5,18 @@ using VOL.Core.BaseProvider; using VOL.Entity.DomainModels; using VOL.Core.Utilities; using System.Linq.Expressions; +using VOL.YSErp.Models.Biz; +using VOL.DingTalk.Models.Biz; namespace VOL.HR.IServices { public partial interface IHR_EmployeeSyncService { + Task> GetAllYSEmployees(); + + + Task> GetAllDingTalkEmployees(); + + + Task GenEmpSystemShip(); } } diff --git a/VOL.HR/Repositories/DeptShip/HR_DeptShipRepository.cs b/VOL.HR/Repositories/DeptShip/HR_DeptShipRepository.cs new file mode 100644 index 0000000..ad028c8 --- /dev/null +++ b/VOL.HR/Repositories/DeptShip/HR_DeptShipRepository.cs @@ -0,0 +1,26 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹HR_DeptShipRepository编写代码 + */ +using VOL.HR.IRepositories; +using VOL.Core.BaseProvider; +using VOL.Core.DbContext; +using VOL.Core.Extensions.AutofacManager; +using VOL.Entity.DomainModels; + +namespace VOL.HR.Repositories +{ + public partial class HR_DeptShipRepository : RepositoryBase + , IHR_DeptShipRepository + { + public HR_DeptShipRepository(VOLContext dbContext) + : base(dbContext) + { + + } + public static IHR_DeptShipRepository Instance + { + get { return AutofacContainerModule.GetService + (); } } + } + } diff --git a/VOL.HR/Repositories/DeptSync/HR_DeptSyncRepository.cs b/VOL.HR/Repositories/DeptSync/HR_DeptSyncRepository.cs new file mode 100644 index 0000000..270cf50 --- /dev/null +++ b/VOL.HR/Repositories/DeptSync/HR_DeptSyncRepository.cs @@ -0,0 +1,26 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹HR_DeptSyncRepository编写代码 + */ +using VOL.HR.IRepositories; +using VOL.Core.BaseProvider; +using VOL.Core.DbContext; +using VOL.Core.Extensions.AutofacManager; +using VOL.Entity.DomainModels; + +namespace VOL.HR.Repositories +{ + public partial class HR_DeptSyncRepository : RepositoryBase + , IHR_DeptSyncRepository + { + public HR_DeptSyncRepository(VOLContext dbContext) + : base(dbContext) + { + + } + public static IHR_DeptSyncRepository Instance + { + get { return AutofacContainerModule.GetService + (); } } + } + } diff --git a/VOL.HR/Services/DeptShip/HR_DeptShipService.cs b/VOL.HR/Services/DeptShip/HR_DeptShipService.cs new file mode 100644 index 0000000..dfb1c41 --- /dev/null +++ b/VOL.HR/Services/DeptShip/HR_DeptShipService.cs @@ -0,0 +1,22 @@ +/* + *Author：jxx + *Contact：283591387@qq.com + *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 + *所有业务编写全部应在Partial文件夹下HR_DeptShipService与IHR_DeptShipService中编写 + */ +using VOL.HR.IRepositories; +using VOL.HR.IServices; +using VOL.Core.BaseProvider; +using VOL.Core.Extensions.AutofacManager; +using VOL.Entity.DomainModels; + +namespace VOL.HR.Services +{ + public partial class HR_DeptShipService : ServiceBase + , IHR_DeptShipService, IDependency + { + public static IHR_DeptShipService Instance + { + get { return AutofacContainerModule.GetService(); } } + } + } diff --git a/VOL.HR/Services/DeptShip/Partial/HR_DeptShipService.cs b/VOL.HR/Services/DeptShip/Partial/HR_DeptShipService.cs new file mode 100644 index 0000000..03f6ef8 --- /dev/null +++ b/VOL.HR/Services/DeptShip/Partial/HR_DeptShipService.cs @@ -0,0 +1,67 @@ +/* + *所有关于HR_DeptShip类的业务代码应在此处编写 +*可使用repository.调用常用方法，获取EF/Dapper等信息 +*如果需要事务请使用repository.DbContextBeginTransaction +*也可使用DBServerProvider.手动获取数据库相关信息 +*用户信息、权限、角色等使用UserContext.Current操作 +*HR_DeptShipService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter +*/ +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; +using Newtonsoft.Json; +using VOL.DingTalk.Models.Biz; +using VOL.DingTalk.Services.Biz; +using VOL.HR.IRepositories; +using VOL.YSErp.Models.Biz; +using VOL.YSErp.Services.Biz; + +namespace VOL.HR.Services +{ + public partial class HR_DeptShipService + { + private readonly IHttpContextAccessor _httpContextAccessor; + private readonly IHR_DeptShipRepository _repository;//访问数据库 + + private readonly DingTalkService _dingTalkService; + private readonly YSERPService _ysService; + [ActivatorUtilitiesConstructor] + private readonly Core.CacheManager.ICacheService _cacheService; + + [ActivatorUtilitiesConstructor] + public HR_DeptShipService( + IHR_DeptShipRepository dbRepository, + IHttpContextAccessor httpContextAccessor, + Core.CacheManager.ICacheService cacheService + ) + : base(dbRepository) + { + _httpContextAccessor = httpContextAccessor; + _repository = dbRepository; + //多租户会用到这init代码，其他情况可以不用 + //base.Init(dbRepository); + _cacheService = cacheService; + + _dingTalkService = new DingTalkService(new DingTalk.Models.SystemToken(), new DingTalk.Models.DingTalkConfig()); + _ysService = new YSERPService(new YSErp.Models.SystemToken(), new YSErp.Models.YSConfig()); + } + + + public Task> GetYSERPDepartments() + { + + if (_cacheService.Exists("YS_DEPT_CACHE")) + { + return Task.FromResult(_cacheService.Get>("YS_DEPT_CACHE")); + } + else + { + var depts = _ysService.GetAllDepartmentsAsync(); + if (depts != null) + { + _cacheService.Add("YS_DEPT_CACHE", JsonConvert.SerializeObject(depts.Result), 600); + } + return depts; + } + } + } +} diff --git a/VOL.HR/Services/DeptSync/HR_DeptSyncService.cs b/VOL.HR/Services/DeptSync/HR_DeptSyncService.cs new file mode 100644 index 0000000..348ae73 --- /dev/null +++ b/VOL.HR/Services/DeptSync/HR_DeptSyncService.cs @@ -0,0 +1,22 @@ +/* + *Author：jxx + *Contact：283591387@qq.com + *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 + *所有业务编写全部应在Partial文件夹下HR_DeptSyncService与IHR_DeptSyncService中编写 + */ +using VOL.HR.IRepositories; +using VOL.HR.IServices; +using VOL.Core.BaseProvider; +using VOL.Core.Extensions.AutofacManager; +using VOL.Entity.DomainModels; + +namespace VOL.HR.Services +{ + public partial class HR_DeptSyncService : ServiceBase + , IHR_DeptSyncService, IDependency + { + public static IHR_DeptSyncService Instance + { + get { return AutofacContainerModule.GetService(); } } + } + } diff --git a/VOL.MES/Services/mes/Partial/TestServiceService.cs b/VOL.HR/Services/DeptSync/Partial/HR_DeptSyncService.cs similarity index 74% rename from VOL.MES/Services/mes/Partial/TestServiceService.cs rename to VOL.HR/Services/DeptSync/Partial/HR_DeptSyncService.cs index 2f697dd..7133f30 100644 --- a/VOL.MES/Services/mes/Partial/TestServiceService.cs +++ b/VOL.HR/Services/DeptSync/Partial/HR_DeptSyncService.cs @@ -1,10 +1,10 @@ /* - *所有关于TestService类的业务代码应在此处编写 + *所有关于HR_DeptSync类的业务代码应在此处编写 *可使用repository.调用常用方法，获取EF/Dapper等信息 *如果需要事务请使用repository.DbContextBeginTransaction *也可使用DBServerProvider.手动获取数据库相关信息 *用户信息、权限、角色等使用UserContext.Current操作 -*TestServiceService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter +*HR_DeptSyncService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter */ using VOL.Core.BaseProvider; using VOL.Core.Extensions.AutofacManager; @@ -16,18 +16,18 @@ using VOL.Core.Extensions; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; +using VOL.HR.IRepositories; -namespace VOL.MES.Services +namespace VOL.HR.Services { - public partial class TestServiceService + public partial class HR_DeptSyncService { private readonly IHttpContextAccessor _httpContextAccessor; - private readonly ITestServiceRepository _repository;//访问数据库 + private readonly IHR_DeptSyncRepository _repository;//访问数据库 [ActivatorUtilitiesConstructor] - public TestServiceService( - ITestServiceRepository dbRepository, + public HR_DeptSyncService( + IHR_DeptSyncRepository dbRepository, IHttpContextAccessor httpContextAccessor ) : base(dbRepository) diff --git a/VOL.HR/Services/EmployeeSync/HR_EmployeeSyncService.cs b/VOL.HR/Services/EmployeeSync/HR_EmployeeSyncService.cs index 656f380..04d2989 100644 --- a/VOL.HR/Services/EmployeeSync/HR_EmployeeSyncService.cs +++ b/VOL.HR/Services/EmployeeSync/HR_EmployeeSyncService.cs @@ -18,5 +18,7 @@ namespace VOL.HR.Services public static IHR_EmployeeSyncService Instance { get { return AutofacContainerModule.GetService(); } } + + } } diff --git a/VOL.HR/Services/EmployeeSync/Partial/HR_EmployeeSyncService.cs b/VOL.HR/Services/EmployeeSync/Partial/HR_EmployeeSyncService.cs index 5bfa11e..7741158 100644 --- a/VOL.HR/Services/EmployeeSync/Partial/HR_EmployeeSyncService.cs +++ b/VOL.HR/Services/EmployeeSync/Partial/HR_EmployeeSyncService.cs @@ -6,17 +6,29 @@ *用户信息、权限、角色等使用UserContext.Current操作 *HR_EmployeeSyncService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter */ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; +using Microsoft.AspNetCore.Http; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Linq.Expressions; +using System.Net.Http.Headers; +using System.Text; +using VOL.Core.BaseProvider; +using VOL.Core.CacheManager; +using VOL.Core.DBManager; +using VOL.Core.Extensions; +using VOL.Core.Extensions.AutofacManager; +using VOL.Core.Utilities; +using VOL.DingTalk.Models.Biz; +using VOL.DingTalk.Services.Biz; +using VOL.Entity.DomainModels; using VOL.HR.IRepositories; +using VOL.YSErp.Models.Biz; +using VOL.YSErp.Services.Biz; namespace VOL.HR.Services { @@ -24,11 +36,16 @@ namespace VOL.HR.Services { private readonly IHttpContextAccessor _httpContextAccessor; private readonly IHR_EmployeeSyncRepository _repository;//访问数据库 + private readonly DingTalkService _dingTalkService; + private readonly YSERPService _ysService; + [ActivatorUtilitiesConstructor] + private ICacheService _cacheService; [ActivatorUtilitiesConstructor] public HR_EmployeeSyncService( IHR_EmployeeSyncRepository dbRepository, - IHttpContextAccessor httpContextAccessor + IHttpContextAccessor httpContextAccessor, + ICacheService cacheService ) : base(dbRepository) { @@ -36,6 +53,98 @@ namespace VOL.HR.Services _repository = dbRepository; //多租户会用到这init代码，其他情况可以不用 //base.Init(dbRepository); + + _cacheService = cacheService; + + _dingTalkService = new DingTalkService(new DingTalk.Models.SystemToken(),new DingTalk.Models.DingTalkConfig()); + _ysService = new YSERPService(new YSErp.Models.SystemToken(), new YSErp.Models.YSConfig()); } - } + public Task> GetAllYSEmployees() + { + if (_cacheService.Exists("YS_EMP_CACHE")) + { + return Task.FromResult(_cacheService.Get>("YS_EMP_CACHE")); + } + else + { + var emps = _ysService.GetAllEmployeesAsync(); + if(emps != null) + { + _cacheService.Add("YS_EMP_CACHE", JsonConvert.SerializeObject(emps.Result), 600); + } + return emps; + } + } + public Task> GetAllDingTalkEmployees() + { + if (_cacheService.Exists("DingTalk_EMP_CACHE")) + { + return Task.FromResult(_cacheService.Get>("DingTalk_EMP_CACHE")); + } + else + { + var emps = _dingTalkService.GetAllEmployeesAsync(); + if(emps != null) + { + _cacheService.Add("DingTalk_EMP_CACHE", JsonConvert.SerializeObject(emps.Result), 600); + } + return emps; + } + } + + public Task GenEmpSystemShip() + { + List dingTalkEmployees = []; + List ysERPEmployees = []; + + var ysTask = GetAllYSEmployees().ContinueWith(x => + { + ysERPEmployees = x.Result; + }); + var dingTalkTask = GetAllDingTalkEmployees().ContinueWith(x => + { + dingTalkEmployees = x.Result; + }); + Task.WaitAll(ysTask, dingTalkTask); + if (ysERPEmployees.Count != 0) + { + var newList = new List(); + ysERPEmployees.ForEach(emp => + { + var dingTalkInfo = dingTalkEmployees?.FirstOrDefault(e => e.Mobile == emp.mobile); + if (dingTalkInfo != null) + { + //_repository.AddRange() + newList.Add(new HR_EmployeeSync + { + EmpYSID = emp.id, + EmpYSMobile = emp.mobile, + EmpYSDeptID = emp.dept_id, + EmpJobNumber = emp.code, + + EmpDingDingID = dingTalkInfo.UserId, + EmpDingDingMobile = dingTalkInfo.Mobile, + EmpLastSyncInfo = "Init generate for system.", + }); + } + }); + //_repository.AddRange(newList) + var db = DBServerProvider.SqlSugarClient; + try + { + db.BeginTran(); + // 清空重新生成 + db.Deleteable(); + db.Fastest().BulkCopy(newList); + db.CommitTran(); + } + catch (Exception) + { + db.RollbackTran(); + } + } + return Task.CompletedTask; + } + } + } diff --git a/VOL.HR/VOL.HR.csproj b/VOL.HR/VOL.HR.csproj index b248d49..d744867 100644 --- a/VOL.HR/VOL.HR.csproj +++ b/VOL.HR/VOL.HR.csproj @@ -8,11 +8,13 @@ + + - + diff --git a/VOL.MES/IRepositories/mes/IMES_Bom_DetailRepository.cs b/VOL.MES/IRepositories/mes/IMES_Bom_DetailRepository.cs deleted file mode 100644 index a823555..0000000 --- a/VOL.MES/IRepositories/mes/IMES_Bom_DetailRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_Bom_DetailRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_Bom_DetailRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_Bom_MainRepository.cs b/VOL.MES/IRepositories/mes/IMES_Bom_MainRepository.cs deleted file mode 100644 index c5fb2d4..0000000 --- a/VOL.MES/IRepositories/mes/IMES_Bom_MainRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_Bom_MainRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_Bom_MainRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_CustomerRepository.cs b/VOL.MES/IRepositories/mes/IMES_CustomerRepository.cs deleted file mode 100644 index 8ee8300..0000000 --- a/VOL.MES/IRepositories/mes/IMES_CustomerRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_CustomerRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_CustomerRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_DefectiveProductDisposalRecordRepository.cs b/VOL.MES/IRepositories/mes/IMES_DefectiveProductDisposalRecordRepository.cs deleted file mode 100644 index 767738b..0000000 --- a/VOL.MES/IRepositories/mes/IMES_DefectiveProductDisposalRecordRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_DefectiveProductDisposalRecordRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_DefectiveProductDisposalRecordRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_DefectiveProductRecordRepository.cs b/VOL.MES/IRepositories/mes/IMES_DefectiveProductRecordRepository.cs deleted file mode 100644 index 3eab781..0000000 --- a/VOL.MES/IRepositories/mes/IMES_DefectiveProductRecordRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_DefectiveProductRecordRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_DefectiveProductRecordRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_EquipmentFaultRecordRepository.cs b/VOL.MES/IRepositories/mes/IMES_EquipmentFaultRecordRepository.cs deleted file mode 100644 index 2c84de1..0000000 --- a/VOL.MES/IRepositories/mes/IMES_EquipmentFaultRecordRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_EquipmentFaultRecordRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_EquipmentFaultRecordRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_EquipmentMaintenanceRepository.cs b/VOL.MES/IRepositories/mes/IMES_EquipmentMaintenanceRepository.cs deleted file mode 100644 index e5027eb..0000000 --- a/VOL.MES/IRepositories/mes/IMES_EquipmentMaintenanceRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_EquipmentMaintenanceRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_EquipmentMaintenanceRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_EquipmentManagementRepository.cs b/VOL.MES/IRepositories/mes/IMES_EquipmentManagementRepository.cs deleted file mode 100644 index e5d2cd9..0000000 --- a/VOL.MES/IRepositories/mes/IMES_EquipmentManagementRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_EquipmentManagementRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_EquipmentManagementRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_EquipmentRepairRepository.cs b/VOL.MES/IRepositories/mes/IMES_EquipmentRepairRepository.cs deleted file mode 100644 index acb8dc5..0000000 --- a/VOL.MES/IRepositories/mes/IMES_EquipmentRepairRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_EquipmentRepairRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_EquipmentRepairRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_InventoryManagementRepository.cs b/VOL.MES/IRepositories/mes/IMES_InventoryManagementRepository.cs deleted file mode 100644 index cda2e53..0000000 --- a/VOL.MES/IRepositories/mes/IMES_InventoryManagementRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_InventoryManagementRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_InventoryManagementRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_LocationManagementRepository.cs b/VOL.MES/IRepositories/mes/IMES_LocationManagementRepository.cs deleted file mode 100644 index 619c316..0000000 --- a/VOL.MES/IRepositories/mes/IMES_LocationManagementRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_LocationManagementRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_LocationManagementRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_MaterialCatalogRepository.cs b/VOL.MES/IRepositories/mes/IMES_MaterialCatalogRepository.cs deleted file mode 100644 index e4f4dc2..0000000 --- a/VOL.MES/IRepositories/mes/IMES_MaterialCatalogRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_MaterialCatalogRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_MaterialCatalogRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_MaterialRepository.cs b/VOL.MES/IRepositories/mes/IMES_MaterialRepository.cs deleted file mode 100644 index d42a6a6..0000000 --- a/VOL.MES/IRepositories/mes/IMES_MaterialRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_MaterialRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_MaterialRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_ProcessReportRepository.cs b/VOL.MES/IRepositories/mes/IMES_ProcessReportRepository.cs deleted file mode 100644 index 33c41a9..0000000 --- a/VOL.MES/IRepositories/mes/IMES_ProcessReportRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_ProcessReportRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_ProcessReportRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_ProcessRouteRepository.cs b/VOL.MES/IRepositories/mes/IMES_ProcessRouteRepository.cs deleted file mode 100644 index 74d5899..0000000 --- a/VOL.MES/IRepositories/mes/IMES_ProcessRouteRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_ProcessRouteRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_ProcessRouteRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_ProductInboundRepository.cs b/VOL.MES/IRepositories/mes/IMES_ProductInboundRepository.cs deleted file mode 100644 index 5aeb5d5..0000000 --- a/VOL.MES/IRepositories/mes/IMES_ProductInboundRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_ProductInboundRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_ProductInboundRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_ProductOutboundRepository.cs b/VOL.MES/IRepositories/mes/IMES_ProductOutboundRepository.cs deleted file mode 100644 index 3419840..0000000 --- a/VOL.MES/IRepositories/mes/IMES_ProductOutboundRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_ProductOutboundRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_ProductOutboundRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_ProductionLineDeviceRepository.cs b/VOL.MES/IRepositories/mes/IMES_ProductionLineDeviceRepository.cs deleted file mode 100644 index 3353f3f..0000000 --- a/VOL.MES/IRepositories/mes/IMES_ProductionLineDeviceRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_ProductionLineDeviceRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_ProductionLineDeviceRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_ProductionLineRepository.cs b/VOL.MES/IRepositories/mes/IMES_ProductionLineRepository.cs deleted file mode 100644 index d38427b..0000000 --- a/VOL.MES/IRepositories/mes/IMES_ProductionLineRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_ProductionLineRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_ProductionLineRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_ProductionOrderRepository.cs b/VOL.MES/IRepositories/mes/IMES_ProductionOrderRepository.cs deleted file mode 100644 index 63a711d..0000000 --- a/VOL.MES/IRepositories/mes/IMES_ProductionOrderRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_ProductionOrderRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_ProductionOrderRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_ProductionPlanChangeRecordRepository.cs b/VOL.MES/IRepositories/mes/IMES_ProductionPlanChangeRecordRepository.cs deleted file mode 100644 index 858223b..0000000 --- a/VOL.MES/IRepositories/mes/IMES_ProductionPlanChangeRecordRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_ProductionPlanChangeRecordRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_ProductionPlanChangeRecordRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_ProductionPlanDetailRepository.cs b/VOL.MES/IRepositories/mes/IMES_ProductionPlanDetailRepository.cs deleted file mode 100644 index dfa1b0f..0000000 --- a/VOL.MES/IRepositories/mes/IMES_ProductionPlanDetailRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_ProductionPlanDetailRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_ProductionPlanDetailRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_ProductionReportingDetailRepository.cs b/VOL.MES/IRepositories/mes/IMES_ProductionReportingDetailRepository.cs deleted file mode 100644 index 77683e5..0000000 --- a/VOL.MES/IRepositories/mes/IMES_ProductionReportingDetailRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_ProductionReportingDetailRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_ProductionReportingDetailRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_ProductionReportingRepository.cs b/VOL.MES/IRepositories/mes/IMES_ProductionReportingRepository.cs deleted file mode 100644 index 02f1e18..0000000 --- a/VOL.MES/IRepositories/mes/IMES_ProductionReportingRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_ProductionReportingRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_ProductionReportingRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_QualityInspectionPlanDetailRepository.cs b/VOL.MES/IRepositories/mes/IMES_QualityInspectionPlanDetailRepository.cs deleted file mode 100644 index c3f4474..0000000 --- a/VOL.MES/IRepositories/mes/IMES_QualityInspectionPlanDetailRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_QualityInspectionPlanDetailRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_QualityInspectionPlanDetailRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_QualityInspectionPlanRepository.cs b/VOL.MES/IRepositories/mes/IMES_QualityInspectionPlanRepository.cs deleted file mode 100644 index b803186..0000000 --- a/VOL.MES/IRepositories/mes/IMES_QualityInspectionPlanRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_QualityInspectionPlanRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_QualityInspectionPlanRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_QualityInspectionRecordRepository.cs b/VOL.MES/IRepositories/mes/IMES_QualityInspectionRecordRepository.cs deleted file mode 100644 index f65de71..0000000 --- a/VOL.MES/IRepositories/mes/IMES_QualityInspectionRecordRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_QualityInspectionRecordRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_QualityInspectionRecordRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_SchedulingPlanRepository.cs b/VOL.MES/IRepositories/mes/IMES_SchedulingPlanRepository.cs deleted file mode 100644 index a868691..0000000 --- a/VOL.MES/IRepositories/mes/IMES_SchedulingPlanRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_SchedulingPlanRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_SchedulingPlanRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_SupplierRepository.cs b/VOL.MES/IRepositories/mes/IMES_SupplierRepository.cs deleted file mode 100644 index f7e5aa8..0000000 --- a/VOL.MES/IRepositories/mes/IMES_SupplierRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_SupplierRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_SupplierRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IRepositories/mes/IMES_WarehouseManagementRepository.cs b/VOL.MES/IRepositories/mes/IMES_WarehouseManagementRepository.cs deleted file mode 100644 index 6c6a4af..0000000 --- a/VOL.MES/IRepositories/mes/IMES_WarehouseManagementRepository.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IMES_WarehouseManagementRepository编写接口 - */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Extensions.AutofacManager; -namespace VOL.MES.IRepositories -{ - public partial interface IMES_WarehouseManagementRepository : IDependency,IRepository - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_Bom_DetailService.cs b/VOL.MES/IServices/mes/IMES_Bom_DetailService.cs deleted file mode 100644 index 6c33252..0000000 --- a/VOL.MES/IServices/mes/IMES_Bom_DetailService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_Bom_DetailService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_Bom_MainService.cs b/VOL.MES/IServices/mes/IMES_Bom_MainService.cs deleted file mode 100644 index 11b5bf5..0000000 --- a/VOL.MES/IServices/mes/IMES_Bom_MainService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_Bom_MainService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_CustomerService.cs b/VOL.MES/IServices/mes/IMES_CustomerService.cs deleted file mode 100644 index 6ad7587..0000000 --- a/VOL.MES/IServices/mes/IMES_CustomerService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_CustomerService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_DefectiveProductDisposalRecordService.cs b/VOL.MES/IServices/mes/IMES_DefectiveProductDisposalRecordService.cs deleted file mode 100644 index 95bba09..0000000 --- a/VOL.MES/IServices/mes/IMES_DefectiveProductDisposalRecordService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_DefectiveProductDisposalRecordService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_DefectiveProductRecordService.cs b/VOL.MES/IServices/mes/IMES_DefectiveProductRecordService.cs deleted file mode 100644 index 5bda540..0000000 --- a/VOL.MES/IServices/mes/IMES_DefectiveProductRecordService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_DefectiveProductRecordService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_EquipmentFaultRecordService.cs b/VOL.MES/IServices/mes/IMES_EquipmentFaultRecordService.cs deleted file mode 100644 index 63e8358..0000000 --- a/VOL.MES/IServices/mes/IMES_EquipmentFaultRecordService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_EquipmentFaultRecordService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_EquipmentMaintenanceService.cs b/VOL.MES/IServices/mes/IMES_EquipmentMaintenanceService.cs deleted file mode 100644 index f2cc40f..0000000 --- a/VOL.MES/IServices/mes/IMES_EquipmentMaintenanceService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_EquipmentMaintenanceService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_EquipmentManagementService.cs b/VOL.MES/IServices/mes/IMES_EquipmentManagementService.cs deleted file mode 100644 index 3924ff9..0000000 --- a/VOL.MES/IServices/mes/IMES_EquipmentManagementService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_EquipmentManagementService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_EquipmentRepairService.cs b/VOL.MES/IServices/mes/IMES_EquipmentRepairService.cs deleted file mode 100644 index fa5f7b3..0000000 --- a/VOL.MES/IServices/mes/IMES_EquipmentRepairService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_EquipmentRepairService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_InventoryManagementService.cs b/VOL.MES/IServices/mes/IMES_InventoryManagementService.cs deleted file mode 100644 index ce1a9ce..0000000 --- a/VOL.MES/IServices/mes/IMES_InventoryManagementService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_InventoryManagementService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_LocationManagementService.cs b/VOL.MES/IServices/mes/IMES_LocationManagementService.cs deleted file mode 100644 index 9cb492b..0000000 --- a/VOL.MES/IServices/mes/IMES_LocationManagementService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_LocationManagementService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_MaterialCatalogService.cs b/VOL.MES/IServices/mes/IMES_MaterialCatalogService.cs deleted file mode 100644 index d5e0cfc..0000000 --- a/VOL.MES/IServices/mes/IMES_MaterialCatalogService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_MaterialCatalogService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_MaterialService.cs b/VOL.MES/IServices/mes/IMES_MaterialService.cs deleted file mode 100644 index 25bf47d..0000000 --- a/VOL.MES/IServices/mes/IMES_MaterialService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_MaterialService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_ProcessReportService.cs b/VOL.MES/IServices/mes/IMES_ProcessReportService.cs deleted file mode 100644 index 921b6fd..0000000 --- a/VOL.MES/IServices/mes/IMES_ProcessReportService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_ProcessReportService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_ProcessRouteService.cs b/VOL.MES/IServices/mes/IMES_ProcessRouteService.cs deleted file mode 100644 index 8312397..0000000 --- a/VOL.MES/IServices/mes/IMES_ProcessRouteService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_ProcessRouteService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_ProductInboundService.cs b/VOL.MES/IServices/mes/IMES_ProductInboundService.cs deleted file mode 100644 index 3f540d9..0000000 --- a/VOL.MES/IServices/mes/IMES_ProductInboundService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductInboundService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_ProductOutboundService.cs b/VOL.MES/IServices/mes/IMES_ProductOutboundService.cs deleted file mode 100644 index 0abe510..0000000 --- a/VOL.MES/IServices/mes/IMES_ProductOutboundService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductOutboundService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_ProductionLineDeviceService.cs b/VOL.MES/IServices/mes/IMES_ProductionLineDeviceService.cs deleted file mode 100644 index 2139208..0000000 --- a/VOL.MES/IServices/mes/IMES_ProductionLineDeviceService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductionLineDeviceService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_ProductionLineService.cs b/VOL.MES/IServices/mes/IMES_ProductionLineService.cs deleted file mode 100644 index d1397c4..0000000 --- a/VOL.MES/IServices/mes/IMES_ProductionLineService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductionLineService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_ProductionOrderService.cs b/VOL.MES/IServices/mes/IMES_ProductionOrderService.cs deleted file mode 100644 index 10daddb..0000000 --- a/VOL.MES/IServices/mes/IMES_ProductionOrderService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductionOrderService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_ProductionPlanChangeRecordService.cs b/VOL.MES/IServices/mes/IMES_ProductionPlanChangeRecordService.cs deleted file mode 100644 index 88b2acb..0000000 --- a/VOL.MES/IServices/mes/IMES_ProductionPlanChangeRecordService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductionPlanChangeRecordService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_ProductionPlanDetailService.cs b/VOL.MES/IServices/mes/IMES_ProductionPlanDetailService.cs deleted file mode 100644 index 9ec969c..0000000 --- a/VOL.MES/IServices/mes/IMES_ProductionPlanDetailService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductionPlanDetailService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_ProductionReportingDetailService.cs b/VOL.MES/IServices/mes/IMES_ProductionReportingDetailService.cs deleted file mode 100644 index dfc6b57..0000000 --- a/VOL.MES/IServices/mes/IMES_ProductionReportingDetailService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductionReportingDetailService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_ProductionReportingService.cs b/VOL.MES/IServices/mes/IMES_ProductionReportingService.cs deleted file mode 100644 index 766bd00..0000000 --- a/VOL.MES/IServices/mes/IMES_ProductionReportingService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductionReportingService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_QualityInspectionPlanDetailService.cs b/VOL.MES/IServices/mes/IMES_QualityInspectionPlanDetailService.cs deleted file mode 100644 index 4b1fdfe..0000000 --- a/VOL.MES/IServices/mes/IMES_QualityInspectionPlanDetailService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_QualityInspectionPlanDetailService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_QualityInspectionPlanService.cs b/VOL.MES/IServices/mes/IMES_QualityInspectionPlanService.cs deleted file mode 100644 index ce4ecb1..0000000 --- a/VOL.MES/IServices/mes/IMES_QualityInspectionPlanService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_QualityInspectionPlanService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_QualityInspectionRecordService.cs b/VOL.MES/IServices/mes/IMES_QualityInspectionRecordService.cs deleted file mode 100644 index 477a7cd..0000000 --- a/VOL.MES/IServices/mes/IMES_QualityInspectionRecordService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_QualityInspectionRecordService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_SchedulingPlanService.cs b/VOL.MES/IServices/mes/IMES_SchedulingPlanService.cs deleted file mode 100644 index d7455c5..0000000 --- a/VOL.MES/IServices/mes/IMES_SchedulingPlanService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_SchedulingPlanService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_SupplierService.cs b/VOL.MES/IServices/mes/IMES_SupplierService.cs deleted file mode 100644 index 2d3a60d..0000000 --- a/VOL.MES/IServices/mes/IMES_SupplierService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_SupplierService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/IMES_WarehouseManagementService.cs b/VOL.MES/IServices/mes/IMES_WarehouseManagementService.cs deleted file mode 100644 index 3cf2736..0000000 --- a/VOL.MES/IServices/mes/IMES_WarehouseManagementService.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - */ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; - -namespace VOL.MES.IServices -{ - public partial interface IMES_WarehouseManagementService : IService - { - } -} diff --git a/VOL.MES/IServices/mes/Partial/IMES_Bom_DetailService.cs b/VOL.MES/IServices/mes/Partial/IMES_Bom_DetailService.cs deleted file mode 100644 index 67de39e..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_Bom_DetailService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_Bom_Detail类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_Bom_DetailService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_Bom_MainService.cs b/VOL.MES/IServices/mes/Partial/IMES_Bom_MainService.cs deleted file mode 100644 index c7247a2..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_Bom_MainService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_Bom_Main类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_Bom_MainService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_CustomerService.cs b/VOL.MES/IServices/mes/Partial/IMES_CustomerService.cs deleted file mode 100644 index b819dbd..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_CustomerService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_Customer类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_CustomerService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_DefectiveProductDisposalRecordService.cs b/VOL.MES/IServices/mes/Partial/IMES_DefectiveProductDisposalRecordService.cs deleted file mode 100644 index fae4140..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_DefectiveProductDisposalRecordService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_DefectiveProductDisposalRecord类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_DefectiveProductDisposalRecordService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_DefectiveProductRecordService.cs b/VOL.MES/IServices/mes/Partial/IMES_DefectiveProductRecordService.cs deleted file mode 100644 index 289b5c3..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_DefectiveProductRecordService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_DefectiveProductRecord类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_DefectiveProductRecordService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_EquipmentFaultRecordService.cs b/VOL.MES/IServices/mes/Partial/IMES_EquipmentFaultRecordService.cs deleted file mode 100644 index 7e0416b..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_EquipmentFaultRecordService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_EquipmentFaultRecord类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_EquipmentFaultRecordService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_EquipmentMaintenanceService.cs b/VOL.MES/IServices/mes/Partial/IMES_EquipmentMaintenanceService.cs deleted file mode 100644 index 3b37296..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_EquipmentMaintenanceService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_EquipmentMaintenance类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_EquipmentMaintenanceService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_EquipmentManagementService.cs b/VOL.MES/IServices/mes/Partial/IMES_EquipmentManagementService.cs deleted file mode 100644 index 17bcb40..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_EquipmentManagementService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_EquipmentManagement类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_EquipmentManagementService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_EquipmentRepairService.cs b/VOL.MES/IServices/mes/Partial/IMES_EquipmentRepairService.cs deleted file mode 100644 index 0fcf334..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_EquipmentRepairService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_EquipmentRepair类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_EquipmentRepairService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_InventoryManagementService.cs b/VOL.MES/IServices/mes/Partial/IMES_InventoryManagementService.cs deleted file mode 100644 index 6cc901a..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_InventoryManagementService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_InventoryManagement类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_InventoryManagementService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_LocationManagementService.cs b/VOL.MES/IServices/mes/Partial/IMES_LocationManagementService.cs deleted file mode 100644 index 9ca8a78..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_LocationManagementService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_LocationManagement类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_LocationManagementService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_MaterialCatalogService.cs b/VOL.MES/IServices/mes/Partial/IMES_MaterialCatalogService.cs deleted file mode 100644 index 14cad64..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_MaterialCatalogService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_MaterialCatalog类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_MaterialCatalogService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_MaterialService.cs b/VOL.MES/IServices/mes/Partial/IMES_MaterialService.cs deleted file mode 100644 index 97064ea..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_MaterialService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_Material类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_MaterialService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_ProcessReportService.cs b/VOL.MES/IServices/mes/Partial/IMES_ProcessReportService.cs deleted file mode 100644 index 5158f69..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_ProcessReportService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_ProcessReport类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_ProcessReportService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_ProcessRouteService.cs b/VOL.MES/IServices/mes/Partial/IMES_ProcessRouteService.cs deleted file mode 100644 index 9a72887..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_ProcessRouteService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_ProcessRoute类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_ProcessRouteService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_ProductInboundService.cs b/VOL.MES/IServices/mes/Partial/IMES_ProductInboundService.cs deleted file mode 100644 index 0207262..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_ProductInboundService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_ProductInbound类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductInboundService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_ProductOutboundService.cs b/VOL.MES/IServices/mes/Partial/IMES_ProductOutboundService.cs deleted file mode 100644 index fb397d7..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_ProductOutboundService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_ProductOutbound类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductOutboundService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_ProductionLineDeviceService.cs b/VOL.MES/IServices/mes/Partial/IMES_ProductionLineDeviceService.cs deleted file mode 100644 index f91688c..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_ProductionLineDeviceService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_ProductionLineDevice类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductionLineDeviceService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_ProductionLineService.cs b/VOL.MES/IServices/mes/Partial/IMES_ProductionLineService.cs deleted file mode 100644 index d1b1ea7..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_ProductionLineService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_ProductionLine类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductionLineService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_ProductionOrderService.cs b/VOL.MES/IServices/mes/Partial/IMES_ProductionOrderService.cs deleted file mode 100644 index 4c382e9..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_ProductionOrderService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_ProductionOrder类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductionOrderService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_ProductionPlanChangeRecordService.cs b/VOL.MES/IServices/mes/Partial/IMES_ProductionPlanChangeRecordService.cs deleted file mode 100644 index 4b21776..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_ProductionPlanChangeRecordService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_ProductionPlanChangeRecord类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductionPlanChangeRecordService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_ProductionPlanDetailService.cs b/VOL.MES/IServices/mes/Partial/IMES_ProductionPlanDetailService.cs deleted file mode 100644 index 52ccc5d..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_ProductionPlanDetailService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_ProductionPlanDetail类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductionPlanDetailService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_ProductionReportingDetailService.cs b/VOL.MES/IServices/mes/Partial/IMES_ProductionReportingDetailService.cs deleted file mode 100644 index 2c58766..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_ProductionReportingDetailService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_ProductionReportingDetail类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductionReportingDetailService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_ProductionReportingService.cs b/VOL.MES/IServices/mes/Partial/IMES_ProductionReportingService.cs deleted file mode 100644 index a342bb2..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_ProductionReportingService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_ProductionReporting类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_ProductionReportingService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_QualityInspectionPlanDetailService.cs b/VOL.MES/IServices/mes/Partial/IMES_QualityInspectionPlanDetailService.cs deleted file mode 100644 index ac39cd1..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_QualityInspectionPlanDetailService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_QualityInspectionPlanDetail类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_QualityInspectionPlanDetailService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_QualityInspectionPlanService.cs b/VOL.MES/IServices/mes/Partial/IMES_QualityInspectionPlanService.cs deleted file mode 100644 index c3df2b1..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_QualityInspectionPlanService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_QualityInspectionPlan类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_QualityInspectionPlanService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_QualityInspectionRecordService.cs b/VOL.MES/IServices/mes/Partial/IMES_QualityInspectionRecordService.cs deleted file mode 100644 index 1bf4ed7..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_QualityInspectionRecordService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_QualityInspectionRecord类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_QualityInspectionRecordService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_SchedulingPlanService.cs b/VOL.MES/IServices/mes/Partial/IMES_SchedulingPlanService.cs deleted file mode 100644 index c55e936..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_SchedulingPlanService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_SchedulingPlan类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_SchedulingPlanService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_SupplierService.cs b/VOL.MES/IServices/mes/Partial/IMES_SupplierService.cs deleted file mode 100644 index c8dd3f1..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_SupplierService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_Supplier类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_SupplierService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/IMES_WarehouseManagementService.cs b/VOL.MES/IServices/mes/Partial/IMES_WarehouseManagementService.cs deleted file mode 100644 index 3c524a2..0000000 --- a/VOL.MES/IServices/mes/Partial/IMES_WarehouseManagementService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于MES_WarehouseManagement类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface IMES_WarehouseManagementService - { - } - } diff --git a/VOL.MES/IServices/mes/Partial/ITestServiceService.cs b/VOL.MES/IServices/mes/Partial/ITestServiceService.cs deleted file mode 100644 index 3301573..0000000 --- a/VOL.MES/IServices/mes/Partial/ITestServiceService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* -*所有关于TestService类的业务代码接口应在此处编写 -*/ -using VOL.Core.BaseProvider; -using VOL.Entity.DomainModels; -using VOL.Core.Utilities; -using System.Linq.Expressions; -namespace VOL.MES.IServices -{ - public partial interface ITestServiceService - { - } - } diff --git a/VOL.MES/Repositories/mes/MES_Bom_DetailRepository.cs b/VOL.MES/Repositories/mes/MES_Bom_DetailRepository.cs deleted file mode 100644 index 2afc04f..0000000 --- a/VOL.MES/Repositories/mes/MES_Bom_DetailRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_Bom_DetailRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using VOL.Core.DbContext; - -namespace VOL.MES.Repositories -{ - public partial class MES_Bom_DetailRepository : RepositoryBase , IMES_Bom_DetailRepository - { - public MES_Bom_DetailRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_Bom_DetailRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_Bom_MainRepository.cs b/VOL.MES/Repositories/mes/MES_Bom_MainRepository.cs deleted file mode 100644 index d302e6b..0000000 --- a/VOL.MES/Repositories/mes/MES_Bom_MainRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_Bom_MainRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_Bom_MainRepository : RepositoryBase , IMES_Bom_MainRepository - { - public MES_Bom_MainRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_Bom_MainRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_CustomerRepository.cs b/VOL.MES/Repositories/mes/MES_CustomerRepository.cs deleted file mode 100644 index 3e4d863..0000000 --- a/VOL.MES/Repositories/mes/MES_CustomerRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_CustomerRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_CustomerRepository : RepositoryBase , IMES_CustomerRepository - { - public MES_CustomerRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_CustomerRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_DefectiveProductDisposalRecordRepository.cs b/VOL.MES/Repositories/mes/MES_DefectiveProductDisposalRecordRepository.cs deleted file mode 100644 index c264a79..0000000 --- a/VOL.MES/Repositories/mes/MES_DefectiveProductDisposalRecordRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_DefectiveProductDisposalRecordRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_DefectiveProductDisposalRecordRepository : RepositoryBase , IMES_DefectiveProductDisposalRecordRepository - { - public MES_DefectiveProductDisposalRecordRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_DefectiveProductDisposalRecordRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_DefectiveProductRecordRepository.cs b/VOL.MES/Repositories/mes/MES_DefectiveProductRecordRepository.cs deleted file mode 100644 index 6a466b8..0000000 --- a/VOL.MES/Repositories/mes/MES_DefectiveProductRecordRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_DefectiveProductRecordRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_DefectiveProductRecordRepository : RepositoryBase , IMES_DefectiveProductRecordRepository - { - public MES_DefectiveProductRecordRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_DefectiveProductRecordRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_EquipmentFaultRecordRepository.cs b/VOL.MES/Repositories/mes/MES_EquipmentFaultRecordRepository.cs deleted file mode 100644 index d1b9d8f..0000000 --- a/VOL.MES/Repositories/mes/MES_EquipmentFaultRecordRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_EquipmentFaultRecordRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_EquipmentFaultRecordRepository : RepositoryBase , IMES_EquipmentFaultRecordRepository - { - public MES_EquipmentFaultRecordRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_EquipmentFaultRecordRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_EquipmentMaintenanceRepository.cs b/VOL.MES/Repositories/mes/MES_EquipmentMaintenanceRepository.cs deleted file mode 100644 index 3b2cb25..0000000 --- a/VOL.MES/Repositories/mes/MES_EquipmentMaintenanceRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_EquipmentMaintenanceRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_EquipmentMaintenanceRepository : RepositoryBase , IMES_EquipmentMaintenanceRepository - { - public MES_EquipmentMaintenanceRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_EquipmentMaintenanceRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_EquipmentManagementRepository.cs b/VOL.MES/Repositories/mes/MES_EquipmentManagementRepository.cs deleted file mode 100644 index 0fad6ac..0000000 --- a/VOL.MES/Repositories/mes/MES_EquipmentManagementRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_EquipmentManagementRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_EquipmentManagementRepository : RepositoryBase , IMES_EquipmentManagementRepository - { - public MES_EquipmentManagementRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_EquipmentManagementRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_EquipmentRepairRepository.cs b/VOL.MES/Repositories/mes/MES_EquipmentRepairRepository.cs deleted file mode 100644 index b31c9bb..0000000 --- a/VOL.MES/Repositories/mes/MES_EquipmentRepairRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_EquipmentRepairRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_EquipmentRepairRepository : RepositoryBase , IMES_EquipmentRepairRepository - { - public MES_EquipmentRepairRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_EquipmentRepairRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_InventoryManagementRepository.cs b/VOL.MES/Repositories/mes/MES_InventoryManagementRepository.cs deleted file mode 100644 index 966d676..0000000 --- a/VOL.MES/Repositories/mes/MES_InventoryManagementRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_InventoryManagementRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_InventoryManagementRepository : RepositoryBase , IMES_InventoryManagementRepository - { - public MES_InventoryManagementRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_InventoryManagementRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_LocationManagementRepository.cs b/VOL.MES/Repositories/mes/MES_LocationManagementRepository.cs deleted file mode 100644 index a6acbd5..0000000 --- a/VOL.MES/Repositories/mes/MES_LocationManagementRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_LocationManagementRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using VOL.Core.DbContext; - -namespace VOL.MES.Repositories -{ - public partial class MES_LocationManagementRepository : RepositoryBase , IMES_LocationManagementRepository - { - public MES_LocationManagementRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_LocationManagementRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_MaterialCatalogRepository.cs b/VOL.MES/Repositories/mes/MES_MaterialCatalogRepository.cs deleted file mode 100644 index 37ac280..0000000 --- a/VOL.MES/Repositories/mes/MES_MaterialCatalogRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_MaterialCatalogRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_MaterialCatalogRepository : RepositoryBase , IMES_MaterialCatalogRepository - { - public MES_MaterialCatalogRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_MaterialCatalogRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_MaterialRepository.cs b/VOL.MES/Repositories/mes/MES_MaterialRepository.cs deleted file mode 100644 index 812dbd0..0000000 --- a/VOL.MES/Repositories/mes/MES_MaterialRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_MaterialRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_MaterialRepository : RepositoryBase , IMES_MaterialRepository - { - public MES_MaterialRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_MaterialRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_ProcessReportRepository.cs b/VOL.MES/Repositories/mes/MES_ProcessReportRepository.cs deleted file mode 100644 index 64b3880..0000000 --- a/VOL.MES/Repositories/mes/MES_ProcessReportRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_ProcessReportRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_ProcessReportRepository : RepositoryBase , IMES_ProcessReportRepository - { - public MES_ProcessReportRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_ProcessReportRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_ProcessRepository.cs b/VOL.MES/Repositories/mes/MES_ProcessRepository.cs deleted file mode 100644 index 2d5d68e..0000000 --- a/VOL.MES/Repositories/mes/MES_ProcessRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_ProcessRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_ProcessRepository : RepositoryBase , IMES_ProcessRepository - { - public MES_ProcessRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_ProcessRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_ProcessRouteRepository.cs b/VOL.MES/Repositories/mes/MES_ProcessRouteRepository.cs deleted file mode 100644 index 283755c..0000000 --- a/VOL.MES/Repositories/mes/MES_ProcessRouteRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_ProcessRouteRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_ProcessRouteRepository : RepositoryBase , IMES_ProcessRouteRepository - { - public MES_ProcessRouteRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_ProcessRouteRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_ProductInboundRepository.cs b/VOL.MES/Repositories/mes/MES_ProductInboundRepository.cs deleted file mode 100644 index 9f1a755..0000000 --- a/VOL.MES/Repositories/mes/MES_ProductInboundRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_ProductInboundRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_ProductInboundRepository : RepositoryBase , IMES_ProductInboundRepository - { - public MES_ProductInboundRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_ProductInboundRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_ProductOutboundRepository.cs b/VOL.MES/Repositories/mes/MES_ProductOutboundRepository.cs deleted file mode 100644 index 070e6d3..0000000 --- a/VOL.MES/Repositories/mes/MES_ProductOutboundRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_ProductOutboundRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_ProductOutboundRepository : RepositoryBase , IMES_ProductOutboundRepository - { - public MES_ProductOutboundRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_ProductOutboundRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_ProductionLineDeviceRepository.cs b/VOL.MES/Repositories/mes/MES_ProductionLineDeviceRepository.cs deleted file mode 100644 index b78c2a5..0000000 --- a/VOL.MES/Repositories/mes/MES_ProductionLineDeviceRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_ProductionLineDeviceRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_ProductionLineDeviceRepository : RepositoryBase , IMES_ProductionLineDeviceRepository - { - public MES_ProductionLineDeviceRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_ProductionLineDeviceRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_ProductionLineRepository.cs b/VOL.MES/Repositories/mes/MES_ProductionLineRepository.cs deleted file mode 100644 index dbd1374..0000000 --- a/VOL.MES/Repositories/mes/MES_ProductionLineRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_ProductionLineRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_ProductionLineRepository : RepositoryBase , IMES_ProductionLineRepository - { - public MES_ProductionLineRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_ProductionLineRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_ProductionOrderRepository.cs b/VOL.MES/Repositories/mes/MES_ProductionOrderRepository.cs deleted file mode 100644 index cbce1f0..0000000 --- a/VOL.MES/Repositories/mes/MES_ProductionOrderRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_ProductionOrderRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_ProductionOrderRepository : RepositoryBase , IMES_ProductionOrderRepository - { - public MES_ProductionOrderRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_ProductionOrderRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_ProductionPlanChangeRecordRepository.cs b/VOL.MES/Repositories/mes/MES_ProductionPlanChangeRecordRepository.cs deleted file mode 100644 index 586c638..0000000 --- a/VOL.MES/Repositories/mes/MES_ProductionPlanChangeRecordRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_ProductionPlanChangeRecordRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_ProductionPlanChangeRecordRepository : RepositoryBase , IMES_ProductionPlanChangeRecordRepository - { - public MES_ProductionPlanChangeRecordRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_ProductionPlanChangeRecordRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_ProductionPlanDetailRepository.cs b/VOL.MES/Repositories/mes/MES_ProductionPlanDetailRepository.cs deleted file mode 100644 index 4c052f0..0000000 --- a/VOL.MES/Repositories/mes/MES_ProductionPlanDetailRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_ProductionPlanDetailRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_ProductionPlanDetailRepository : RepositoryBase , IMES_ProductionPlanDetailRepository - { - public MES_ProductionPlanDetailRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_ProductionPlanDetailRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_ProductionReportingDetailRepository.cs b/VOL.MES/Repositories/mes/MES_ProductionReportingDetailRepository.cs deleted file mode 100644 index 7741fec..0000000 --- a/VOL.MES/Repositories/mes/MES_ProductionReportingDetailRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_ProductionReportingDetailRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_ProductionReportingDetailRepository : RepositoryBase , IMES_ProductionReportingDetailRepository - { - public MES_ProductionReportingDetailRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_ProductionReportingDetailRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_ProductionReportingRepository.cs b/VOL.MES/Repositories/mes/MES_ProductionReportingRepository.cs deleted file mode 100644 index e28d133..0000000 --- a/VOL.MES/Repositories/mes/MES_ProductionReportingRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_ProductionReportingRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_ProductionReportingRepository : RepositoryBase , IMES_ProductionReportingRepository - { - public MES_ProductionReportingRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_ProductionReportingRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_QualityInspectionPlanDetailRepository.cs b/VOL.MES/Repositories/mes/MES_QualityInspectionPlanDetailRepository.cs deleted file mode 100644 index 7c707a8..0000000 --- a/VOL.MES/Repositories/mes/MES_QualityInspectionPlanDetailRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_QualityInspectionPlanDetailRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_QualityInspectionPlanDetailRepository : RepositoryBase , IMES_QualityInspectionPlanDetailRepository - { - public MES_QualityInspectionPlanDetailRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_QualityInspectionPlanDetailRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_QualityInspectionPlanRepository.cs b/VOL.MES/Repositories/mes/MES_QualityInspectionPlanRepository.cs deleted file mode 100644 index 05236ad..0000000 --- a/VOL.MES/Repositories/mes/MES_QualityInspectionPlanRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_QualityInspectionPlanRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_QualityInspectionPlanRepository : RepositoryBase , IMES_QualityInspectionPlanRepository - { - public MES_QualityInspectionPlanRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_QualityInspectionPlanRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_QualityInspectionRecordRepository.cs b/VOL.MES/Repositories/mes/MES_QualityInspectionRecordRepository.cs deleted file mode 100644 index b845b61..0000000 --- a/VOL.MES/Repositories/mes/MES_QualityInspectionRecordRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_QualityInspectionRecordRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_QualityInspectionRecordRepository : RepositoryBase , IMES_QualityInspectionRecordRepository - { - public MES_QualityInspectionRecordRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_QualityInspectionRecordRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_SchedulingPlanRepository.cs b/VOL.MES/Repositories/mes/MES_SchedulingPlanRepository.cs deleted file mode 100644 index 0c8e44b..0000000 --- a/VOL.MES/Repositories/mes/MES_SchedulingPlanRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_SchedulingPlanRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_SchedulingPlanRepository : RepositoryBase , IMES_SchedulingPlanRepository - { - public MES_SchedulingPlanRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_SchedulingPlanRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_SupplierRepository.cs b/VOL.MES/Repositories/mes/MES_SupplierRepository.cs deleted file mode 100644 index 47fb864..0000000 --- a/VOL.MES/Repositories/mes/MES_SupplierRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_SupplierRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_SupplierRepository : RepositoryBase , IMES_SupplierRepository - { - public MES_SupplierRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_SupplierRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/MES_WarehouseManagementRepository.cs b/VOL.MES/Repositories/mes/MES_WarehouseManagementRepository.cs deleted file mode 100644 index 1f7a333..0000000 --- a/VOL.MES/Repositories/mes/MES_WarehouseManagementRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹MES_WarehouseManagementRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class MES_WarehouseManagementRepository : RepositoryBase , IMES_WarehouseManagementRepository - { - public MES_WarehouseManagementRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static IMES_WarehouseManagementRepository Instance - { - get { return AutofacContainerModule.GetService(); } } - } -} diff --git a/VOL.MES/Repositories/mes/TestServiceRepository.cs b/VOL.MES/Repositories/mes/TestServiceRepository.cs deleted file mode 100644 index 8c16fa8..0000000 --- a/VOL.MES/Repositories/mes/TestServiceRepository.cs +++ /dev/null @@ -1,26 +0,0 @@ -/* - *代码由框架生成,任何更改都可能导致被代码生成器覆盖 - *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹TestServiceRepository编写代码 - */ -using VOL.MES.IRepositories; -using VOL.Core.BaseProvider; -using VOL.Core.DbContext; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Repositories -{ - public partial class TestServiceRepository : RepositoryBase - , ITestServiceRepository - { - public TestServiceRepository(VOLContext dbContext) - : base(dbContext) - { - - } - public static ITestServiceRepository Instance - { - get { return AutofacContainerModule.GetService - (); } } - } - } diff --git a/VOL.MES/Services/mes/MES_Bom_DetailService.cs b/VOL.MES/Services/mes/MES_Bom_DetailService.cs deleted file mode 100644 index b6e57ce..0000000 --- a/VOL.MES/Services/mes/MES_Bom_DetailService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_Bom_DetailService与IMES_Bom_DetailService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_Bom_DetailService : ServiceBase - , IMES_Bom_DetailService, IDependency - { - public static IMES_Bom_DetailService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_Bom_MainService.cs b/VOL.MES/Services/mes/MES_Bom_MainService.cs deleted file mode 100644 index 2d78fd3..0000000 --- a/VOL.MES/Services/mes/MES_Bom_MainService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_Bom_MainService与IMES_Bom_MainService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_Bom_MainService : ServiceBase - , IMES_Bom_MainService, IDependency - { - public static IMES_Bom_MainService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_CustomerService.cs b/VOL.MES/Services/mes/MES_CustomerService.cs deleted file mode 100644 index 6515d1e..0000000 --- a/VOL.MES/Services/mes/MES_CustomerService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_CustomerService与IMES_CustomerService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_CustomerService : ServiceBase - , IMES_CustomerService, IDependency - { - public static IMES_CustomerService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_DefectiveProductDisposalRecordService.cs b/VOL.MES/Services/mes/MES_DefectiveProductDisposalRecordService.cs deleted file mode 100644 index bf2028f..0000000 --- a/VOL.MES/Services/mes/MES_DefectiveProductDisposalRecordService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_DefectiveProductDisposalRecordService与IMES_DefectiveProductDisposalRecordService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_DefectiveProductDisposalRecordService : ServiceBase - , IMES_DefectiveProductDisposalRecordService, IDependency - { - public static IMES_DefectiveProductDisposalRecordService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_DefectiveProductRecordService.cs b/VOL.MES/Services/mes/MES_DefectiveProductRecordService.cs deleted file mode 100644 index 0ba93fe..0000000 --- a/VOL.MES/Services/mes/MES_DefectiveProductRecordService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_DefectiveProductRecordService与IMES_DefectiveProductRecordService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_DefectiveProductRecordService : ServiceBase - , IMES_DefectiveProductRecordService, IDependency - { - public static IMES_DefectiveProductRecordService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_EquipmentFaultRecordService.cs b/VOL.MES/Services/mes/MES_EquipmentFaultRecordService.cs deleted file mode 100644 index 36dcb73..0000000 --- a/VOL.MES/Services/mes/MES_EquipmentFaultRecordService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_EquipmentFaultRecordService与IMES_EquipmentFaultRecordService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_EquipmentFaultRecordService : ServiceBase - , IMES_EquipmentFaultRecordService, IDependency - { - public static IMES_EquipmentFaultRecordService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_EquipmentMaintenanceService.cs b/VOL.MES/Services/mes/MES_EquipmentMaintenanceService.cs deleted file mode 100644 index c4ce069..0000000 --- a/VOL.MES/Services/mes/MES_EquipmentMaintenanceService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_EquipmentMaintenanceService与IMES_EquipmentMaintenanceService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_EquipmentMaintenanceService : ServiceBase - , IMES_EquipmentMaintenanceService, IDependency - { - public static IMES_EquipmentMaintenanceService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_EquipmentManagementService.cs b/VOL.MES/Services/mes/MES_EquipmentManagementService.cs deleted file mode 100644 index e321427..0000000 --- a/VOL.MES/Services/mes/MES_EquipmentManagementService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_EquipmentManagementService与IMES_EquipmentManagementService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_EquipmentManagementService : ServiceBase - , IMES_EquipmentManagementService, IDependency - { - public static IMES_EquipmentManagementService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_EquipmentRepairService.cs b/VOL.MES/Services/mes/MES_EquipmentRepairService.cs deleted file mode 100644 index a379252..0000000 --- a/VOL.MES/Services/mes/MES_EquipmentRepairService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_EquipmentRepairService与IMES_EquipmentRepairService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_EquipmentRepairService : ServiceBase - , IMES_EquipmentRepairService, IDependency - { - public static IMES_EquipmentRepairService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_InventoryManagementService.cs b/VOL.MES/Services/mes/MES_InventoryManagementService.cs deleted file mode 100644 index eacedae..0000000 --- a/VOL.MES/Services/mes/MES_InventoryManagementService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_InventoryManagementService与IMES_InventoryManagementService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_InventoryManagementService : ServiceBase - , IMES_InventoryManagementService, IDependency - { - public static IMES_InventoryManagementService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_LocationManagementService.cs b/VOL.MES/Services/mes/MES_LocationManagementService.cs deleted file mode 100644 index f98700c..0000000 --- a/VOL.MES/Services/mes/MES_LocationManagementService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_LocationManagementService与IMES_LocationManagementService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_LocationManagementService : ServiceBase - , IMES_LocationManagementService, IDependency - { - public static IMES_LocationManagementService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_MaterialCatalogService.cs b/VOL.MES/Services/mes/MES_MaterialCatalogService.cs deleted file mode 100644 index e0fe3a7..0000000 --- a/VOL.MES/Services/mes/MES_MaterialCatalogService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_MaterialCatalogService与IMES_MaterialCatalogService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_MaterialCatalogService : ServiceBase - , IMES_MaterialCatalogService, IDependency - { - public static IMES_MaterialCatalogService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_MaterialService.cs b/VOL.MES/Services/mes/MES_MaterialService.cs deleted file mode 100644 index 0ee3625..0000000 --- a/VOL.MES/Services/mes/MES_MaterialService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_MaterialService与IMES_MaterialService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_MaterialService : ServiceBase - , IMES_MaterialService, IDependency - { - public static IMES_MaterialService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_ProcessReportService.cs b/VOL.MES/Services/mes/MES_ProcessReportService.cs deleted file mode 100644 index 28ddeff..0000000 --- a/VOL.MES/Services/mes/MES_ProcessReportService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_ProcessReportService与IMES_ProcessReportService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_ProcessReportService : ServiceBase - , IMES_ProcessReportService, IDependency - { - public static IMES_ProcessReportService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_ProcessRouteService.cs b/VOL.MES/Services/mes/MES_ProcessRouteService.cs deleted file mode 100644 index 768a367..0000000 --- a/VOL.MES/Services/mes/MES_ProcessRouteService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_ProcessRouteService与IMES_ProcessRouteService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_ProcessRouteService : ServiceBase - , IMES_ProcessRouteService, IDependency - { - public static IMES_ProcessRouteService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_ProcessService.cs b/VOL.MES/Services/mes/MES_ProcessService.cs deleted file mode 100644 index 7c4a465..0000000 --- a/VOL.MES/Services/mes/MES_ProcessService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_ProcessService与IMES_ProcessService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_ProcessService : ServiceBase - , IMES_ProcessService, IDependency - { - public static IMES_ProcessService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_ProductInboundService.cs b/VOL.MES/Services/mes/MES_ProductInboundService.cs deleted file mode 100644 index a84436a..0000000 --- a/VOL.MES/Services/mes/MES_ProductInboundService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_ProductInboundService与IMES_ProductInboundService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_ProductInboundService : ServiceBase - , IMES_ProductInboundService, IDependency - { - public static IMES_ProductInboundService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_ProductOutboundService.cs b/VOL.MES/Services/mes/MES_ProductOutboundService.cs deleted file mode 100644 index 84bec45..0000000 --- a/VOL.MES/Services/mes/MES_ProductOutboundService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_ProductOutboundService与IMES_ProductOutboundService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_ProductOutboundService : ServiceBase - , IMES_ProductOutboundService, IDependency - { - public static IMES_ProductOutboundService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_ProductionLineDeviceService.cs b/VOL.MES/Services/mes/MES_ProductionLineDeviceService.cs deleted file mode 100644 index e975f1d..0000000 --- a/VOL.MES/Services/mes/MES_ProductionLineDeviceService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_ProductionLineDeviceService与IMES_ProductionLineDeviceService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_ProductionLineDeviceService : ServiceBase - , IMES_ProductionLineDeviceService, IDependency - { - public static IMES_ProductionLineDeviceService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_ProductionLineService.cs b/VOL.MES/Services/mes/MES_ProductionLineService.cs deleted file mode 100644 index 073db42..0000000 --- a/VOL.MES/Services/mes/MES_ProductionLineService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_ProductionLineService与IMES_ProductionLineService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_ProductionLineService : ServiceBase - , IMES_ProductionLineService, IDependency - { - public static IMES_ProductionLineService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_ProductionOrderService.cs b/VOL.MES/Services/mes/MES_ProductionOrderService.cs deleted file mode 100644 index 7370bb7..0000000 --- a/VOL.MES/Services/mes/MES_ProductionOrderService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_ProductionOrderService与IMES_ProductionOrderService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_ProductionOrderService : ServiceBase - , IMES_ProductionOrderService, IDependency - { - public static IMES_ProductionOrderService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_ProductionPlanChangeRecordService.cs b/VOL.MES/Services/mes/MES_ProductionPlanChangeRecordService.cs deleted file mode 100644 index cdc8b43..0000000 --- a/VOL.MES/Services/mes/MES_ProductionPlanChangeRecordService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_ProductionPlanChangeRecordService与IMES_ProductionPlanChangeRecordService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_ProductionPlanChangeRecordService : ServiceBase - , IMES_ProductionPlanChangeRecordService, IDependency - { - public static IMES_ProductionPlanChangeRecordService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_ProductionPlanDetailService.cs b/VOL.MES/Services/mes/MES_ProductionPlanDetailService.cs deleted file mode 100644 index 409d311..0000000 --- a/VOL.MES/Services/mes/MES_ProductionPlanDetailService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_ProductionPlanDetailService与IMES_ProductionPlanDetailService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_ProductionPlanDetailService : ServiceBase - , IMES_ProductionPlanDetailService, IDependency - { - public static IMES_ProductionPlanDetailService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_ProductionReportingDetailService.cs b/VOL.MES/Services/mes/MES_ProductionReportingDetailService.cs deleted file mode 100644 index 3a50e72..0000000 --- a/VOL.MES/Services/mes/MES_ProductionReportingDetailService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_ProductionReportingDetailService与IMES_ProductionReportingDetailService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_ProductionReportingDetailService : ServiceBase - , IMES_ProductionReportingDetailService, IDependency - { - public static IMES_ProductionReportingDetailService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_ProductionReportingService.cs b/VOL.MES/Services/mes/MES_ProductionReportingService.cs deleted file mode 100644 index ae3d23d..0000000 --- a/VOL.MES/Services/mes/MES_ProductionReportingService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_ProductionReportingService与IMES_ProductionReportingService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_ProductionReportingService : ServiceBase - , IMES_ProductionReportingService, IDependency - { - public static IMES_ProductionReportingService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_QualityInspectionPlanDetailService.cs b/VOL.MES/Services/mes/MES_QualityInspectionPlanDetailService.cs deleted file mode 100644 index c46cbdc..0000000 --- a/VOL.MES/Services/mes/MES_QualityInspectionPlanDetailService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_QualityInspectionPlanDetailService与IMES_QualityInspectionPlanDetailService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_QualityInspectionPlanDetailService : ServiceBase - , IMES_QualityInspectionPlanDetailService, IDependency - { - public static IMES_QualityInspectionPlanDetailService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_QualityInspectionPlanService.cs b/VOL.MES/Services/mes/MES_QualityInspectionPlanService.cs deleted file mode 100644 index a0e4f3d..0000000 --- a/VOL.MES/Services/mes/MES_QualityInspectionPlanService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_QualityInspectionPlanService与IMES_QualityInspectionPlanService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_QualityInspectionPlanService : ServiceBase - , IMES_QualityInspectionPlanService, IDependency - { - public static IMES_QualityInspectionPlanService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_QualityInspectionRecordService.cs b/VOL.MES/Services/mes/MES_QualityInspectionRecordService.cs deleted file mode 100644 index 056106c..0000000 --- a/VOL.MES/Services/mes/MES_QualityInspectionRecordService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_QualityInspectionRecordService与IMES_QualityInspectionRecordService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_QualityInspectionRecordService : ServiceBase - , IMES_QualityInspectionRecordService, IDependency - { - public static IMES_QualityInspectionRecordService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_SchedulingPlanService.cs b/VOL.MES/Services/mes/MES_SchedulingPlanService.cs deleted file mode 100644 index e6bfd3f..0000000 --- a/VOL.MES/Services/mes/MES_SchedulingPlanService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_SchedulingPlanService与IMES_SchedulingPlanService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_SchedulingPlanService : ServiceBase - , IMES_SchedulingPlanService, IDependency - { - public static IMES_SchedulingPlanService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_SupplierService.cs b/VOL.MES/Services/mes/MES_SupplierService.cs deleted file mode 100644 index 1499a48..0000000 --- a/VOL.MES/Services/mes/MES_SupplierService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_SupplierService与IMES_SupplierService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_SupplierService : ServiceBase - , IMES_SupplierService, IDependency - { - public static IMES_SupplierService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/MES_WarehouseManagementService.cs b/VOL.MES/Services/mes/MES_WarehouseManagementService.cs deleted file mode 100644 index 33e6f90..0000000 --- a/VOL.MES/Services/mes/MES_WarehouseManagementService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下MES_WarehouseManagementService与IMES_WarehouseManagementService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class MES_WarehouseManagementService : ServiceBase - , IMES_WarehouseManagementService, IDependency - { - public static IMES_WarehouseManagementService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/Services/mes/Partial/MES_Bom_DetailService.cs b/VOL.MES/Services/mes/Partial/MES_Bom_DetailService.cs deleted file mode 100644 index 0c3163c..0000000 --- a/VOL.MES/Services/mes/Partial/MES_Bom_DetailService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_Bom_Detail类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_Bom_DetailService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_Bom_DetailService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_Bom_DetailRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_Bom_DetailService( - IMES_Bom_DetailRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_Bom_MainService.cs b/VOL.MES/Services/mes/Partial/MES_Bom_MainService.cs deleted file mode 100644 index b2b339b..0000000 --- a/VOL.MES/Services/mes/Partial/MES_Bom_MainService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_Bom_Main类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_Bom_MainService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_Bom_MainService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_Bom_MainRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_Bom_MainService( - IMES_Bom_MainRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_CustomerService.cs b/VOL.MES/Services/mes/Partial/MES_CustomerService.cs deleted file mode 100644 index f25ec56..0000000 --- a/VOL.MES/Services/mes/Partial/MES_CustomerService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_Customer类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_CustomerService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_CustomerService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_CustomerRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_CustomerService( - IMES_CustomerRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_DefectiveProductDisposalRecordService.cs b/VOL.MES/Services/mes/Partial/MES_DefectiveProductDisposalRecordService.cs deleted file mode 100644 index b321ff6..0000000 --- a/VOL.MES/Services/mes/Partial/MES_DefectiveProductDisposalRecordService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_DefectiveProductDisposalRecord类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_DefectiveProductDisposalRecordService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_DefectiveProductDisposalRecordService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_DefectiveProductDisposalRecordRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_DefectiveProductDisposalRecordService( - IMES_DefectiveProductDisposalRecordRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_DefectiveProductRecordService.cs b/VOL.MES/Services/mes/Partial/MES_DefectiveProductRecordService.cs deleted file mode 100644 index 49dd64f..0000000 --- a/VOL.MES/Services/mes/Partial/MES_DefectiveProductRecordService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_DefectiveProductRecord类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_DefectiveProductRecordService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_DefectiveProductRecordService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_DefectiveProductRecordRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_DefectiveProductRecordService( - IMES_DefectiveProductRecordRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_EquipmentFaultRecordService.cs b/VOL.MES/Services/mes/Partial/MES_EquipmentFaultRecordService.cs deleted file mode 100644 index 55b06dd..0000000 --- a/VOL.MES/Services/mes/Partial/MES_EquipmentFaultRecordService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_EquipmentFaultRecord类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_EquipmentFaultRecordService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_EquipmentFaultRecordService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_EquipmentFaultRecordRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_EquipmentFaultRecordService( - IMES_EquipmentFaultRecordRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_EquipmentMaintenanceService.cs b/VOL.MES/Services/mes/Partial/MES_EquipmentMaintenanceService.cs deleted file mode 100644 index 7bd841b..0000000 --- a/VOL.MES/Services/mes/Partial/MES_EquipmentMaintenanceService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_EquipmentMaintenance类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_EquipmentMaintenanceService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_EquipmentMaintenanceService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_EquipmentMaintenanceRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_EquipmentMaintenanceService( - IMES_EquipmentMaintenanceRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_EquipmentManagementService.cs b/VOL.MES/Services/mes/Partial/MES_EquipmentManagementService.cs deleted file mode 100644 index c4cc9f4..0000000 --- a/VOL.MES/Services/mes/Partial/MES_EquipmentManagementService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_EquipmentManagement类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_EquipmentManagementService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_EquipmentManagementService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_EquipmentManagementRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_EquipmentManagementService( - IMES_EquipmentManagementRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_EquipmentRepairService.cs b/VOL.MES/Services/mes/Partial/MES_EquipmentRepairService.cs deleted file mode 100644 index d3498da..0000000 --- a/VOL.MES/Services/mes/Partial/MES_EquipmentRepairService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_EquipmentRepair类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_EquipmentRepairService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_EquipmentRepairService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_EquipmentRepairRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_EquipmentRepairService( - IMES_EquipmentRepairRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_InventoryManagementService.cs b/VOL.MES/Services/mes/Partial/MES_InventoryManagementService.cs deleted file mode 100644 index c10e243..0000000 --- a/VOL.MES/Services/mes/Partial/MES_InventoryManagementService.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - *所有关于MES_InventoryManagement类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_InventoryManagementService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; -using SqlSugar; -using VOL.Core.DbSqlSugar; -using VOL.Core.DBManager; - -namespace VOL.MES.Services -{ - public partial class MES_InventoryManagementService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_InventoryManagementRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_InventoryManagementService( - IMES_InventoryManagementRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - public override PageGridData GetPageData(PageDataOptions options) - { - SummaryExpress = (ISugarQueryable queryable) => - { - return queryable.Select(x => new - { - InventoryQuantity = SqlFunc.AggregateSum(x.InventoryQuantity).ToString("f2") - }) - .FirstOrDefault(); - }; - return base.GetPageData(options); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_LocationManagementService.cs b/VOL.MES/Services/mes/Partial/MES_LocationManagementService.cs deleted file mode 100644 index de75221..0000000 --- a/VOL.MES/Services/mes/Partial/MES_LocationManagementService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_LocationManagement类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_LocationManagementService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_LocationManagementService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_LocationManagementRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_LocationManagementService( - IMES_LocationManagementRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_MaterialCatalogService.cs b/VOL.MES/Services/mes/Partial/MES_MaterialCatalogService.cs deleted file mode 100644 index e7ae655..0000000 --- a/VOL.MES/Services/mes/Partial/MES_MaterialCatalogService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_MaterialCatalog类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_MaterialCatalogService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_MaterialCatalogService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_MaterialCatalogRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_MaterialCatalogService( - IMES_MaterialCatalogRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_MaterialService.cs b/VOL.MES/Services/mes/Partial/MES_MaterialService.cs deleted file mode 100644 index 1139e11..0000000 --- a/VOL.MES/Services/mes/Partial/MES_MaterialService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_Material类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_MaterialService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_MaterialService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_MaterialRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_MaterialService( - IMES_MaterialRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_ProcessReportService.cs b/VOL.MES/Services/mes/Partial/MES_ProcessReportService.cs deleted file mode 100644 index 849615c..0000000 --- a/VOL.MES/Services/mes/Partial/MES_ProcessReportService.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - *所有关于MES_ProcessReport类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_ProcessReportService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; -using SqlSugar; -using VOL.Core.DbSqlSugar; -using VOL.Core.DBManager; - -namespace VOL.MES.Services -{ - public partial class MES_ProcessReportService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_ProcessReportRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_ProcessReportService( - IMES_ProcessReportRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - - public override PageGridData GetPageData(PageDataOptions options) - { - SummaryExpress = (ISugarQueryable queryable) => - { - return queryable.Select(x => new - { - CompletedQuantity = SqlFunc.AggregateSum(x.CompletedQuantity).ToString("f2"), - DefectiveQuantity = SqlFunc.AggregateSum(x.DefectiveQuantity).ToString("f2") - }).FirstOrDefault(); - }; - return base.GetPageData(options); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_ProcessRouteService.cs b/VOL.MES/Services/mes/Partial/MES_ProcessRouteService.cs deleted file mode 100644 index 6efb54c..0000000 --- a/VOL.MES/Services/mes/Partial/MES_ProcessRouteService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_ProcessRoute类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_ProcessRouteService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_ProcessRouteService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_ProcessRouteRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_ProcessRouteService( - IMES_ProcessRouteRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_ProcessService.cs b/VOL.MES/Services/mes/Partial/MES_ProcessService.cs deleted file mode 100644 index 0191252..0000000 --- a/VOL.MES/Services/mes/Partial/MES_ProcessService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_Process类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_ProcessService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_ProcessService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_ProcessRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_ProcessService( - IMES_ProcessRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_ProductInboundService.cs b/VOL.MES/Services/mes/Partial/MES_ProductInboundService.cs deleted file mode 100644 index 6baa920..0000000 --- a/VOL.MES/Services/mes/Partial/MES_ProductInboundService.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - *所有关于MES_ProductInbound类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_ProductInboundService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; -using SqlSugar; -using VOL.Core.DbSqlSugar; -using VOL.Core.DBManager; - -namespace VOL.MES.Services -{ - public partial class MES_ProductInboundService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_ProductInboundRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_ProductInboundService( - IMES_ProductInboundRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - - public override PageGridData GetPageData(PageDataOptions options) - { - SummaryExpress = (ISugarQueryable queryable) => - { - return queryable.Select(x => new - { - InboundQuantity = SqlFunc.AggregateSum(x.InboundQuantity).ToString("f2") - }) - .FirstOrDefault(); - }; - return base.GetPageData(options); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_ProductOutboundService.cs b/VOL.MES/Services/mes/Partial/MES_ProductOutboundService.cs deleted file mode 100644 index a1a03d4..0000000 --- a/VOL.MES/Services/mes/Partial/MES_ProductOutboundService.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - *所有关于MES_ProductOutbound类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_ProductOutboundService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; -using SqlSugar; -using VOL.Core.DbSqlSugar; -using VOL.Core.DBManager; - -namespace VOL.MES.Services -{ - public partial class MES_ProductOutboundService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_ProductOutboundRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_ProductOutboundService( - IMES_ProductOutboundRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - - public override PageGridData GetPageData(PageDataOptions options) - { - SummaryExpress = (ISugarQueryable queryable) => - { - return queryable.Select(x => new - { - OutboundQuantity = SqlFunc.AggregateSum(x.OutboundQuantity).ToString("f2") - }) - .FirstOrDefault(); - }; - return base.GetPageData(options); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_ProductionLineDeviceService.cs b/VOL.MES/Services/mes/Partial/MES_ProductionLineDeviceService.cs deleted file mode 100644 index e0764ec..0000000 --- a/VOL.MES/Services/mes/Partial/MES_ProductionLineDeviceService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_ProductionLineDevice类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_ProductionLineDeviceService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_ProductionLineDeviceService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_ProductionLineDeviceRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_ProductionLineDeviceService( - IMES_ProductionLineDeviceRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_ProductionLineService.cs b/VOL.MES/Services/mes/Partial/MES_ProductionLineService.cs deleted file mode 100644 index 9d3afb7..0000000 --- a/VOL.MES/Services/mes/Partial/MES_ProductionLineService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_ProductionLine类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_ProductionLineService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_ProductionLineService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_ProductionLineRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_ProductionLineService( - IMES_ProductionLineRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_ProductionOrderService.cs b/VOL.MES/Services/mes/Partial/MES_ProductionOrderService.cs deleted file mode 100644 index 6669bc5..0000000 --- a/VOL.MES/Services/mes/Partial/MES_ProductionOrderService.cs +++ /dev/null @@ -1,68 +0,0 @@ -/* - *所有关于MES_ProductionOrder类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_ProductionOrderService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; -using SqlSugar; -using VOL.Core.DbSqlSugar; -using VOL.Core.DBManager; - -namespace VOL.MES.Services -{ - public partial class MES_ProductionOrderService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_ProductionOrderRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_ProductionOrderService( - IMES_ProductionOrderRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - public override PageGridData GetPageData(PageDataOptions options) - { - - SummaryExpress = (ISugarQueryable queryable) => - { - return queryable.Select(x => new - { - OrderQty = SqlFunc.AggregateSum(x.OrderQty) - }) - .FirstOrDefault(); - }; - return base.GetPageData(options); - } - protected override object GetDetailSummary(ISugarQueryable queryeable) - { - - //ef写法（需要与前端开发文档上的【table显示合计】一起使用） - return ((ISugarQueryable)queryeable) - .Select(x => new - { - PlanQuantity = SqlFunc.AggregateSum(x.PlanQuantity) - - }).FirstOrDefault(); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_ProductionPlanChangeRecordService.cs b/VOL.MES/Services/mes/Partial/MES_ProductionPlanChangeRecordService.cs deleted file mode 100644 index 4cdf515..0000000 --- a/VOL.MES/Services/mes/Partial/MES_ProductionPlanChangeRecordService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_ProductionPlanChangeRecord类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_ProductionPlanChangeRecordService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_ProductionPlanChangeRecordService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_ProductionPlanChangeRecordRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_ProductionPlanChangeRecordService( - IMES_ProductionPlanChangeRecordRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_ProductionPlanDetailService.cs b/VOL.MES/Services/mes/Partial/MES_ProductionPlanDetailService.cs deleted file mode 100644 index c442d18..0000000 --- a/VOL.MES/Services/mes/Partial/MES_ProductionPlanDetailService.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - *所有关于MES_ProductionPlanDetail类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_ProductionPlanDetailService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; -using SqlSugar; -using VOL.Core.DbSqlSugar; -using VOL.Core.DBManager; - -namespace VOL.MES.Services -{ - public partial class MES_ProductionPlanDetailService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_ProductionPlanDetailRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_ProductionPlanDetailService( - IMES_ProductionPlanDetailRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - public override PageGridData GetPageData(PageDataOptions options) - { - SummaryExpress = (ISugarQueryable queryable) => - { - return queryable.Select(x => new - { - //AvgPrice注意大小写和数据库字段大小写一样 - PlanQuantity = SqlFunc.AggregateSum(x.PlanQuantity) - }) - .FirstOrDefault(); - }; - return base.GetPageData(options); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_ProductionReportingDetailService.cs b/VOL.MES/Services/mes/Partial/MES_ProductionReportingDetailService.cs deleted file mode 100644 index 64a4877..0000000 --- a/VOL.MES/Services/mes/Partial/MES_ProductionReportingDetailService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_ProductionReportingDetail类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_ProductionReportingDetailService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_ProductionReportingDetailService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_ProductionReportingDetailRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_ProductionReportingDetailService( - IMES_ProductionReportingDetailRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_ProductionReportingService.cs b/VOL.MES/Services/mes/Partial/MES_ProductionReportingService.cs deleted file mode 100644 index e5cc408..0000000 --- a/VOL.MES/Services/mes/Partial/MES_ProductionReportingService.cs +++ /dev/null @@ -1,76 +0,0 @@ -/* - *所有关于MES_ProductionReporting类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_ProductionReportingService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; -using SqlSugar; -using VOL.Core.DbSqlSugar; -using VOL.Core.DBManager; - -namespace VOL.MES.Services -{ - public partial class MES_ProductionReportingService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_ProductionReportingRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_ProductionReportingService( - IMES_ProductionReportingRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - - public override PageGridData GetPageData(PageDataOptions options) - { - SummaryExpress = (ISugarQueryable queryable) => - { - return queryable.Select(o => new - { - //注意大小写和数据库字段大小写一样 - AcceptedQuantity = SqlFunc.AggregateSum(o.AcceptedQuantity), - RejectedQuantity = SqlFunc.AggregateSum(o.RejectedQuantity), - Total = SqlFunc.AggregateSum(o.Total), - ReportHour = SqlFunc.AggregateSum(o.ReportHour) - }) - .FirstOrDefault(); - }; - return base.GetPageData(options); - } - - protected override object GetDetailSummary(ISugarQueryable queryeable) - { - - //ef写法（需要与前端开发文档上的【table显示合计】一起使用） - return ((ISugarQueryable)queryeable).Select(o => new - { - //Weight/Qty注意大小写和数据库字段大小写一样 - AcceptedQuantity = SqlFunc.AggregateSum(o.AcceptedQuantity), - RejectedQuantity = SqlFunc.AggregateSum(o.RejectedQuantity), - ReportedQuantity = SqlFunc.AggregateSum(o.ReportedQuantity), - ReportHour = SqlFunc.AggregateSum(o.ReportHour) - - }).FirstOrDefault(); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_QualityInspectionPlanDetailService.cs b/VOL.MES/Services/mes/Partial/MES_QualityInspectionPlanDetailService.cs deleted file mode 100644 index 71c5ef7..0000000 --- a/VOL.MES/Services/mes/Partial/MES_QualityInspectionPlanDetailService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_QualityInspectionPlanDetail类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_QualityInspectionPlanDetailService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_QualityInspectionPlanDetailService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_QualityInspectionPlanDetailRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_QualityInspectionPlanDetailService( - IMES_QualityInspectionPlanDetailRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_QualityInspectionPlanService.cs b/VOL.MES/Services/mes/Partial/MES_QualityInspectionPlanService.cs deleted file mode 100644 index db70fb0..0000000 --- a/VOL.MES/Services/mes/Partial/MES_QualityInspectionPlanService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_QualityInspectionPlan类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_QualityInspectionPlanService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_QualityInspectionPlanService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_QualityInspectionPlanRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_QualityInspectionPlanService( - IMES_QualityInspectionPlanRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_QualityInspectionRecordService.cs b/VOL.MES/Services/mes/Partial/MES_QualityInspectionRecordService.cs deleted file mode 100644 index 20bd267..0000000 --- a/VOL.MES/Services/mes/Partial/MES_QualityInspectionRecordService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_QualityInspectionRecord类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_QualityInspectionRecordService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_QualityInspectionRecordService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_QualityInspectionRecordRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_QualityInspectionRecordService( - IMES_QualityInspectionRecordRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_SchedulingPlanService.cs b/VOL.MES/Services/mes/Partial/MES_SchedulingPlanService.cs deleted file mode 100644 index 4a41e2d..0000000 --- a/VOL.MES/Services/mes/Partial/MES_SchedulingPlanService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_SchedulingPlan类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_SchedulingPlanService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_SchedulingPlanService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_SchedulingPlanRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_SchedulingPlanService( - IMES_SchedulingPlanRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_SupplierService.cs b/VOL.MES/Services/mes/Partial/MES_SupplierService.cs deleted file mode 100644 index 40ff323..0000000 --- a/VOL.MES/Services/mes/Partial/MES_SupplierService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_Supplier类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_SupplierService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_SupplierService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_SupplierRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_SupplierService( - IMES_SupplierRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/Partial/MES_WarehouseManagementService.cs b/VOL.MES/Services/mes/Partial/MES_WarehouseManagementService.cs deleted file mode 100644 index 6e89d54..0000000 --- a/VOL.MES/Services/mes/Partial/MES_WarehouseManagementService.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - *所有关于MES_WarehouseManagement类的业务代码应在此处编写 -*可使用repository.调用常用方法，获取EF/Dapper等信息 -*如果需要事务请使用repository.DbContextBeginTransaction -*也可使用DBServerProvider.手动获取数据库相关信息 -*用户信息、权限、角色等使用UserContext.Current操作 -*MES_WarehouseManagementService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter -*/ -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; -using System.Linq; -using VOL.Core.Utilities; -using System.Linq.Expressions; -using VOL.Core.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Http; -using VOL.MES.IRepositories; - -namespace VOL.MES.Services -{ - public partial class MES_WarehouseManagementService - { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IMES_WarehouseManagementRepository _repository;//访问数据库 - - [ActivatorUtilitiesConstructor] - public MES_WarehouseManagementService( - IMES_WarehouseManagementRepository dbRepository, - IHttpContextAccessor httpContextAccessor - ) - : base(dbRepository) - { - _httpContextAccessor = httpContextAccessor; - _repository = dbRepository; - //多租户会用到这init代码，其他情况可以不用 - //base.Init(dbRepository); - } - } -} diff --git a/VOL.MES/Services/mes/TestServiceService.cs b/VOL.MES/Services/mes/TestServiceService.cs deleted file mode 100644 index b95da34..0000000 --- a/VOL.MES/Services/mes/TestServiceService.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - *Author：jxx - *Contact：283591387@qq.com - *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 - *所有业务编写全部应在Partial文件夹下TestServiceService与ITestServiceService中编写 - */ -using VOL.MES.IRepositories; -using VOL.MES.IServices; -using VOL.Core.BaseProvider; -using VOL.Core.Extensions.AutofacManager; -using VOL.Entity.DomainModels; - -namespace VOL.MES.Services -{ - public partial class TestServiceService : ServiceBase - , ITestServiceService, IDependency - { - public static ITestServiceService Instance - { - get { return AutofacContainerModule.GetService(); } } - } - } diff --git a/VOL.MES/VOL.MES.csproj b/VOL.MES/VOL.MES.csproj deleted file mode 100644 index 3399a2f..0000000 --- a/VOL.MES/VOL.MES.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - net8.0 - enable - enable - - - - 1701;1702;NU1902;NU1903;NU1904; - - - - 1701;1702;NU1902;NU1903;NU1904; - - - - - - - - diff --git a/VOL.WebApi/Controllers/HR/HR_DeptShipController.cs b/VOL.WebApi/Controllers/HR/HR_DeptShipController.cs new file mode 100644 index 0000000..bd1be2b --- /dev/null +++ b/VOL.WebApi/Controllers/HR/HR_DeptShipController.cs @@ -0,0 +1,21 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *如果要增加方法请在当前目录下Partial文件夹HR_DeptShipController编写 + */ +using Microsoft.AspNetCore.Mvc; +using VOL.Core.Controllers.Basic; +using VOL.Entity.AttributeManager; +using VOL.HR.IServices; +namespace VOL.HR.Controllers +{ + [Route("api/HR_DeptShip")] + [PermissionTable(Name = "HR_DeptShip")] + public partial class HR_DeptShipController : ApiBaseController + { + public HR_DeptShipController(IHR_DeptShipService service) + : base(service) + { + } + } +} + diff --git a/VOL.WebApi/Controllers/HR/HR_DeptSyncController.cs b/VOL.WebApi/Controllers/HR/HR_DeptSyncController.cs new file mode 100644 index 0000000..21d9613 --- /dev/null +++ b/VOL.WebApi/Controllers/HR/HR_DeptSyncController.cs @@ -0,0 +1,21 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *如果要增加方法请在当前目录下Partial文件夹HR_DeptSyncController编写 + */ +using Microsoft.AspNetCore.Mvc; +using VOL.Core.Controllers.Basic; +using VOL.Entity.AttributeManager; +using VOL.HR.IServices; +namespace VOL.HR.Controllers +{ + [Route("api/HR_DeptSync")] + [PermissionTable(Name = "HR_DeptSync")] + public partial class HR_DeptSyncController : ApiBaseController + { + public HR_DeptSyncController(IHR_DeptSyncService service) + : base(service) + { + } + } +} + diff --git a/VOL.WebApi/Controllers/HR/Partial/HR_DeptShipController.cs b/VOL.WebApi/Controllers/HR/Partial/HR_DeptShipController.cs new file mode 100644 index 0000000..b92b458 --- /dev/null +++ b/VOL.WebApi/Controllers/HR/Partial/HR_DeptShipController.cs @@ -0,0 +1,45 @@ +/* + *接口编写处... +*如果接口需要做Action的权限验证，请在Action上使用属性 +*如: [ApiActionPermission("HR_DeptShip",Enums.ActionPermissionOptions.Search)] + */ +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Http; +using VOL.Entity.DomainModels; +using VOL.HR.IServices; + +namespace VOL.HR.Controllers +{ + public partial class HR_DeptShipController + { + private readonly IHR_DeptShipService _service;//访问业务代码 + private readonly IHttpContextAccessor _httpContextAccessor; + + [ActivatorUtilitiesConstructor] + public HR_DeptShipController( + IHR_DeptShipService service, + IHttpContextAccessor httpContextAccessor + ) + : base(service) + { + _service = service; + _httpContextAccessor = httpContextAccessor; + } + + /// + /// table加载数据后刷新当前table数据的字典项(适用字典数据量比较大的情况) + /// + /// + /// + [HttpPost, Route("/api/HR_YSDepartments/getPageData")] + public async Task GetYSERPDepartments() + { + var depts = await Service.GetYSERPDepartments(); + return Json(depts); + } + } +} diff --git a/VOL.WebApi/Controllers/HR/Partial/HR_DeptSyncController.cs b/VOL.WebApi/Controllers/HR/Partial/HR_DeptSyncController.cs new file mode 100644 index 0000000..f4f4335 --- /dev/null +++ b/VOL.WebApi/Controllers/HR/Partial/HR_DeptSyncController.cs @@ -0,0 +1,33 @@ +/* + *接口编写处... +*如果接口需要做Action的权限验证，请在Action上使用属性 +*如: [ApiActionPermission("HR_DeptSync",Enums.ActionPermissionOptions.Search)] + */ +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Http; +using VOL.Entity.DomainModels; +using VOL.HR.IServices; + +namespace VOL.HR.Controllers +{ + public partial class HR_DeptSyncController + { + private readonly IHR_DeptSyncService _service;//访问业务代码 + private readonly IHttpContextAccessor _httpContextAccessor; + + [ActivatorUtilitiesConstructor] + public HR_DeptSyncController( + IHR_DeptSyncService service, + IHttpContextAccessor httpContextAccessor + ) + : base(service) + { + _service = service; + _httpContextAccessor = httpContextAccessor; + } + } +} diff --git a/VOL.WebApi/Controllers/HR/Partial/HR_EmployeeSyncController.cs b/VOL.WebApi/Controllers/HR/Partial/HR_EmployeeSyncController.cs index 9f4f11a..8d545f6 100644 --- a/VOL.WebApi/Controllers/HR/Partial/HR_EmployeeSyncController.cs +++ b/VOL.WebApi/Controllers/HR/Partial/HR_EmployeeSyncController.cs @@ -30,5 +30,42 @@ namespace VOL.HR.Controllers _service = service; _httpContextAccessor = httpContextAccessor; } + + + /// + /// + /// + /// + /// + [HttpPost, Route("/api/HR_YSEmployees/getPageData")] + public async Task GetYSAllEmployees() + { + var emps = await Service.GetAllYSEmployees(); + return Json(emps); + } + + /// + /// + /// + /// + /// + [HttpPost, Route("/api/HR_DingTalkEmployees/getPageData")] + public async Task GetAllDingTalkEmployees() + { + var emps = await Service.GetAllDingTalkEmployees(); + return Json(emps); + } + + /// + /// + /// + /// + /// + [HttpPost, Route("GenEmpSystemShip")] + public async Task GenEmpSystemShip() + { + await Service.GenEmpSystemShip(); + return Json(new { }); + } } } diff --git a/VOL.WebApi/Controllers/OSS/AliOSSController.cs b/VOL.WebApi/Controllers/OSS/AliOSSController.cs deleted file mode 100644 index f4f82ea..0000000 --- a/VOL.WebApi/Controllers/OSS/AliOSSController.cs +++ /dev/null @@ -1,87 +0,0 @@ -//using Aliyun.Acs.Core; -//using Aliyun.Acs.Core.Auth.Sts; -//using Aliyun.Acs.Core.Exceptions; -//using Aliyun.Acs.Core.Profile; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using VOL.Core.CacheManager; -using VOL.Core.Filters; -using VOL.Core.Services; -using VOL.Core.Utilities; - -namespace VOL.WebApi.Controllers.OSS -{ - /// - /// neuget包aliyun-net-sdk-core - /// - [JWTAuthorize, ApiController] - [Route("api/alioss")] - public class AliOSSController : Controller - { - private ICacheService _cache { get; set; } - public AliOSSController(ICacheService cache) - { - _cache = cache; - } - - [Route("getAccessToken"), HttpGet] - public object GetAccessToken() - { - - // //Region对照(创建创建 Bucket时选择的地域)https://oss.console.aliyun.com/bucket列表中的【地域】列，根据地域在下面的链接里面【Region ID】值 - // //https://help.aliyun.com/document_detail/31837.htm?spm=a2c4g.11186623.0.0.57a8396cwRnyQV#section-plb-2vy-5db - // string region = "oss-cn-beijing"; - - - ////https://ram.console.aliyun.com/users 用户点击进去里面找 - // string accessKeyID = "LTAI5tR4bQnBZqF8ruGiw123"; - // string accessKeySecret = "gZUwXdy1mVsPvROfNCsvmVWOeqi123"; - - //// https://ram.console.aliyun.com/roles/AliyunServiceRoleForSLSAudit 角色点进去找ARN - // string ARN = "acs:ram::1807122303681234:role/vol-role"; - // WebResponseContent webResponse = new WebResponseContent(); - - // //下面这些引用的neuget包aliyun-net-sdk-core - - // //获取sts凭证 - // IClientProfile profile = DefaultProfile.GetProfile(region, accessKeyID, accessKeySecret); - // DefaultAcsClient client = new DefaultAcsClient(profile); - // var request = new AssumeRoleRequest() - // { - // RoleArn = ARN, - // //这个 随便填写 - // RoleSessionName = "oss" - // }; - // try - // { - // var response = client.GetAcsResponse(request); - - // return Json(webResponse.OK(null, new - // { - // region, - // response.Credentials.AccessKeyId, - // response.Credentials.AccessKeySecret, - // response.Credentials.SecurityToken, - // Bucket= "vol-2023",//阿里云控制台创建的bucket名称 - // //Bucket所在具体文件夹 - // BucketFolder = "/" + DateTime.Now.ToString("yyyyMMdd"), - // //生成一个唯一标识防止文件重复 - // unique = DateTime.Now.ToString("HHmmsss") - // })); - - // } - // catch (ServerException e) - // { - // string message = $"获取sts异常：{e.Message + e.StackTrace}"; - // Console.WriteLine(message); - // Logger.Error(message); - // return Json(webResponse.Error(message)); - // } - return Content(""); - } - } -} diff --git a/VOL.WebApi/Dockerfile b/VOL.WebApi/Dockerfile index 781c706..f341e0e 100644 --- a/VOL.WebApi/Dockerfile +++ b/VOL.WebApi/Dockerfile @@ -16,7 +16,7 @@ COPY ["VOL.WebApi/VOL.WebApi.csproj", "VOL.WebApi/"] COPY ["VOL.Builder/VOL.Builder.csproj", "VOL.Builder/"] COPY ["VOL.Core/VOL.Core.csproj", "VOL.Core/"] COPY ["VOL.Entity/VOL.Entity.csproj", "VOL.Entity/"] -COPY ["VOL.MES/VOL.MES.csproj", "VOL.MES/"] +COPY ["VOL.HR/VOL.HR.csproj", "VOL.HR/"] COPY ["VOL.Sys/VOL.Sys.csproj", "VOL.Sys/"] RUN dotnet restore "./VOL.WebApi/VOL.WebApi.csproj" COPY . . diff --git a/VOL.WebApi/Download/ExcelExport/20250925/系统日志20250925181441.xlsx b/VOL.WebApi/Download/ExcelExport/20250925/系统日志20250925181441.xlsx new file mode 100644 index 0000000..84125ef Binary files /dev/null and b/VOL.WebApi/Download/ExcelExport/20250925/系统日志20250925181441.xlsx differ diff --git a/VOL.WebApi/Download/ExcelExport/20250925/系统日志20250925192501.xlsx b/VOL.WebApi/Download/ExcelExport/20250925/系统日志20250925192501.xlsx new file mode 100644 index 0000000..206cdff Binary files /dev/null and b/VOL.WebApi/Download/ExcelExport/20250925/系统日志20250925192501.xlsx differ diff --git a/VOL.WebApi/Download/ExcelExport/20250925/系统日志20250925195820.xlsx b/VOL.WebApi/Download/ExcelExport/20250925/系统日志20250925195820.xlsx new file mode 100644 index 0000000..a7f05d0 Binary files /dev/null and b/VOL.WebApi/Download/ExcelExport/20250925/系统日志20250925195820.xlsx differ diff --git a/VOL.WebApi/Download/Logger/Queue/WriteError/20250925.txt b/VOL.WebApi/Download/Logger/Queue/WriteError/20250925.txt index 802fc1e..26ce027 100644 --- a/VOL.WebApi/Download/Logger/Queue/WriteError/20250925.txt +++ b/VOL.WebApi/Download/Logger/Queue/WriteError/20250925.txt @@ -1,7 +1,12 @@ -中文提示 : 检测到你没有开启文件，AllowLoadLocalInfile=true加到自符串上，已自动执行 SET GLOBAL local_infile=1 在试一次 -English Message : Loading local data is disabled; this must be enabled on both the client and server sides at SqlSugar.Check.ExceptionEasy(String enMessage, String cnMessage) +Got timeout reading communication packets at MySqlConnector.Core.ServerSession.ReceiveReplyAsyncAwaited(ValueTask`1 task) in /_/src/MySqlConnector/Core/ServerSession.cs:line 962 + at MySqlConnector.Core.ResultSet.ReadResultSetHeaderAsync(IOBehavior ioBehavior) in /_/src/MySqlConnector/Core/ResultSet.cs:line 43 + at MySqlConnector.MySqlDataReader.ActivateResultSet(CancellationToken cancellationToken) in /_/src/MySqlConnector/MySqlDataReader.cs:line 130 + at MySqlConnector.MySqlDataReader.CreateAsync(CommandListPosition commandListPosition, ICommandPayloadCreator payloadCreator, IDictionary`2 cachedProcedures, IMySqlCommand command, CommandBehavior behavior, Activity activity, IOBehavior ioBehavior, CancellationToken cancellationToken) in /_/src/MySqlConnector/MySqlDataReader.cs:line 468 + at MySqlConnector.Core.CommandExecutor.ExecuteReaderAsync(IReadOnlyList`1 commands, ICommandPayloadCreator payloadCreator, CommandBehavior behavior, Activity activity, IOBehavior ioBehavior, CancellationToken cancellationToken) in /_/src/MySqlConnector/Core/CommandExecutor.cs:line 56 + at MySqlConnector.MySqlCommand.ExecuteNonQueryAsync(IOBehavior ioBehavior, CancellationToken cancellationToken) in /_/src/MySqlConnector/MySqlCommand.cs:line 296 + at MySqlConnector.MySqlBulkLoader.LoadAsync(IOBehavior ioBehavior, CancellationToken cancellationToken) in /_/src/MySqlConnector/MySqlBulkLoader.cs:line 213 at SqlSugar.MySqlFastBuilder.ExecuteBulkCopyAsync(DataTable dt) at SqlSugar.FastestProvider`1._BulkCopy(List`1 datas) at SqlSugar.FastestProvider`1.BulkCopyAsync(List`1 datas) at SqlSugar.FastestProvider`1.BulkCopy(List`1 datas) - at VOL.Core.Services.Logger.Start() in D:\Code\Laservall-Data-Center\vol.api.sqlsugar\VOL.Core\Services\Logger.cs:line 183SqlSugar + at VOL.Core.Services.Logger.Start() in D:\Code\Laservall-Data-Center\vol.api.sqlsugar\VOL.Core\Services\Logger.cs:line 183MySqlConnector diff --git a/VOL.WebApi/Startup.cs b/VOL.WebApi/Startup.cs index d6d20b1..8abaa49 100644 --- a/VOL.WebApi/Startup.cs +++ b/VOL.WebApi/Startup.cs @@ -123,8 +123,8 @@ namespace VOL.WebApi services.AddSwaggerGen(c => { //分为2份接口文档 - c.SwaggerDoc("v1", new OpenApiInfo { Title = "VOL.Core后台Api", Version = "v1", Description = "这是对文档的描述。。" }); - c.SwaggerDoc("v2", new OpenApiInfo { Title = "VOL.Core对外三方Api", Version = "v2", Description = "xxx接口文档" }); //控制器里使用[ApiExplorerSettings(GroupName = "v2")] + c.SwaggerDoc("v1", new OpenApiInfo { Title = "后台Api", Version = "v1", Description = "框架API组" }); + c.SwaggerDoc("v2", new OpenApiInfo { Title = "其余业务Api", Version = "v2", Description = "业务API组" }); //控制器里使用[ApiExplorerSettings(GroupName = "v2")] //启用中文注释功能 // var basePath = PlatformServices.Default.Application.ApplicationBasePath; // var xmlPath = Path.Combine(basePath, "VOL.WebApi.xml"); diff --git a/VOL.WebApi/appsettings.json b/VOL.WebApi/appsettings.json index 1559a95..ff98603 100644 --- a/VOL.WebApi/appsettings.json +++ b/VOL.WebApi/appsettings.json @@ -30,8 +30,8 @@ //Oracle连接字符串 //"DbConnectionString": "user id=C##NETCOREDEV;data source=127.0.0.1/ORCL;password=123456;", - "RedisConnectionString": "127.0.0.1,Password=123456,SyncTimeout=15000", //redis连接字符串(最好加密) - "UseRedis": "false", //是否使用redis，如果不使用，默认使用Memory内置缓存 + "RedisConnectionString": "127.0.0.1,SyncTimeout=15000", //redis连接字符串(最好加密) + "UseRedis": "true", //是否使用redis，如果不使用，默认使用Memory内置缓存 "UseSignalR": "true" //是否使用SignalR，注意需要将端的地址配置到下面的CorsUrls属性中 }, "Secret": { //秘钥配置 diff --git a/VOL.YSErp/Models/Biz/YSERPDepartment.cs b/VOL.YSErp/Models/Biz/YSERPDepartment.cs new file mode 100644 index 0000000..2b42a76 --- /dev/null +++ b/VOL.YSErp/Models/Biz/YSERPDepartment.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace VOL.YSErp.Models.Biz +{ + public class YSERPDepartment + { + /* + * + 名称 类型 数组 描述 + orgtype int 否 组织类型，1组织 2部门 + code string 否 编码 + sysid string 否 系统标识 + displayorder int 否 排序 + parentid string 否 上级节点主键 + dr int 否 删除标识，0未删除 1已删除 + parentCode string 否 上级节点编码 + parentorgid string 否 所属组织主键 + enable long 否 启用状态，0初始化 1启用 2停用 + is_biz_unit int 否 是否为业务单元，0否 1是 + tenantid string 否 租户标识 + name string 否 名称 + id string 否 主键ID + pubts string 否 时间戳，格式yyyy-MM-dd HH:mm:ss + */ + public int orgtype { get; set; } + public string code { get; set; } + public string sysid { get; set; } + public int displayorder { get; set; } + public string parentid { get; set; } + public int dr { get; set; } + public string parentCode { get; set; } + public string parentorgid { get; set; } + public int enable { get; set; } + public int is_biz_unit { get; set; } + public string tenantid { get; set; } + public string name { get; set; } + public string id { get; set; } + public string pubts { get; set; } + + } +} diff --git a/VOL.YSErp/Models/Biz/YSERPEmployee.cs b/VOL.YSErp/Models/Biz/YSERPEmployee.cs new file mode 100644 index 0000000..31e25bf --- /dev/null +++ b/VOL.YSErp/Models/Biz/YSERPEmployee.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace VOL.YSErp.Models.Biz +{ + public class YSERPEmployee + { + + public string code { get; set; } + public int dr { get; set; } + public string modifiedtime { get; set; } + public int enable { get; set; } + public int ordernumber { get; set; } + public string staffJob_deptPath { get; set; } + public string staffJobId { get; set; } + public string id { get; set; } + public string pubts { get; set; } + public string email { get; set; } + public string org_id_name { get; set; } + public string dept_id_name { get; set; } + public int sex { get; set; } + public string mobile { get; set; } + public string orgVid { get; set; } + public string staffJobCode { get; set; } + public string beginDate { get; set; } + public string user_id { get; set; } + public string org_id { get; set; } + public string name { get; set; } + public string staffJob_orgPath { get; set; } + public string dept_id { get; set; } + } +} diff --git a/VOL.YSErp/Models/Biz/YSERPEmployeeUpdateModel.cs b/VOL.YSErp/Models/Biz/YSERPEmployeeUpdateModel.cs new file mode 100644 index 0000000..c5c9e04 --- /dev/null +++ b/VOL.YSErp/Models/Biz/YSERPEmployeeUpdateModel.cs @@ -0,0 +1,613 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace VOL.YSErp.Models.Biz +{ + public class YSERPEmployeeUpdateModel + { + + public string code { get; set; } + public string name { get; set; } + public string certType { get; set; } + public string certNo { get; set; } + public string sex { get; set; } + public string birthDate { get; set; } + public string mobile { get; set; } + public string officeTel { get; set; } + public string email { get; set; } + public string selfEmail { get; set; } + public string joinWorkDate { get; set; } + public string linkAddr { get; set; } + public string education { get; set; } + public string degree { get; set; } + public string marital { get; set; } + public string bloodType { get; set; } + public bool isOnlyChild { get; set; } + public string characterrpr { get; set; } + public string permanreside { get; set; } + public string political { get; set; } + public string joinPolityDate { get; set; } + public string nationality { get; set; } + public string country { get; set; } + public string origin { get; set; } + public string qq { get; set; } + public string linkedIn { get; set; } + public string formerName { get; set; } + public string englishName { get; set; } + public string documentValidity { get; set; } + public string height { get; set; } + public string weight { get; set; } + public string postcode { get; set; } + public string birthPlace { get; set; } + public string religion { get; set; } + public string hobby { get; set; } + public string bizManTag { get; set; } + public string shopAssisTag { get; set; } + public string attachlist { get; set; } + public string weiXin { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + public string workAgeAdjType { get; set; } + public int workAgeAdjYea { get; set; } + public int workAgeAdjMon { get; set; } + public int workAgeAdjDay { get; set; } + public Stafflangability[] staffLangAbility { get; set; } + public Stafftechpost[] staffTechPost { get; set; } + public Staffass[] staffAss { get; set; } + public Staffcertificate[] staffCertificate { get; set; } + public Staffdotline[] staffDotline { get; set; } + public Staffbankacct[] staffBankAcct { get; set; } + public Staffpart[] staffPart { get; set; } + public Staffcert[] staffCert { get; set; } + public Staffsocialrel[] staffSocialRel { get; set; } + public Staffjob[] staffJob { get; set; } + public Stafftitle[] staffTitle { get; set; } + public Staffreward[] staffReward { get; set; } + public Staffprobation[] staffProbation { get; set; } + public Stafftrain[] staffTrain { get; set; } + public Staffresume[] staffResume { get; set; } + public Staffedu[] staffEdu { get; set; } + public Staffproqualify[] staffProqualify { get; set; } + public Staffctrt[] staffCtrt { get; set; } + public Defineset[] defineSet { get; set; } + public Dictionary staffDefines { get; set; } + public bool isReturn { get; set; } + public bool isUseNewCode { get; set; } + public string id { get; set; } + public Staffcadre[] staffCadre { get; set; } + public Staffpunishment[] staffPunishment { get; set; } + public Staffhealthsituation[] staffHealthSituation { get; set; } + public Staffsocietyemployment[] staffSocietyEmployment { get; set; } + public Staffdirectiorsupervisor[] staffDirectiorSupervisor { get; set; } + public Staffleadershiptrade[] staffLeadershipTrade { get; set; } + public Stafftrialevaluation[] staffTrialEvaluation { get; set; } + + + + } + + public class Stafflangability + { + public string proLevel { get; set; } + public string language { get; set; } + public string certNo { get; set; } + public string langLevel { get; set; } + public string memo { get; set; } + public string getDate { get; set; } + public string _status { get; set; } + public string certName { get; set; } + public Dictionary langDefines { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + + public class Stafftechpost + { + public string beginDate { get; set; } + public string endDate { get; set; } + public string title { get; set; } + public string ratingOrg { get; set; } + public bool isPrefs { get; set; } + public string certNo { get; set; } + public string memo { get; set; } + public string channel { get; set; } + public string level { get; set; } + public string professionalTitleSeries { get; set; } + public string subseries { get; set; } + public string qualificationNumber { get; set; } + public string professionSpecialties { get; set; } + public string acquisitionMethod { get; set; } + public string _status { get; set; } + public Dictionary tecDefines { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + + public class Staffass + { + public string beginDate { get; set; } + public string endDate { get; set; } + public string score { get; set; } + public string assDoc { get; set; } + public string rank { get; set; } + public string assPeriod { get; set; } + public string _status { get; set; } + public string memo { get; set; } + public Dictionary assDefines { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + + public class Staffcertificate + { + public string beginDate { get; set; } + public string certificateCode { get; set; } + public string endDate { get; set; } + public string authority { get; set; } + public string _status { get; set; } + public string certificateName { get; set; } + public Dictionary certificateDefines { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + public class Staffdotline + { + public string endDate { get; set; } + public string lineName { get; set; } + public string beginDate { get; set; } + public string lineType { get; set; } + public string memo { get; set; } + public string _status { get; set; } + public Dictionary dotlineDefines { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + + public class Staffbankacct + { + public string openBank { get; set; } + public string sysid { get; set; } + public int isDefaultCard { get; set; } + public string bank { get; set; } + public string acctType { get; set; } + public string currency { get; set; } + public string account { get; set; } + public string accountName { get; set; } + public string _status { get; set; } + public Dictionary bankDefines { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + + public class Staffpart + { + public string endDate { get; set; } + public string deptId { get; set; } + public bool endFlag { get; set; } + public string orgId { get; set; } + public string beginDate { get; set; } + public string postId { get; set; } + public string jobId { get; set; } + public string jobTypeId { get; set; } + public string memo { get; set; } + public string jobGradeId { get; set; } + public string director { get; set; } + public string addrId { get; set; } + public string staffFte { get; set; } + public string _status { get; set; } + public Dictionary staffPtJobDefines { get; set; } + public bool isweaken { get; set; } + public int trnsEvent { get; set; } + public string trnsType { get; set; } + public string trnsReason { get; set; } + public int effectiveNumber { get; set; } + public string partType { get; set; } + public string psnclId { get; set; } + public string empform { get; set; } + public string jobRankId { get; set; } + public string planEndDate { get; set; } + public string newPostId { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + public string otherJobType { get; set; } + } + + public class Staffcert + { + public string certNo { get; set; } + public string certType { get; set; } + public string endDate { get; set; } + public string memo { get; set; } + public string beginDate { get; set; } + public string extendOrg { get; set; } + public string _status { get; set; } + public Dictionary certDefines { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + + public class Staffsocialrel + { + public string relName { get; set; } + public string linkTel { get; set; } + public string relation { get; set; } + public string linkAddr { get; set; } + public string workCorp { get; set; } + public bool isUrgent { get; set; } + public string workDuty { get; set; } + public string certType { get; set; } + public string certNo { get; set; } + public string isRelocate { get; set; } + public Dictionary relationDefines { get; set; } + public string _status { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + public string certIssuePlace { get; set; } + } + + public class Staffjob + { + public string endDate { get; set; } + public string orgId { get; set; } + public string newAttachment { get; set; } + public string staffFte { get; set; } + public string psnclId { get; set; } + public string trnsType { get; set; } + public int trnsEvent { get; set; } + public string deptId { get; set; } + public string beginDate { get; set; } + public string memo { get; set; } + public string jobId { get; set; } + public string jobTypeId { get; set; } + public string postStatus { get; set; } + public string addrId { get; set; } + public string trnsReason { get; set; } + public string director { get; set; } + public string jobRankId { get; set; } + public string jobGradeId { get; set; } + public string postId { get; set; } + public string disexplain { get; set; } + public string dispositon { get; set; } + public string _status { get; set; } + public Dictionary staffJobDefines { get; set; } + public bool isweaken { get; set; } + public int effectiveNumber { get; set; } + public string newPostId { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + public class Stafftitle + { + public string certType { get; set; } + public string certCode { get; set; } + public string endDate { get; set; } + public string certRank { get; set; } + public bool isPrint { get; set; } + public string beginDate { get; set; } + public string assOrg { get; set; } + public string memo { get; set; } + public string proField { get; set; } + public string _status { get; set; } + public Dictionary titleDefines { get; set; } + public string dataCreateSource { get; set; } + } + + + public class Staffreward + { + public string rewardReason { get; set; } + public string rewardOrg { get; set; } + public string rewardDate { get; set; } + public string rewardItem { get; set; } + public string memo { get; set; } + public string _status { get; set; } + public Dictionary rewardDefines { get; set; } + public string rewardItem_supplement { get; set; } + public string rewardCategory { get; set; } + public string awardLevel { get; set; } + public string awardYear { get; set; } + public string awardGrade { get; set; } + public string approvalNo { get; set; } + public string certificateNo { get; set; } + public string rewardNature { get; set; } + public string incentives { get; set; } + public string approverCode { get; set; } + public string approverLevel { get; set; } + public string approvalTime { get; set; } + public string awardCancellation { get; set; } + public string awardCancellationTime { get; set; } + public string cancellationReason { get; set; } + public string newAttachment { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + + public class Staffprobation + { + public int result { get; set; } + public string beginDate { get; set; } + public string positiveDate { get; set; } + public string endDate { get; set; } + public bool endFlag { get; set; } + public int type { get; set; } + public string memo { get; set; } + public string _status { get; set; } + public Dictionary probationDefines { get; set; } + public int promonth { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + public class Stafftrain + { + public string beginDate { get; set; } + public string endDate { get; set; } + public string content { get; set; } + public string status { get; set; } + public string earnHours { get; set; } + public string earnCredit { get; set; } + public string courseId { get; set; } + public string classifiCation { get; set; } + public string hours { get; set; } + public string memo { get; set; } + public string protocolNo { get; set; } + public string fee { get; set; } + public string score { get; set; } + public string dayOrHours { get; set; } + public string _status { get; set; } + public Dictionary trainDefines { get; set; } + public string trainProjectName { get; set; } + public string trainProjectCode { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + public string trainingChannels { get; set; } + public string trainingType { get; set; } + public string trainingLocation { get; set; } + } + + + public class Staffresume + { + public string workCorp { get; set; } + public string beginDate { get; set; } + public string workDept { get; set; } + public string endDate { get; set; } + public string memo { get; set; } + public string workDuty { get; set; } + public string workPost { get; set; } + public string workJob { get; set; } + public string certifier { get; set; } + public string _status { get; set; } + public Dictionary resumeDefines { get; set; } + public int resumeType { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + public class Staffedu + { + public string education { get; set; } + public string endDate { get; set; } + public string degree { get; set; } + public string beginDate { get; set; } + public string newAttachment { get; set; } + public string studyMode { get; set; } + public string major { get; set; } + public string memo { get; set; } + public string eduSystem { get; set; } + public string certifCode { get; set; } + public string educationCtifCode { get; set; } + public string isPrefs { get; set; } + public string school { get; set; } + public string _status { get; set; } + public Dictionary eduDefines { get; set; } + public string isHighestDegree { get; set; } + public string isHighestFullDegree { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + + public class Staffproqualify + { + public string beginDate { get; set; } + public string getDate { get; set; } + public string title { get; set; } + public string memo { get; set; } + public string certNo { get; set; } + public string ratingOrg { get; set; } + public string isPrefs { get; set; } + public string endDate { get; set; } + public string _status { get; set; } + public Dictionary proqualifyDefines { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + + public class Staffctrt + { + public int continueTime { get; set; } + public string endDate { get; set; } + public int termType { get; set; } + public string signDate { get; set; } + public string probEndDate { get; set; } + public string newAttachment { get; set; } + public int termMonth { get; set; } + public string majorCorpId { get; set; } + public string workAddr { get; set; } + public bool isReceive { get; set; } + public int contType { get; set; } + public string beginDate { get; set; } + public int probSalary { get; set; } + public int proMonth { get; set; } + public string contractNum { get; set; } + public string neconomy { get; set; } + public string startSalary { get; set; } + public string unchReason { get; set; } + public string memo { get; set; } + public string contractCode { get; set; } + public string presenter { get; set; } + public string breachMoney { get; set; } + public string proBeginDate { get; set; } + public string _status { get; set; } + public Dictionary ctrtDefines { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + + public class Defineset + { + public string _status { get; set; } + } + + public class Staffcadre + { + public string FormOfAppointment { get; set; } + public string appointmentApprovalUnit { get; set; } + public string appointmentDeadline { get; set; } + public string appointmentNumber { get; set; } + public string appointmentReason { get; set; } + public string department { get; set; } + public string dismissalApprovalUnit { get; set; } + public string dismissalNumber { get; set; } + public string dismissalReason { get; set; } + public string jobAttributes { get; set; } + public string jobCategory { get; set; } + public string jobGrade { get; set; } + public string jobTitle { get; set; } + public string remarks { get; set; } + public string removalTime { get; set; } + public string selectionMethod { get; set; } + public string staffId { get; set; } + public string workingTime { get; set; } + public string workingUnit { get; set; } + public string _status { get; set; } + public Dictionary staffCadreTZDefines { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + + public class Staffpunishment + { + public string approvalCancellationDocumentNo { get; set; } + public string approvalOfDissolutionUnit { get; set; } + public string approvalOfDissolutionUnitCode { get; set; } + public string approvalOfDissolutionUnitLevel { get; set; } + public string approvalReleaseTime { get; set; } + public string dismissalOfPunishmentDocumentNo { get; set; } + public string dismissalofpunishmentReason { get; set; } + public bool isTerminate { get; set; } + public string punishedUnit { get; set; } + public string punishedUnitCode { get; set; } + public string punishedUnitLevel { get; set; } + public string punishmentCancellationEffectiveTime { get; set; } + public string punishmentMeasures { get; set; } + public string punishmentName { get; set; } + public string punishmentNameSupplement { get; set; } + public string punishmentNo { get; set; } + public string punishmentReason { get; set; } + public string punishmentTime { get; set; } + public string punishmentType { get; set; } + public string remarks { get; set; } + public string staffId { get; set; } + public string _status { get; set; } + public Dictionary staffPunishmentTZDefines { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + + public class Staffhealthsituation + { + public bool deformity { get; set; } + public string deformityCertDate { get; set; } + public string deformityCertNo { get; set; } + public string deformityLevel { get; set; } + public string healthCondition { get; set; } + public string pastHistory { get; set; } + public string _status { get; set; } + public Dictionary healthSituationDefine { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + + public class Staffsocietyemployment + { + public string beginDate { get; set; } + public string certifier { get; set; } + public string certifierMobile { get; set; } + public string duties { get; set; } + public string memo { get; set; } + public string organization { get; set; } + public string _status { get; set; } + public Dictionary societyEmploymentDefine { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + + public class Staffdirectiorsupervisor + { + public string beginDate { get; set; } + public string endDate { get; set; } + public string duties { get; set; } + public bool independentDirector { get; set; } + public string organization { get; set; } + public int termOfOffice { get; set; } + public string _status { get; set; } + public Dictionary societyEmploymentDefine { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + public string positionType { get; set; } + public string configurationMethod { get; set; } + public bool employeeDirector { get; set; } + public bool interPartDirector { get; set; } + public bool employeeSupervisor { get; set; } + public bool externalSupervisor { get; set; } + } + public class Staffleadershiptrade + { + public string commissionBeginDate { get; set; } + public string commissionEndDate { get; set; } + public string leadershipDuties { get; set; } + public string leadershipName { get; set; } + public string memo { get; set; } + public string staffId { get; set; } + public string _status { get; set; } + public Dictionary leadershipTradeDefine { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + + public class Stafftrialevaluation + { + public string beginDate { get; set; } + public string endDate { get; set; } + public string devaluationLevel { get; set; } + public string evaluationScore { get; set; } + public string overallEvaluation { get; set; } + public string memo { get; set; } + public string electronicSignature { get; set; } + public string _status { get; set; } + public Dictionary trialEvaluationDefine { get; set; } + public string dataCreateSource { get; set; } + public string dataCreateBillid { get; set; } + } + +} diff --git a/VOL.YSErp/Models/Biz/YSERPResponse.cs b/VOL.YSErp/Models/Biz/YSERPResponse.cs new file mode 100644 index 0000000..fd989dd --- /dev/null +++ b/VOL.YSErp/Models/Biz/YSERPResponse.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace VOL.YSErp.Models.Biz +{ + public class YSERPResponse + { + + public string code { get; set; } + public string message { get; set; } + public Data data { get; set; } + + public string? displayCode { get; set; } + + public int? level { get; set; } + } + + public class Data + { + public int recordCount { get; set; } + public int pageIndex { get; set; } + public int pageSize { get; set; } + public int pageCount { get; set; } + public bool haveNextPage { get; set; } + public List recordList { get; set; } + } + public class YSERPListResponse + { + + public string code { get; set; } + public string message { get; set; } + public List data { get; set; } + + public string? displayCode { get; set; } + + public int? level { get; set; } + } + +} diff --git a/VOL.YSErp/Models/SystemToken.cs b/VOL.YSErp/Models/SystemToken.cs new file mode 100644 index 0000000..a0954f0 --- /dev/null +++ b/VOL.YSErp/Models/SystemToken.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace VOL.YSErp.Models +{ + public class SystemToken + { + public string Token { get; set; } + public int TokenExpiry { get; set; } + public DateTime TokenEndTime { get; set; } + + public bool IsTokenExpiry() + { + //if (TokenEndTime == null) return true; + return TokenEndTime > DateTime.Now; + } + } +} diff --git a/VOL.YSErp/Models/YSConfig.cs b/VOL.YSErp/Models/YSConfig.cs new file mode 100644 index 0000000..69424a8 --- /dev/null +++ b/VOL.YSErp/Models/YSConfig.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace VOL.YSErp.Models +{ + /* + "ys": { + "api_url": "https://c4.yonyoucloud.com", + "app_key": "99355863c0ed4363b09f8511d48f67e4", + "app_secret": "3ca452060b684ccc982836cd5f0b6116811cb8ce" + }, + */ + public class YSConfig + { + public string ApiUrl = "https://c4.yonyoucloud.com"; // 正式环境 -> c4, 测试环境 -> c1 + public string Appkey = "6fe5b0b6163e45c081cc9a40848d5840";//"08f9377fd9ae45219e7dd3fbebb9858a";//"99355863c0ed4363b09f8511d48f67e4"; + public string AppSecret = "ceeca798e84268a2d59f97c860e4c1223bf786df";//"8f4b0bf535fcdb6fa5b8ce5c630b740ddaa3b3be";//"3ca452060b684ccc982836cd5f0b6116811cb8ce"; + } +} diff --git a/VOL.YSErp/Services/Biz/YSERPService.cs b/VOL.YSErp/Services/Biz/YSERPService.cs new file mode 100644 index 0000000..624f1b8 --- /dev/null +++ b/VOL.YSErp/Services/Biz/YSERPService.cs @@ -0,0 +1,406 @@ +using SqlSugar; +using System.Collections.Generic; +using System.Security.Cryptography; +using System.Text; +using System.Text.Json; +using System.Web; +using VOL.Core.Services; +using VOL.YSErp.Models; +using VOL.YSErp.Models.Biz; +using static Dm.net.buffer.ByteArrayBuffer; + +namespace VOL.YSErp.Services.Biz +{ + public class YSERPService + { + private readonly string _apiUrl; + private readonly string _appKey; + private readonly string _appSecret; + private string _accessToken; + private DateTime? _tokenExpiry; + private readonly SemaphoreSlim _tokenLock = new SemaphoreSlim(1, 1); + private SystemToken _token; + private readonly HttpClient _httpClient; + + // YS API URLs + private readonly string _tokenUrl; + private readonly string _employeeListUrl; + private readonly string _updateEmployeeUrl; + private readonly string _deptListUrl; + + public YSERPService(SystemToken token, YSConfig config) + { + _token = token; + _apiUrl = config.ApiUrl.TrimEnd('/'); + _appKey = config.Appkey; + _appSecret = config.AppSecret; + _httpClient = new HttpClient(); + + _tokenUrl = $"{_apiUrl}/iuap-api-auth/open-auth/selfAppAuth/getAccessToken"; + _employeeListUrl = $"{_apiUrl}/iuap-api-gateway/yonbip/hrcloud/staff/listdetailmdd"; + _updateEmployeeUrl = $"{_apiUrl}/iuap-api-gateway/yonbip/hrcloud/batchInsertOrUpdateDetailNew"; + _deptListUrl = $"{_apiUrl}/iuap-api-gateway/yonbip/digitalModel/basedoc/dept/list"; + } + + + private string GenerateSignature(Dictionary parameters) + { + try + { + var filteredParams = new Dictionary(); + foreach (var param in parameters) + { + if (param.Key != "signature") + { + filteredParams[param.Key] = param.Value; + } + } + + var sortedParams = new SortedDictionary(filteredParams); + var paramStr = string.Join("", sortedParams.Select(p => p.Key + p.Value)); + + using (var hmac = new HMACSHA256(Encoding.UTF8.GetBytes(_appSecret))) + { + var signatureBytes = hmac.ComputeHash(Encoding.UTF8.GetBytes(paramStr)); + return Convert.ToBase64String(signatureBytes); + } + } + catch (Exception ex) + { + //_logger.LogError(ex, "生成签名时出错"); + return null; + } + } + + private async Task<(string Token, DateTime Expiry)?> GetAccessTokenAsync() + { + try + { + var timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString(); + var parameters = new Dictionary + { + ["appKey"] = _appKey, + ["timestamp"] = timestamp + }; + + var signature = GenerateSignature(parameters); + if (string.IsNullOrEmpty(signature)) + { + return null; + } + + parameters["signature"] = signature; + + var queryString = string.Join("&", parameters.Select(p => + $"{p.Key}={HttpUtility.UrlEncode(p.Value)}")); + var fullUrl = $"{_tokenUrl}?{queryString}"; + + var response = await _httpClient.GetAsync(fullUrl); + if (!response.IsSuccessStatusCode) + { + //_logger.LogError($"获取access_token失败: HTTP {response.StatusCode}"); + return null; + } + + var content = await response.Content.ReadAsStringAsync(); + var data = JsonSerializer.Deserialize(content); + + if (data.GetProperty("code").GetString() != "00000") + { + var errorMsg = data.GetProperty("message").GetString(); + //_logger.LogError($"获取access_token失败: {errorMsg}"); + return null; + } + + var tokenData = data.GetProperty("data"); + var accessToken = tokenData.GetProperty("access_token").GetString(); + var expireSeconds = tokenData.GetProperty("expire").GetInt32(); + + return (accessToken, DateTime.Now.AddSeconds(expireSeconds - 300)); + } + catch (Exception ex) + { + //_logger.LogError(ex, "获取access_token时出错"); + return null; + } + } + + private async Task GetValidTokenAsync() + { + await _tokenLock.WaitAsync(); + try + { + if (string.IsNullOrEmpty(_token.Token) || !_token.IsTokenExpiry()) + { + //_logger.LogInformation("YS access_token已过期，重新获取..."); + var result = await GetAccessTokenAsync(); + if (result.HasValue) + { + (_accessToken, _tokenExpiry) = result.Value; + _token.Token = _accessToken; + _token.TokenEndTime = _tokenExpiry ?? DateTime.Now; + } + else + { + //_logger.LogError("无法获取有效的YS access_token"); + return null; + } + } + return _token.Token; + } + finally + { + _tokenLock.Release(); + } + } + + public async Task> GetAllEmployeesAsync() + { + var token = await GetValidTokenAsync(); + if (string.IsNullOrEmpty(token)) + { + return new List(); + } + + var allEmployees = new List(); + var pageIndex = 1; + const int pageSize = 50; + + Logger.Info($"员工信息API: {_employeeListUrl}"); + + while (true) + { + try + { + Logger.Info($"获取YS员工数据，第 {pageIndex} 页..."); + + var payload = new + { + pageIndex, + pageSize, + }; + + var request = new HttpRequestMessage(HttpMethod.Post, $"{_employeeListUrl}?access_token={token}") + { + Content = new StringContent( + JsonSerializer.Serialize(payload), + Encoding.UTF8, + "application/json") + }; + + var response = await _httpClient.SendAsync(request); + + if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized) + { + Logger.Error("认证失败: 无效的API令牌或权限不足"); + _accessToken = null; + return []; + } + + response.EnsureSuccessStatusCode(); + var content = await response.Content.ReadAsStringAsync(); + var data = JsonSerializer.Deserialize>(content); + if (!new[] { "200", "00000" }.Contains(data.code)) + { + var errorMsg = data.message; + Logger.Error($"API业务错误: {errorMsg}"); + throw new Exception(errorMsg); + } + + + var recordList = data.data.recordList; + if (recordList?.Count == 0) + { + Logger.Info("没有更多员工记录"); + break; + } + + allEmployees.AddRange(data.data.recordList); + + var haveNext = data.data.haveNextPage; + var pageCount = data.data.pageCount; + + if (!haveNext || pageIndex >= pageCount) + { + break; + } + Logger.Info($"第 {pageIndex}/{pageCount} 页，获取 {recordList.Count} 条员工记录"); + pageIndex++; + await Task.Delay(500); // 避免请求过快 + } + catch (Exception ex) + { + Logger.Error($"获取员工数据失败,{ex}"); + throw; + } + } + + //_logger.LogInformation($"共获取 {allEmployees.Count} 条YS员工记录"); + return allEmployees; + } + + public async Task UpdateEmployeesAsync(List> employeeUpdates) + { + var token = await GetValidTokenAsync(); + if (string.IsNullOrEmpty(token)) + { + return false; + } + + //_logger.LogInformation($"YS更新内容: {JsonSerializer.Serialize(employeeUpdates)}"); + + try + { + var request = new HttpRequestMessage(HttpMethod.Post, $"{_updateEmployeeUrl}?access_token={token}") + { + Content = new StringContent( + JsonSerializer.Serialize(new { data = employeeUpdates }), + Encoding.UTF8, + "application/json") + }; + + var response = await _httpClient.SendAsync(request); + //_logger.LogInformation($"YS更新响应状态: {response.StatusCode}"); + + var content = await response.Content.ReadAsStringAsync(); + //_logger.LogInformation($"YS更新响应内容: {content}"); + + response.EnsureSuccessStatusCode(); + var data = JsonSerializer.Deserialize(content); + + if (data.GetProperty("code").GetString() == "00000") + { + //_logger.LogInformation($"成功更新 {employeeUpdates.Count} 名员工信息"); + + if (data.TryGetProperty("data", out var resultData)) + { + //_logger.LogInformation($"处理总数: {GetPropertyValueOrDefault(resultData, "count", 0)}"); + //_logger.LogInformation($"成功数: {GetPropertyValueOrDefault(resultData, "successCount", 0)}"); + //_logger.LogInformation($"失败数: {GetPropertyValueOrDefault(resultData, "failCount", 0)}"); + + if (resultData.TryGetProperty("messages", out var messages)) + { + foreach (var msg in messages.EnumerateArray()) + { + //_logger.LogWarning($"失败信息: {msg}"); + } + } + } + + return true; + } + else + { + var errorMsg = data.GetProperty("message").GetString(); + Logger.Error($"更新失败: {errorMsg}"); + return false; + } + } + catch (Exception ex) + { + Logger.Error( $"更新员工信息失败,{ex}"); + return false; + } + } + + + + public async Task> GetAllDepartmentsAsync() + { + var token = await GetValidTokenAsync(); + if (string.IsNullOrEmpty(token)) + { + return []; + } + var allDepts = new List(); + + //Logger.Info($"员工信息API: {_employeeListUrl}"); + + try + { + var payload = new + { + data = new + { + code = new List(), + pubts = new List() { "1900-01-01 00:00:00" }, // 必须带一个参数，不然接口返回的数据格式有问题 2025年9月26日 + } + }; + + var request = new HttpRequestMessage(HttpMethod.Post, $"{_deptListUrl}?access_token={token}") + { + Content = new StringContent( + JsonSerializer.Serialize(payload), + Encoding.UTF8, + "application/json") + }; + + var response = await _httpClient.SendAsync(request); + + if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized) + { + Logger.Error("认证失败: 无效的API令牌或权限不足"); + _accessToken = null; + return []; + } + + response.EnsureSuccessStatusCode(); + var content = await response.Content.ReadAsStringAsync(); + var data = JsonSerializer.Deserialize>(content); + if (!new[] { "200", "00000" }.Contains(data.code)) + { + var errorMsg = data.message; + Logger.Error($"API业务错误: {errorMsg}"); + throw new Exception(errorMsg); + } + + + var recordList = data.data; + + if(recordList?.Count == 0) + { + Logger.Info("没有更多部门记录"); + return allDepts; + } + else + { + allDepts.AddRange(recordList ?? []); + } + + } + catch (Exception ex) + { + Logger.Error($"获取部门数据失败,{ex}"); + throw; + } + //_logger.LogInformation($"共获取 {allEmployees.Count} 条YS员工记录"); + return allDepts; + } + + private string ConvertGender(string gender) + { + return gender switch + { + "男" => "1", + "女" => "2", + _ => gender + }; + } + + private static string GetPropertyValueOrEmpty(JsonElement element, string propertyName) + { + return element.TryGetProperty(propertyName, out var property) ? property.GetString() ?? "" : ""; + } + + private static int GetPropertyValueOrDefault(JsonElement element, string propertyName, int defaultValue) + { + return element.TryGetProperty(propertyName, out var property) ? property.GetInt32() : defaultValue; + } + + public void Dispose() + { + _tokenLock?.Dispose(); + _httpClient?.Dispose(); + } + } +} diff --git a/VOL.YSErp/VOL.YSErp.csproj b/VOL.YSErp/VOL.YSErp.csproj new file mode 100644 index 0000000..4d4b247 --- /dev/null +++ b/VOL.YSErp/VOL.YSErp.csproj @@ -0,0 +1,13 @@ + + + + net8.0 + enable + enable + + + + + + + diff --git a/VOL.sln b/VOL.sln index e7d0286..5c249f0 100644 --- a/VOL.sln +++ b/VOL.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 18 -VisualStudioVersion = 18.0.11018.127 d18.0 +VisualStudioVersion = 18.0.11018.127 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VOL.Core", "VOL.Core\VOL.Core.csproj", "{9F72743E-647E-4D37-85D1-07EC9CD0AB71}" EndProject @@ -15,6 +15,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VOL.WebApi", "VOL.WebApi\VO EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VOL.HR", "VOL.HR\VOL.HR.csproj", "{71939963-532C-452F-956E-D04D51EB311E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VOL.YSErp", "VOL.YSErp\VOL.YSErp.csproj", "{CDEFC727-9788-4329-8201-6527B36B1A73}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VOL.DingTalk", "VOL.DingTalk\VOL.DingTalk.csproj", "{692CF3EB-A61E-49FB-8151-5C1F62BE6BBF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,6 +49,14 @@ Global {71939963-532C-452F-956E-D04D51EB311E}.Debug|Any CPU.Build.0 = Debug|Any CPU {71939963-532C-452F-956E-D04D51EB311E}.Release|Any CPU.ActiveCfg = Release|Any CPU {71939963-532C-452F-956E-D04D51EB311E}.Release|Any CPU.Build.0 = Release|Any CPU + {CDEFC727-9788-4329-8201-6527B36B1A73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CDEFC727-9788-4329-8201-6527B36B1A73}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CDEFC727-9788-4329-8201-6527B36B1A73}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CDEFC727-9788-4329-8201-6527B36B1A73}.Release|Any CPU.Build.0 = Release|Any CPU + {692CF3EB-A61E-49FB-8151-5C1F62BE6BBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {692CF3EB-A61E-49FB-8151-5C1F62BE6BBF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {692CF3EB-A61E-49FB-8151-5C1F62BE6BBF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {692CF3EB-A61E-49FB-8151-5C1F62BE6BBF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE