From 8dc5b454d0cfd259bf72a5408406e9bfe4aca2b2 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 23 七月 2025 11:20:35 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesService
---
WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json | 112 ++++++++++-------
WebApi/Gs.Sys/Services/FmController.cs | 4
WebApi/GS.QC/Service/MesQcExceptionalManager.cs | 3
WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs | 7 +
WebApi/GS.QC/Service/MesDefectCodeManager.cs | 46 +++++--
WebApi/Gs.Sys/Services/MesFileController.cs | 6
WebApi/.vs/GsMesSolution/v17/DocumentLayout.json | 144 ++++++++++-------------
7 files changed, 171 insertions(+), 151 deletions(-)
diff --git a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
index 1d51360..c0faae5 100644
--- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
+++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
@@ -3,24 +3,28 @@
"WorkspaceRootPath": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\",
"Documents": [
{
- "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\\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:{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:{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:{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:{D1743FF9-431C-4D1A-A4B5-3C81D66EE282}|Gs.QiTaCk\\Gs.QiTaCk.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.qitack\\mesitemqtmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{D1743FF9-431C-4D1A-A4B5-3C81D66EE282}|Gs.QiTaCk\\Gs.QiTaCk.csproj|solutionrelative:gs.qitack\\mesitemqtmanager.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\\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:{3CA7A99D-C42B-440A-ADA7-B3D76CD02E7C}|Gs.Report\\Gs.Report.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.report\\xlsinoutcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{3CA7A99D-C42B-440A-ADA7-B3D76CD02E7C}|Gs.Report\\Gs.Report.csproj|solutionrelative:gs.report\\xlsinoutcontroller.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}"
}
],
"DocumentGroupContainers": [
@@ -30,7 +34,7 @@
"DocumentGroups": [
{
"DockedWidth": 681,
- "SelectedChildIndex": 1,
+ "SelectedChildIndex": 4,
"Children": [
{
"$type": "Document",
@@ -40,61 +44,75 @@
"RelativeDocumentMoniker": "GS.QC\\Service\\MesQcExceptionalManager.cs",
"ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\GS.QC\\Service\\MesQcExceptionalManager.cs",
"RelativeToolTip": "GS.QC\\Service\\MesQcExceptionalManager.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAACEAAAAAAAAAAAAAAA==",
+ "ViewState": "AgIAAMIAAAAAAAAAAAAiwMoAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-08T06:49:04.717Z",
- "IsPinned": true,
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 0,
- "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": "AgIAAAMAAAAAAAAAAAAAAA0AAAAAAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-14T02:53:23.897Z",
+ "WhenOpened": "2025-07-18T09:27:23.979Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 2,
- "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": "AgIAAJYBAAAAAAAAAAAYwKEBAAAoAAAAAAAAAA==",
+ "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-11T08:30:19.699Z",
+ "WhenOpened": "2025-07-18T08:30:35.638Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 4,
- "Title": "XlsInOutController.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Report\\XlsInOutController.cs",
- "RelativeDocumentMoniker": "Gs.Report\\XlsInOutController.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Report\\XlsInOutController.cs",
- "RelativeToolTip": "Gs.Report\\XlsInOutController.cs",
- "ViewState": "AgIAAHABAAAAoJmZmZnZv7IBAAAEAAAAAAAAAA==",
+ "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-11T07:16:54.295Z"
+ "WhenOpened": "2025-07-18T06:49:39.738Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 3,
- "Title": "MesItemQtManager.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.QiTaCk\\MesItemQtManager.cs",
- "RelativeDocumentMoniker": "Gs.QiTaCk\\MesItemQtManager.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.QiTaCk\\MesItemQtManager.cs",
- "RelativeToolTip": "Gs.QiTaCk\\MesItemQtManager.cs",
- "ViewState": "AgIAACAAAAAAAAAAAAAAwNUAAAAgAAAAAAAAAA==",
+ "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==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-08T06:41:30.019Z"
+ "WhenOpened": "2025-07-17T08:35:48.139Z",
+ "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==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-17T05:31:54.431Z",
+ "EditorCaption": ""
}
]
},
diff --git a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
index fa52c94..c0faae5 100644
--- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
+++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
@@ -3,32 +3,28 @@
"WorkspaceRootPath": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\",
"Documents": [
{
- "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:{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:{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:{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:{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:{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:{D1743FF9-431C-4D1A-A4B5-3C81D66EE282}|Gs.QiTaCk\\Gs.QiTaCk.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.qitack\\mesitemqtmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{D1743FF9-431C-4D1A-A4B5-3C81D66EE282}|Gs.QiTaCk\\Gs.QiTaCk.csproj|solutionrelative:gs.qitack\\mesitemqtmanager.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\\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:{3CA7A99D-C42B-440A-ADA7-B3D76CD02E7C}|Gs.Report\\Gs.Report.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.report\\xlsinoutcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{3CA7A99D-C42B-440A-ADA7-B3D76CD02E7C}|Gs.Report\\Gs.Report.csproj|solutionrelative:gs.report\\xlsinoutcontroller.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:{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:{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}"
}
],
"DocumentGroupContainers": [
@@ -38,98 +34,84 @@
"DocumentGroups": [
{
"DockedWidth": 681,
- "SelectedChildIndex": 3,
+ "SelectedChildIndex": 4,
"Children": [
{
"$type": "Document",
- "DocumentIndex": 2,
+ "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": "AgIAAAAAAAAAAAAAAAAAACEAAAAAAAAAAAAAAA==",
+ "ViewState": "AgIAAMIAAAAAAAAAAAAiwMoAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-08T06:49:04.717Z",
- "IsPinned": true,
+ "WhenOpened": "2025-07-18T09:27:23.979Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
- "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": "AgIAAO8AAAAAAAAAAAAcwEwAAAAEAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-14T07:48:26.43Z",
+ "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": "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": "AgIAALsAAAAAAAAAAAAYwMQAAAAEAAAAAAAAAA==",
+ "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-14T07:25:52.763Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 0,
- "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": "AgIAAIIAAAAAAAAAAAAgwLIAAAAIAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-14T02:53:23.897Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 6,
- "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": "AgIAAJYBAAAAAAAAAAAYwKEBAAAoAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-11T08:30:19.699Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
- "Title": "XlsInOutController.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Report\\XlsInOutController.cs",
- "RelativeDocumentMoniker": "Gs.Report\\XlsInOutController.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Report\\XlsInOutController.cs",
- "RelativeToolTip": "Gs.Report\\XlsInOutController.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAPYAAAAEAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-11T07:16:54.295Z",
+ "WhenOpened": "2025-07-18T08:30:35.638Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 4,
- "Title": "MesItemQtManager.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.QiTaCk\\MesItemQtManager.cs",
- "RelativeDocumentMoniker": "Gs.QiTaCk\\MesItemQtManager.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.QiTaCk\\MesItemQtManager.cs",
- "RelativeToolTip": "Gs.QiTaCk\\MesItemQtManager.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAANUAAAAgAAAAAAAAAA==",
+ "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-08T06:41:30.019Z",
+ "WhenOpened": "2025-07-18T06:49:39.738Z",
+ "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==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-17T08:35:48.139Z",
+ "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==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-17T05:31:54.431Z",
"EditorCaption": ""
}
]
diff --git a/WebApi/GS.QC/Service/MesDefectCodeManager.cs b/WebApi/GS.QC/Service/MesDefectCodeManager.cs
index 96d6f31..d305cfa 100644
--- a/WebApi/GS.QC/Service/MesDefectCodeManager.cs
+++ b/WebApi/GS.QC/Service/MesDefectCodeManager.cs
@@ -35,33 +35,49 @@
/// <param name="query"></param>
/// <returns></returns>
[RequestMethod(RequestMethods.POST)]
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ缂洪櫡浠ｇ爜鍒楄〃鏁版嵁
+ /// </summary>
+ /// <param name="query">鍒嗛〉鏌ヨ鍙傛暟瀵硅薄锛堝寘鍚〉鐮併�佹瘡椤垫潯鏁般�佹帓搴忋�佹煡璇㈡潯浠剁瓑锛�</param>
+ /// <returns>鍖呭惈鍒嗛〉鏁版嵁鐨勮繑鍥炵粨鏋滐紙鏁版嵁鍒楄〃銆佹�绘潯鏁扮瓑锛�</returns>
public ReturnDto<PageList<MesDefectCode>> GetListPage(PageQuery query)
{
+ // 鍒濆鍖栧垎椤电粨鏋滃璞★紙榛樿绌哄垪琛紝鍚庣画浼氬～鍏呮暟鎹級
var pageList = new PageList<MesDefectCode>();
try
{
+ // 1. 鏋勫缓鏌ヨ鏉′欢锛圵HERE瀛愬彞锛�
+ // "1=1" 鏄竾鑳芥潯浠讹紙閬垮厤鍚庣画鎷兼帴鏉′欢鏃堕渶瑕佸垽鏂槸鍚﹀姞AND锛夛紝鎷兼帴鏌ヨ鍙傛暟涓殑鑷畾涔夋潯浠讹紙query.keyWhere锛�
var _sbWhere = new StringBuilder(" 1=1" + query.keyWhere);
- var _sbBy =
- new StringBuilder(query.sortName + " " + query.sortOrder);
- var totalCount = 0;
- var itemsList = Db.Queryable<MesDefectCode>("a")
- .Where(_sbWhere.ToString())
- .OrderBy(_sbBy.ToString())
- .ToPageList(query.currentPage, query.everyPageSize,
- ref totalCount);
- pageList = new PageList<MesDefectCode>(itemsList, totalCount,
- query.everyPageSize);
- return ReturnDto<PageList<MesDefectCode>>.QuickReturn(pageList,
- ReturnCode.Success, "璇诲彇鎴愬姛");
+ // 2. 鏋勫缓鎺掑簭鏉′欢锛圤RDER BY瀛愬彞锛�
+ // 鎷兼帴鎺掑簭瀛楁锛坬uery.sortName锛夊拰鎺掑簭鏂瑰悜锛坬uery.sortOrder锛屽"ASC"鍗囧簭銆�"DESC"闄嶅簭锛�
+ var _sbBy = new StringBuilder(query.sortName + " " + query.sortOrder);
+
+ // 3. 澹版槑鎬昏褰曟暟鍙橀噺锛堢敤浜庢帴鏀舵煡璇㈢粨鏋滅殑鎬绘潯鏁帮級
+ var totalCount = 0;
+
+ // 4. 鎵ц鍒嗛〉鏌ヨ
+ // 浣跨敤鏁版嵁搴撹闂伐鍏凤紙Db.Queryable锛夋煡璇esDefectCode琛紙鍒悕"a"锛�
+ var itemsList = Db.Queryable<MesDefectCode>("a")
+ .Where(_sbWhere.ToString()) // 搴旂敤WHERE鏉′欢
+ .OrderBy(_sbBy.ToString()) // 搴旂敤鎺掑簭鏉′欢
+ // 鍒嗛〉鏌ヨ锛氬綋鍓嶉〉鐮侊紙query.currentPage锛夈�佹瘡椤垫潯鏁帮紙query.everyPageSize锛夛紝鎬绘潯鏁伴�氳繃ref鍙傛暟杩斿洖
+ .ToPageList(query.currentPage, query.everyPageSize, ref totalCount);
+
+ // 5. 缁勮鍒嗛〉缁撴灉瀵硅薄
+ // 鍖呭惈褰撳墠椤垫暟鎹紙itemsList锛夈�佹�绘潯鏁帮紙totalCount锛夈�佹瘡椤垫潯鏁帮紙query.everyPageSize锛�
+ pageList = new PageList<MesDefectCode>(itemsList, totalCount, query.everyPageSize);
+
+ // 6. 杩斿洖鎴愬姛缁撴灉锛氬寘鍚垎椤垫暟鎹�佹垚鍔熺姸鎬佺爜銆佹彁绀轰俊鎭�
+ return ReturnDto<PageList<MesDefectCode>>.QuickReturn(pageList, ReturnCode.Success, "璇诲彇鎴愬姛");
}
catch (Exception ex)
{
- return ReturnDto<PageList<MesDefectCode>>.QuickReturn(pageList,
- ReturnCode.Default, ex.Message);
+ // 鎹曡幏寮傚父鏃讹紝杩斿洖绌哄垎椤电粨鏋溿�侀粯璁ら敊璇爜銆佸紓甯镐俊鎭�
+ return ReturnDto<PageList<MesDefectCode>>.QuickReturn(pageList, ReturnCode.Default, ex.Message);
}
}
-
/// <summary>
/// 璇诲彇
/// </summary>
diff --git a/WebApi/GS.QC/Service/MesQcExceptionalManager.cs b/WebApi/GS.QC/Service/MesQcExceptionalManager.cs
index e1cf4c2..2474328 100644
--- a/WebApi/GS.QC/Service/MesQcExceptionalManager.cs
+++ b/WebApi/GS.QC/Service/MesQcExceptionalManager.cs
@@ -209,7 +209,8 @@
// 鎷兼帴鍗曡鏄庣粏鏁版嵁锛殀鐢宠鏁伴噺|澶囨敞|鏄庣粏GUID
- var _line = m.BatchQty + _split + m.GfRkqty + _split + m.LfRkqtyz + _split
+ var _line = m.BatchQty + _split + m.GfRkqty + _split + m.LfRkqtyz + _split + m.HandResult + _split
+ + m.ChooseType + _split + m.Process + _split
+ (UtilityHelper.CheckGuid(_guid) ? _guid : Guid.Empty.ToString());
// 澶氭潯鏄庣粏闂存坊鍔犲垎闅旂
diff --git a/WebApi/Gs.Sys/Services/FmController.cs b/WebApi/Gs.Sys/Services/FmController.cs
index d3adfee..25965da 100644
--- a/WebApi/Gs.Sys/Services/FmController.cs
+++ b/WebApi/Gs.Sys/Services/FmController.cs
@@ -253,8 +253,8 @@
string keyMeth = model.keyMeth;
string keyNo = model.keyNo;
string idtype = model.idtype;//杩欎釜浠呬粎鏄洿鏂板伐鍗曠姸鎬佺殑鏃跺�欐湁
- if (keyMeth.ToUpper() == "delete".ToUpper())
- return "";
+ //if (keyMeth.ToUpper() == "delete".ToUpper())
+ // return "";
try
{
System.Data.DataSet dset = new System.Data.DataSet();
diff --git a/WebApi/Gs.Sys/Services/MesFileController.cs b/WebApi/Gs.Sys/Services/MesFileController.cs
index 20ad114..ae75e24 100644
--- a/WebApi/Gs.Sys/Services/MesFileController.cs
+++ b/WebApi/Gs.Sys/Services/MesFileController.cs
@@ -39,13 +39,11 @@
var _ary = file.FileName.Split("~");
var _parentGuid = _ary[0];
var _fileName = Guid.NewGuid() + _ary[1];
- var savePath = AppContext.BaseDirectory +
- AppSettingsHelper.getValueByKey("UploadPath");
+ var savePath = AppContext.BaseDirectory + AppSettingsHelper.getValueByKey("UploadPath");
if (!Directory.Exists(savePath)) Directory.CreateDirectory(savePath);
if (file == null || file.Length == 0)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Exception,
- "璇烽�夋嫨鏂囦欢");
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Exception, "璇烽�夋嫨鏂囦欢");
var _fullName = Path.Combine(savePath, _fileName);
using (var stream = new FileStream(_fullName, FileMode.Create))
{
diff --git a/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs b/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
index fbf8c8b..638225b 100644
--- a/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
@@ -213,10 +213,14 @@
public ReturnDto<ExpandoObject> EditModel([FromBody] dynamic model)
{
Guid? guid = model.Guid; //鍒拌揣鍗曚富閿�
- string shDh = model.PaperBillNo; //閫佽揣鍗曞彿
+ //string shDh = model.PaperBillNo; //閫佽揣鍗曞彿
+ string shDh = model.bcsl;
string bz = model.Remark; //澶囨敞
string gysId = model.SuppId; //渚涘簲鍟�
string orgId = model.OrgId; //鏀舵枡缁勭粐
+
+ // string depot = model.Depot;//浠撳簱
+
var _sb = new StringBuilder();
var _split = "|";
foreach (var m in model.list)
@@ -260,6 +264,7 @@
new("@inBz", bz),
new("@inGysId", gysId),
new("@OrgId", orgId),
+ // new("@inDepot",depot),
new("@inEdtUserGuid", _userGuid),
new("@inLineList", _sb.ToString())
};
--
Gitblit v1.9.3