From ea876f671b5111fc1936906d1a531ff99afd4f0a Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 25 七月 2025 08:34:34 +0800
Subject: [PATCH] 1、仓库增加打印模板切换 2、仓库排序
---
WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json | 154 +++++++++++++------------
WebApi/Gs.Warehouse/Services/MesDepotsManager.cs | 5
WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db | 0
WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs | 5
WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db | 0
WebApi/.vs/GsMesSolution/v17/.futdcache.v2 | 0
WebApi/Gs.Entity/BaseInfo/MesDepotSections.cs | 5
WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2 | 0
WebApi/.vs/GsMesSolution/v17/DocumentLayout.json | 154 +++++++++++++------------
9 files changed, 166 insertions(+), 157 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 1029d3a..a025781 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 ff9cbc2..c92170c 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 196239c..ae327ea 100644
--- a/WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2
+++ b/WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2
Binary files differ
diff --git a/WebApi/.vs/GsMesSolution/v17/.futdcache.v2 b/WebApi/.vs/GsMesSolution/v17/.futdcache.v2
index b94fb2c..f026bee 100644
--- a/WebApi/.vs/GsMesSolution/v17/.futdcache.v2
+++ b/WebApi/.vs/GsMesSolution/v17/.futdcache.v2
Binary files differ
diff --git a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
index c0faae5..54bf765 100644
--- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
+++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
@@ -3,28 +3,28 @@
"WorkspaceRootPath": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{F67AF605-BF34-4826-90DE-BCFFFC5DB155}|GS.QC\\GS.QC.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.qc\\service\\mesqaitemsdetect01manager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{F67AF605-BF34-4826-90DE-BCFFFC5DB155}|GS.QC\\GS.QC.csproj|solutionrelative:gs.qc\\service\\mesqaitemsdetect01manager.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\\mesdepotsmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|solutionrelative:gs.warehouse\\services\\mesdepotsmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{F67AF605-BF34-4826-90DE-BCFFFC5DB155}|GS.QC\\GS.QC.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.qc\\service\\mesqcexceptionalmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{F67AF605-BF34-4826-90DE-BCFFFC5DB155}|GS.QC\\GS.QC.csproj|solutionrelative:gs.qc\\service\\mesqcexceptionalmanager.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:{F67AF605-BF34-4826-90DE-BCFFFC5DB155}|GS.QC\\GS.QC.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.qc\\service\\mesdefectcodemanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{F67AF605-BF34-4826-90DE-BCFFFC5DB155}|GS.QC\\GS.QC.csproj|solutionrelative:gs.qc\\service\\mesdefectcodemanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{FC3259F8-ED36-4118-BF3F-0B59FF6BA2A6}|Gs.Entity\\Gs.Entity.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.entity\\baseinfo\\mesdepotsections.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{FC3259F8-ED36-4118-BF3F-0B59FF6BA2A6}|Gs.Entity\\Gs.Entity.csproj|solutionrelative:gs.entity\\baseinfo\\mesdepotsections.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:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.sys\\services\\fmcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|solutionrelative:gs.sys\\services\\fmcontroller.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\\varrivalbarcodemanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|solutionrelative:gs.warehouse\\services\\varrivalbarcodemanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.sys\\services\\messyspageviewmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|solutionrelative:gs.sys\\services\\messyspageviewmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "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}"
}
],
"DocumentGroupContainers": [
@@ -34,84 +34,84 @@
"DocumentGroups": [
{
"DockedWidth": 681,
- "SelectedChildIndex": 4,
+ "SelectedChildIndex": 1,
"Children": [
{
"$type": "Document",
"DocumentIndex": 1,
- "Title": "MesQcExceptionalManager.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\GS.QC\\Service\\MesQcExceptionalManager.cs",
- "RelativeDocumentMoniker": "GS.QC\\Service\\MesQcExceptionalManager.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\GS.QC\\Service\\MesQcExceptionalManager.cs",
- "RelativeToolTip": "GS.QC\\Service\\MesQcExceptionalManager.cs",
- "ViewState": "AgIAAMIAAAAAAAAAAAAiwMoAAAAAAAAAAAAAAA==",
+ "Title": "MesDepotSections.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Entity\\BaseInfo\\MesDepotSections.cs",
+ "RelativeDocumentMoniker": "Gs.Entity\\BaseInfo\\MesDepotSections.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Entity\\BaseInfo\\MesDepotSections.cs",
+ "RelativeToolTip": "Gs.Entity\\BaseInfo\\MesDepotSections.cs",
+ "ViewState": "AgIAAA4AAAAAAAAAAAAuwB8AAAAiAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-18T09:27:23.979Z",
- "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": "AgIAAAAAAAAAAAAAAADwvwkAAABtAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2025-07-18T09:05:18.491Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 3,
- "Title": "MesDefectCodeManager.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\GS.QC\\Service\\MesDefectCodeManager.cs",
- "RelativeDocumentMoniker": "GS.QC\\Service\\MesDefectCodeManager.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\GS.QC\\Service\\MesDefectCodeManager.cs",
- "RelativeToolTip": "GS.QC\\Service\\MesDefectCodeManager.cs",
- "ViewState": "AgIAAFEAAAAAzczMzMwgwFoAAABKAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-18T08:30:35.638Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
- "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": "AgIAACsBAAAAAAAAAAAowDwBAAA7AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-18T06:49:39.738Z",
+ "WhenOpened": "2025-07-24T10:44:32.171Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 0,
- "Title": "MesQaItemsDetect01Manager.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\GS.QC\\Service\\MesQaItemsDetect01Manager.cs",
- "RelativeDocumentMoniker": "GS.QC\\Service\\MesQaItemsDetect01Manager.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\GS.QC\\Service\\MesQaItemsDetect01Manager.cs",
- "RelativeToolTip": "GS.QC\\Service\\MesQaItemsDetect01Manager.cs",
- "ViewState": "AgIAAKgBAAAA0MzMzMwMwMEBAABLAAAAAAAAAA==",
+ "Title": "MesDepotsManager.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesDepotsManager.cs",
+ "RelativeDocumentMoniker": "Gs.Warehouse\\Services\\MesDepotsManager.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesDepotsManager.cs",
+ "RelativeToolTip": "Gs.Warehouse\\Services\\MesDepotsManager.cs",
+ "ViewState": "AgIAAKgAAAAAAAAAAAAcwLgAAAA+AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-17T08:35:48.139Z",
+ "WhenOpened": "2025-07-24T07:07:07.204Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "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": "AgIAAO0AAAAAAAAAAAApwPwAAAAUAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-24T06:13:28.113Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "Title": "VArrivalBarcodeManager.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\VArrivalBarcodeManager.cs",
+ "RelativeDocumentMoniker": "Gs.Warehouse\\Services\\VArrivalBarcodeManager.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\VArrivalBarcodeManager.cs",
+ "RelativeToolTip": "Gs.Warehouse\\Services\\VArrivalBarcodeManager.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAAEMAAAAiAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-24T04:42:14.961Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
+ "Title": "MesSysPageviewManager.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\MesSysPageviewManager.cs",
+ "RelativeDocumentMoniker": "Gs.Sys\\Services\\MesSysPageviewManager.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\MesSysPageviewManager.cs",
+ "RelativeToolTip": "Gs.Sys\\Services\\MesSysPageviewManager.cs",
+ "ViewState": "AgIAACwAAAAAAAAAAAAewEMAAAAtAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-24T02:48:45.457Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 5,
- "Title": "FmController.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\FmController.cs",
- "RelativeDocumentMoniker": "Gs.Sys\\Services\\FmController.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\FmController.cs",
- "RelativeToolTip": "Gs.Sys\\Services\\FmController.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAEBAAAPAAAAAAAAAA==",
+ "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": "AgIAACEAAAAAAAAAAAAtwCwAAABGAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-17T05:31:54.431Z",
+ "WhenOpened": "2025-07-24T02:18:44.035Z",
"EditorCaption": ""
}
]
@@ -123,6 +123,10 @@
{
"$type": "Bookmark",
"Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}"
}
]
},
diff --git a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
index c0faae5..54bf765 100644
--- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
+++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
@@ -3,28 +3,28 @@
"WorkspaceRootPath": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{F67AF605-BF34-4826-90DE-BCFFFC5DB155}|GS.QC\\GS.QC.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.qc\\service\\mesqaitemsdetect01manager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{F67AF605-BF34-4826-90DE-BCFFFC5DB155}|GS.QC\\GS.QC.csproj|solutionrelative:gs.qc\\service\\mesqaitemsdetect01manager.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\\mesdepotsmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|solutionrelative:gs.warehouse\\services\\mesdepotsmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{F67AF605-BF34-4826-90DE-BCFFFC5DB155}|GS.QC\\GS.QC.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.qc\\service\\mesqcexceptionalmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{F67AF605-BF34-4826-90DE-BCFFFC5DB155}|GS.QC\\GS.QC.csproj|solutionrelative:gs.qc\\service\\mesqcexceptionalmanager.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:{F67AF605-BF34-4826-90DE-BCFFFC5DB155}|GS.QC\\GS.QC.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.qc\\service\\mesdefectcodemanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{F67AF605-BF34-4826-90DE-BCFFFC5DB155}|GS.QC\\GS.QC.csproj|solutionrelative:gs.qc\\service\\mesdefectcodemanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{FC3259F8-ED36-4118-BF3F-0B59FF6BA2A6}|Gs.Entity\\Gs.Entity.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.entity\\baseinfo\\mesdepotsections.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{FC3259F8-ED36-4118-BF3F-0B59FF6BA2A6}|Gs.Entity\\Gs.Entity.csproj|solutionrelative:gs.entity\\baseinfo\\mesdepotsections.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:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.sys\\services\\fmcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|solutionrelative:gs.sys\\services\\fmcontroller.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\\varrivalbarcodemanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|solutionrelative:gs.warehouse\\services\\varrivalbarcodemanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.sys\\services\\messyspageviewmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|solutionrelative:gs.sys\\services\\messyspageviewmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "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}"
}
],
"DocumentGroupContainers": [
@@ -34,84 +34,84 @@
"DocumentGroups": [
{
"DockedWidth": 681,
- "SelectedChildIndex": 4,
+ "SelectedChildIndex": 1,
"Children": [
{
"$type": "Document",
"DocumentIndex": 1,
- "Title": "MesQcExceptionalManager.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\GS.QC\\Service\\MesQcExceptionalManager.cs",
- "RelativeDocumentMoniker": "GS.QC\\Service\\MesQcExceptionalManager.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\GS.QC\\Service\\MesQcExceptionalManager.cs",
- "RelativeToolTip": "GS.QC\\Service\\MesQcExceptionalManager.cs",
- "ViewState": "AgIAAMIAAAAAAAAAAAAiwMoAAAAAAAAAAAAAAA==",
+ "Title": "MesDepotSections.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Entity\\BaseInfo\\MesDepotSections.cs",
+ "RelativeDocumentMoniker": "Gs.Entity\\BaseInfo\\MesDepotSections.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Entity\\BaseInfo\\MesDepotSections.cs",
+ "RelativeToolTip": "Gs.Entity\\BaseInfo\\MesDepotSections.cs",
+ "ViewState": "AgIAAA4AAAAAAAAAAAAuwB8AAAAiAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-18T09:27:23.979Z",
- "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": "AgIAAAAAAAAAAAAAAADwvwkAAABtAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2025-07-18T09:05:18.491Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 3,
- "Title": "MesDefectCodeManager.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\GS.QC\\Service\\MesDefectCodeManager.cs",
- "RelativeDocumentMoniker": "GS.QC\\Service\\MesDefectCodeManager.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\GS.QC\\Service\\MesDefectCodeManager.cs",
- "RelativeToolTip": "GS.QC\\Service\\MesDefectCodeManager.cs",
- "ViewState": "AgIAAFEAAAAAzczMzMwgwFoAAABKAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-18T08:30:35.638Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
- "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": "AgIAACsBAAAAAAAAAAAowDwBAAA7AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-18T06:49:39.738Z",
+ "WhenOpened": "2025-07-24T10:44:32.171Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 0,
- "Title": "MesQaItemsDetect01Manager.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\GS.QC\\Service\\MesQaItemsDetect01Manager.cs",
- "RelativeDocumentMoniker": "GS.QC\\Service\\MesQaItemsDetect01Manager.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\GS.QC\\Service\\MesQaItemsDetect01Manager.cs",
- "RelativeToolTip": "GS.QC\\Service\\MesQaItemsDetect01Manager.cs",
- "ViewState": "AgIAAKgBAAAA0MzMzMwMwMEBAABLAAAAAAAAAA==",
+ "Title": "MesDepotsManager.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesDepotsManager.cs",
+ "RelativeDocumentMoniker": "Gs.Warehouse\\Services\\MesDepotsManager.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesDepotsManager.cs",
+ "RelativeToolTip": "Gs.Warehouse\\Services\\MesDepotsManager.cs",
+ "ViewState": "AgIAAKgAAAAAAAAAAAAcwLgAAAA+AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-17T08:35:48.139Z",
+ "WhenOpened": "2025-07-24T07:07:07.204Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "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": "AgIAAO0AAAAAAAAAAAApwPwAAAAUAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-24T06:13:28.113Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "Title": "VArrivalBarcodeManager.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\VArrivalBarcodeManager.cs",
+ "RelativeDocumentMoniker": "Gs.Warehouse\\Services\\VArrivalBarcodeManager.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\VArrivalBarcodeManager.cs",
+ "RelativeToolTip": "Gs.Warehouse\\Services\\VArrivalBarcodeManager.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAAEMAAAAiAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-24T04:42:14.961Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
+ "Title": "MesSysPageviewManager.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\MesSysPageviewManager.cs",
+ "RelativeDocumentMoniker": "Gs.Sys\\Services\\MesSysPageviewManager.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\MesSysPageviewManager.cs",
+ "RelativeToolTip": "Gs.Sys\\Services\\MesSysPageviewManager.cs",
+ "ViewState": "AgIAACwAAAAAAAAAAAAewEMAAAAtAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-24T02:48:45.457Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 5,
- "Title": "FmController.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\FmController.cs",
- "RelativeDocumentMoniker": "Gs.Sys\\Services\\FmController.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\FmController.cs",
- "RelativeToolTip": "Gs.Sys\\Services\\FmController.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAEBAAAPAAAAAAAAAA==",
+ "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": "AgIAACEAAAAAAAAAAAAtwCwAAABGAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-17T05:31:54.431Z",
+ "WhenOpened": "2025-07-24T02:18:44.035Z",
"EditorCaption": ""
}
]
@@ -123,6 +123,10 @@
{
"$type": "Bookmark",
"Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}"
}
]
},
diff --git a/WebApi/Gs.Entity/BaseInfo/MesDepotSections.cs b/WebApi/Gs.Entity/BaseInfo/MesDepotSections.cs
index c53c97d..d449615 100644
--- a/WebApi/Gs.Entity/BaseInfo/MesDepotSections.cs
+++ b/WebApi/Gs.Entity/BaseInfo/MesDepotSections.cs
@@ -105,4 +105,9 @@
/// </summary>
[SugarColumn(ColumnName = "erpid")]
public int? Erpid { get; set; }
+ /// <summary>
+ /// ID(SEQ_INV_ID)锛圗RPID锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "xh")]
+ public int Xh { get; set; }
}
\ No newline at end of file
diff --git a/WebApi/Gs.Warehouse/Services/MesDepotsManager.cs b/WebApi/Gs.Warehouse/Services/MesDepotsManager.cs
index 863f42c..1508419 100644
--- a/WebApi/Gs.Warehouse/Services/MesDepotsManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesDepotsManager.cs
@@ -40,8 +40,7 @@
try
{
var _sbWhere = new StringBuilder(" 1=1" + query.keyWhere);
- var _sbBy =
- new StringBuilder(query.sortName + " " + query.sortOrder);
+ var _sbBy = new StringBuilder(query.sortName + " " + query.sortOrder);
var totalCount = 0;
var itemsList = Db.Queryable<MesDepots, SysOrganization, MesStaff, MesCustomer, MesSupplier, SysDepartment>(
(a, Org, c, d, f, g) => new object[]
@@ -185,7 +184,7 @@
}
m.IsNg = m.IsNg + ":" + (m.IsNg == "A" ? "姝ｅ父" : "绂佺敤");
var lst = new MesDepotSectionsManager();
- m.list = lst.GetList(it => it.DepotGuid == m.Guid).OrderBy(it => it.DepotSectionCode).ToList();
+ m.list = lst.GetList(it => it.DepotGuid == m.Guid).OrderBy(it => it.Xh).ToList();
if (m != null)
return ReturnDto<MesDepots>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
return ReturnDto<MesDepots>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
diff --git a/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs b/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
index 638225b..5a68480 100644
--- a/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
@@ -256,10 +256,7 @@
new("@outSum", SqlDbType.Int),
new("@outGuid", SqlDbType.UniqueIdentifier),
new("@outNo", SqlDbType.NVarChar, 300),
- new("@inOrderGuid",
- UtilityHelper.CheckGuid(guid)
- ? guid
- : DBNull.Value),
+ new("@inOrderGuid", UtilityHelper.CheckGuid(guid) ? guid : DBNull.Value),
new("@inShdh", shDh),
new("@inBz", bz),
new("@inGysId", gysId),
--
Gitblit v1.9.3