From 465c9a76c3c54963603b80d27d97623ed182b2fc Mon Sep 17 00:00:00 2001 From: 况洋洋 <3283105747@qq.com> Date: 星期五, 04 七月 2025 14:31:56 +0800 Subject: [PATCH] 员工信息多岗位调整 --- WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json | 75 +++++++++++------- /dev/null | 0 WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db | 0 WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db | 0 WebApi/Gs.HostIIS/appsettings.json | 2 WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2 | 0 WebApi/Gs.BaseInfo/Services/MesStaffManager.cs | 57 ++++++++++++- WebApi/.vs/GsMesSolution/v17/DocumentLayout.json | 82 ++++++++++++++----- 8 files changed, 158 insertions(+), 58 deletions(-) diff --git a/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db b/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db index 5109665..dd6609f 100644 --- a/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db +++ b/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db Binary files differ diff --git a/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db b/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db index 45c398e..d7f3025 100644 --- a/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db +++ b/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db Binary files differ diff --git a/WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2 b/WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2 index 7e69c0b..ffa2c4f 100644 --- a/WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2 +++ b/WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2 Binary files differ diff --git a/WebApi/.vs/GsMesSolution/FileContentIndex/d95d4bf3-4ea6-4dd1-9eb6-5eab4599e0b9.vsidx b/WebApi/.vs/GsMesSolution/FileContentIndex/d95d4bf3-4ea6-4dd1-9eb6-5eab4599e0b9.vsidx deleted file mode 100644 index e2b5e76..0000000 --- a/WebApi/.vs/GsMesSolution/FileContentIndex/d95d4bf3-4ea6-4dd1-9eb6-5eab4599e0b9.vsidx +++ /dev/null Binary files differ diff --git a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json index 7176bdd..5cecef8 100644 --- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json +++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json @@ -3,16 +3,20 @@ "WorkspaceRootPath": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.sys\\services\\organizationcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|solutionrelative:gs.sys\\services\\organizationcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{A3BA5A9F-70D3-44DF-8332-F03D6565A0FC}|Gs.BaseInfo\\Gs.BaseInfo.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.baseinfo\\services\\messtaffmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A3BA5A9F-70D3-44DF-8332-F03D6565A0FC}|Gs.BaseInfo\\Gs.BaseInfo.csproj|solutionrelative:gs.baseinfo\\services\\messtaffmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.warehouse\\services\\mesinvitemarnmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|solutionrelative:gs.warehouse\\services\\mesinvitemarnmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{E8851E6F-E65D-4560-851C-406961260265}|Gs.HostIIS\\Gs.HostIIS.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.hostiis\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", - "RelativeMoniker": "D:0:0:{E8851E6F-E65D-4560-851C-406961260265}|Gs.HostIIS\\Gs.HostIIS.csproj|solutionrelative:gs.hostiis\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" + "AbsoluteMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.warehouse\\services\\mesinviteminsmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|solutionrelative:gs.warehouse\\services\\mesinviteminsmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A3BA5A9F-70D3-44DF-8332-F03D6565A0FC}|Gs.BaseInfo\\Gs.BaseInfo.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.baseinfo\\services\\mesitemsmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A3BA5A9F-70D3-44DF-8332-F03D6565A0FC}|Gs.BaseInfo\\Gs.BaseInfo.csproj|solutionrelative:gs.baseinfo\\services\\mesitemsmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -22,21 +26,8 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 0, + "SelectedChildIndex": 1, "Children": [ - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "OrganizationController.cs", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\OrganizationController.cs", - "RelativeDocumentMoniker": "Gs.Sys\\Services\\OrganizationController.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\OrganizationController.cs", - "RelativeToolTip": "Gs.Sys\\Services\\OrganizationController.cs", - "ViewState": "AgIAACgAAAAAAAAAAAAjwC8AAAAMAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-01T07:51:12.053Z", - "EditorCaption": "" - }, { "$type": "Document", "DocumentIndex": 1, @@ -45,21 +36,49 @@ "RelativeDocumentMoniker": "Gs.Warehouse\\Services\\MesInvItemArnManager.cs", "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesInvItemArnManager.cs", "RelativeToolTip": "Gs.Warehouse\\Services\\MesInvItemArnManager.cs", - "ViewState": "AgIAAAYAAAAAAAAAAAAAAOQBAABCAAAAAAAAAA==", + "ViewState": "AgIAACoAAACAZmZmZmYywG4AAAAUAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-01T06:33:05.933Z" + "WhenOpened": "2025-07-03T11:36:35.451Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "MesStaffManager.cs", + "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.BaseInfo\\Services\\MesStaffManager.cs", + "RelativeDocumentMoniker": "Gs.BaseInfo\\Services\\MesStaffManager.cs", + "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.BaseInfo\\Services\\MesStaffManager.cs", + "RelativeToolTip": "Gs.BaseInfo\\Services\\MesStaffManager.cs", + "ViewState": "AgIAAFkAAAAAAAAAAAAuwGkAAAAdAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-03T11:33:28.018Z", + "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 2, - "Title": "appsettings.json", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.HostIIS\\appsettings.json", - "RelativeDocumentMoniker": "Gs.HostIIS\\appsettings.json", - "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.HostIIS\\appsettings.json", - "RelativeToolTip": "Gs.HostIIS\\appsettings.json", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAABGAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-06-30T06:09:41.323Z" + "Title": "MesInvItemInsManager.cs", + "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesInvItemInsManager.cs", + "RelativeDocumentMoniker": "Gs.Warehouse\\Services\\MesInvItemInsManager.cs", + "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesInvItemInsManager.cs", + "RelativeToolTip": "Gs.Warehouse\\Services\\MesInvItemInsManager.cs", + "ViewState": "AgIAAGUAAAAAAAAAAAAQwG4AAAA4AAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-03T11:29:13.798Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "MesItemsManager.cs", + "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.BaseInfo\\Services\\MesItemsManager.cs", + "RelativeDocumentMoniker": "Gs.BaseInfo\\Services\\MesItemsManager.cs", + "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.BaseInfo\\Services\\MesItemsManager.cs", + "RelativeToolTip": "Gs.BaseInfo\\Services\\MesItemsManager.cs", + "ViewState": "AgIAAGUAAAAAAAAAAAAzwGoAAAAJAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-03T08:04:35.818Z", + "EditorCaption": "" } ] } diff --git a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json index 7176bdd..ef97d04 100644 --- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json +++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json @@ -3,16 +3,24 @@ "WorkspaceRootPath": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.sys\\services\\organizationcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|solutionrelative:gs.sys\\services\\organizationcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{3CA7A99D-C42B-440A-ADA7-B3D76CD02E7C}|Gs.Report\\Gs.Report.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.report\\reportcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{3CA7A99D-C42B-440A-ADA7-B3D76CD02E7C}|Gs.Report\\Gs.Report.csproj|solutionrelative:gs.report\\reportcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A3BA5A9F-70D3-44DF-8332-F03D6565A0FC}|Gs.BaseInfo\\Gs.BaseInfo.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.baseinfo\\services\\messtaffmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A3BA5A9F-70D3-44DF-8332-F03D6565A0FC}|Gs.BaseInfo\\Gs.BaseInfo.csproj|solutionrelative:gs.baseinfo\\services\\messtaffmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.warehouse\\services\\mesinvitemarnmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|solutionrelative:gs.warehouse\\services\\mesinvitemarnmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{E8851E6F-E65D-4560-851C-406961260265}|Gs.HostIIS\\Gs.HostIIS.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.hostiis\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", - "RelativeMoniker": "D:0:0:{E8851E6F-E65D-4560-851C-406961260265}|Gs.HostIIS\\Gs.HostIIS.csproj|solutionrelative:gs.hostiis\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" + "AbsoluteMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.warehouse\\services\\mesinviteminsmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|solutionrelative:gs.warehouse\\services\\mesinviteminsmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A3BA5A9F-70D3-44DF-8332-F03D6565A0FC}|Gs.BaseInfo\\Gs.BaseInfo.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.baseinfo\\services\\mesitemsmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A3BA5A9F-70D3-44DF-8332-F03D6565A0FC}|Gs.BaseInfo\\Gs.BaseInfo.csproj|solutionrelative:gs.baseinfo\\services\\mesitemsmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -27,39 +35,67 @@ { "$type": "Document", "DocumentIndex": 0, - "Title": "OrganizationController.cs", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\OrganizationController.cs", - "RelativeDocumentMoniker": "Gs.Sys\\Services\\OrganizationController.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\OrganizationController.cs", - "RelativeToolTip": "Gs.Sys\\Services\\OrganizationController.cs", - "ViewState": "AgIAACgAAAAAAAAAAAAjwC8AAAAMAAAAAAAAAA==", + "Title": "ReportController.cs", + "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Report\\ReportController.cs", + "RelativeDocumentMoniker": "Gs.Report\\ReportController.cs", + "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Report\\ReportController.cs", + "RelativeToolTip": "Gs.Report\\ReportController.cs", + "ViewState": "AgIAAH8AAAAAAAAAAAAUwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-01T07:51:12.053Z", + "WhenOpened": "2025-07-04T05:21:36.564Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 2, "Title": "MesInvItemArnManager.cs", "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesInvItemArnManager.cs", "RelativeDocumentMoniker": "Gs.Warehouse\\Services\\MesInvItemArnManager.cs", "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesInvItemArnManager.cs", "RelativeToolTip": "Gs.Warehouse\\Services\\MesInvItemArnManager.cs", - "ViewState": "AgIAAAYAAAAAAAAAAAAAAOQBAABCAAAAAAAAAA==", + "ViewState": "AgIAACoAAACAZmZmZmYywG4AAAAUAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-01T06:33:05.933Z" + "WhenOpened": "2025-07-03T11:36:35.451Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, - "Title": "appsettings.json", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.HostIIS\\appsettings.json", - "RelativeDocumentMoniker": "Gs.HostIIS\\appsettings.json", - "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.HostIIS\\appsettings.json", - "RelativeToolTip": "Gs.HostIIS\\appsettings.json", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAABGAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-06-30T06:09:41.323Z" + "DocumentIndex": 1, + "Title": "MesStaffManager.cs", + "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.BaseInfo\\Services\\MesStaffManager.cs", + "RelativeDocumentMoniker": "Gs.BaseInfo\\Services\\MesStaffManager.cs", + "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.BaseInfo\\Services\\MesStaffManager.cs", + "RelativeToolTip": "Gs.BaseInfo\\Services\\MesStaffManager.cs", + "ViewState": "AgIAAGIAAAAAAAAAAAAAAGkAAAAdAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-03T11:33:28.018Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "MesInvItemInsManager.cs", + "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesInvItemInsManager.cs", + "RelativeDocumentMoniker": "Gs.Warehouse\\Services\\MesInvItemInsManager.cs", + "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesInvItemInsManager.cs", + "RelativeToolTip": "Gs.Warehouse\\Services\\MesInvItemInsManager.cs", + "ViewState": "AgIAAGUAAAAAAAAAAAAQwG4AAAA4AAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-03T11:29:13.798Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "MesItemsManager.cs", + "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.BaseInfo\\Services\\MesItemsManager.cs", + "RelativeDocumentMoniker": "Gs.BaseInfo\\Services\\MesItemsManager.cs", + "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.BaseInfo\\Services\\MesItemsManager.cs", + "RelativeToolTip": "Gs.BaseInfo\\Services\\MesItemsManager.cs", + "ViewState": "AgIAAGUAAAAAAAAAAAAzwGoAAAAJAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-03T08:04:35.818Z", + "EditorCaption": "" } ] } diff --git a/WebApi/Gs.BaseInfo/Services/MesStaffManager.cs b/WebApi/Gs.BaseInfo/Services/MesStaffManager.cs index 23936cc..e427a48 100644 --- a/WebApi/Gs.BaseInfo/Services/MesStaffManager.cs +++ b/WebApi/Gs.BaseInfo/Services/MesStaffManager.cs @@ -1,5 +1,4 @@ -锘縰sing System.Text; -using Gs.Entity.BaseInfo; +锘縰sing Gs.Entity.BaseInfo; using Gs.Entity.Sys; using Gs.Toolbox; using Gs.Toolbox.ApiCore.Abstract.Mvc; @@ -8,6 +7,10 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using SqlSugar; +using System.Data; +using System.Data.SqlClient; +using System.Dynamic; +using System.Text; namespace Gs.BaseInfo.Services; @@ -80,13 +83,55 @@ /// <param name="guid"></param> /// <returns></returns> [RequestMethod(RequestMethods.POST)] - public ReturnDto<MesStaff> GetModel([FromBody] MesStaff model) + //public ReturnDto<MesStaff> GetModel([FromBody] MesStaff model) + //{ + // var m = base.GetById(model.Guid); + // if (m != null) + // return ReturnDto<MesStaff>.QuickReturn(m, ReturnCode.Success, + // "璇诲彇鎴愬姛锛�"); + // return ReturnDto<MesStaff>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�"); + //} + + public ReturnDto<ExpandoObject> GetModel([FromBody] dynamic model) { - var m = base.GetById(model.Guid); + string guid = model.guid.ToString(); + dynamic m = new ExpandoObject(); + m.list = new List<dynamic>(); + m.list2 = new List<dynamic>(); + SqlParameter[] parameters = + { + new("@inMainGuid", guid), + new("@inP1", ""), + new("@inP2", ""), + new("@inP3", ""), + new("@inP4", "") + }; + var dset = new DataSet(); + try + { + dset = DbHelperSQL.RunProcedure("[prc_staff_mx]", parameters, "0"); + if (dset != null && dset.Tables.Count > 0 && + dset.Tables[0].Rows.Count > 0) + { + var dr = dset.Tables[0].Rows[0]; + m = dr.RowToDynamic(); + var _tb = dset.Tables[1].TableToDynamicList(); + m.list = _tb; + //var _tb2 = dset.Tables[2].TableToDynamicList(); + //m.list2 = _tb2; + } + } + catch (Exception ex) + { + LogHelper.Debug(ToString(), ex.Message); + } + if (m != null) - return ReturnDto<MesStaff>.QuickReturn(m, ReturnCode.Success, + return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�"); - return ReturnDto<MesStaff>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�"); + return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�"); } + + } \ No newline at end of file diff --git a/WebApi/Gs.HostIIS/appsettings.json b/WebApi/Gs.HostIIS/appsettings.json index 2c3ab6c..67e3df5 100644 --- a/WebApi/Gs.HostIIS/appsettings.json +++ b/WebApi/Gs.HostIIS/appsettings.json @@ -8,7 +8,7 @@ "AllowedHosts": "*", /*"ConnectionStrings": "Data Source=192.168.1.146;Initial Catalog=TEST_MES;User ID=testUser;Password =qixi1qaz@WSXtest",*/ "ConnectionStrings": "Data Source=192.168.1.187;Initial Catalog=TEST_MES;User ID=sa;Password =LongWei@2025", - "TestErpUrl": "http://192.168.1.149:8066/WebService1.asmx/MesToErpinfoTest", + "TestErpUrl": "http://192.168.1.100:8056/MesToKd.asmx/MesToErpinfoTest", "TestErpUrl2": "http://192.168.1.149:8066/WebService1.asmx/MesToErpUpdateFlag", "ProductionErpUrl": "http://192.168.1.149:8066/WebService1.asmx/mesToErpinfoFormal", "ServicesPath": "Services", -- Gitblit v1.9.3