From 572afa4a6a54973d9281dc0b174a5565a786c405 Mon Sep 17 00:00:00 2001
From: 况洋洋 <3283105747@qq.com>
Date: 星期三, 09 七月 2025 12:54:24 +0800
Subject: [PATCH] IQC异常报告修改（增加修改、保存、反审核按钮。明细行增加合格、工废、料废计算）
---
WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json | 74 ++++----------
WebApi/GS.QC/Service/MesQcExceptionalManager.cs | 110 +++++++++++++++++++++
WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs | 4
WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db | 0
WebApi/.vs/ProjectEvaluation/gsmessolution.projects.v9.bin | 0
WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2 | 0
WebApi/.vs/GsMesSolution/v17/DocumentLayout.json | 91 ++++--------------
WebApi/Gs.Sys/Services/FmController.cs | 1
WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db | 0
WebApi/.vs/GsMesSolution/v17/.futdcache.v2 | 0
WebApi/.vs/ProjectEvaluation/gsmessolution.metadata.v9.bin | 0
WebApi/Gs.HostIIS/appsettings.json | 2
WebApi/.vs/ProjectEvaluation/gsmessolution.strings.v9.bin | 0
13 files changed, 152 insertions(+), 130 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 dd6609f..3b5303c 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 d7f3025..921a240 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 ffa2c4f..1a1d2bb 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 bb7b054..120eff4 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 5cecef8..f22356a 100644
--- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
+++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
@@ -3,20 +3,12 @@
"WorkspaceRootPath": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\",
"Documents": [
{
- "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:{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\\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:{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}"
+ "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}"
}
],
"DocumentGroupContainers": [
@@ -26,58 +18,32 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 1,
+ "SelectedChildIndex": 0,
"Children": [
{
"$type": "Document",
- "DocumentIndex": 1,
- "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": "AgIAACoAAACAZmZmZmYywG4AAAAUAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "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==",
+ "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": "AgIAAIoAAAAAAAAAAAA3wPAAAAANAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-03T11:33:28.018Z",
+ "WhenOpened": "2025-07-08T06:49:04.717Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 2,
- "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==",
+ "DocumentIndex": 1,
+ "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": "AgIAAAgBAAAAZmZmZmYOwMAAAAAXAAAAAAAAAA==",
"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",
+ "WhenOpened": "2025-07-08T06:41:30.019Z",
"EditorCaption": ""
}
]
diff --git a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
index ef97d04..e68e4a0 100644
--- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
+++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
@@ -3,24 +3,12 @@
"WorkspaceRootPath": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\",
"Documents": [
{
- "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:{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:{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:{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}"
+ "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}"
}
],
"DocumentGroupContainers": [
@@ -30,71 +18,32 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 0,
+ "SelectedChildIndex": 1,
"Children": [
{
"$type": "Document",
- "DocumentIndex": 0,
- "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-04T05:21:36.564Z",
- "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": "AgIAACoAAACAZmZmZmYywG4AAAAUAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-03T11:36:35.451Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
"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==",
+ "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": "AgIAAF4AAAAAAAAAAIA5wMwAAAAhAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-03T11:33:28.018Z",
+ "WhenOpened": "2025-07-08T06:49:04.717Z",
"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==",
+ "DocumentIndex": 0,
+ "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": "AgIAAMEAAAAAZmZmZmYGwNUAAAAgAAAAAAAAAA==",
"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",
+ "WhenOpened": "2025-07-08T06:41:30.019Z",
"EditorCaption": ""
}
]
diff --git a/WebApi/.vs/ProjectEvaluation/gsmessolution.metadata.v9.bin b/WebApi/.vs/ProjectEvaluation/gsmessolution.metadata.v9.bin
index bab5ed2..cfcd1cf 100644
--- a/WebApi/.vs/ProjectEvaluation/gsmessolution.metadata.v9.bin
+++ b/WebApi/.vs/ProjectEvaluation/gsmessolution.metadata.v9.bin
Binary files differ
diff --git a/WebApi/.vs/ProjectEvaluation/gsmessolution.projects.v9.bin b/WebApi/.vs/ProjectEvaluation/gsmessolution.projects.v9.bin
index a0be0f5..5df06b7 100644
--- a/WebApi/.vs/ProjectEvaluation/gsmessolution.projects.v9.bin
+++ b/WebApi/.vs/ProjectEvaluation/gsmessolution.projects.v9.bin
Binary files differ
diff --git a/WebApi/.vs/ProjectEvaluation/gsmessolution.strings.v9.bin b/WebApi/.vs/ProjectEvaluation/gsmessolution.strings.v9.bin
index 20ec56b..62bf5d7 100644
--- a/WebApi/.vs/ProjectEvaluation/gsmessolution.strings.v9.bin
+++ b/WebApi/.vs/ProjectEvaluation/gsmessolution.strings.v9.bin
Binary files differ
diff --git a/WebApi/GS.QC/Service/MesQcExceptionalManager.cs b/WebApi/GS.QC/Service/MesQcExceptionalManager.cs
index 2ef1c13..e1cf4c2 100644
--- a/WebApi/GS.QC/Service/MesQcExceptionalManager.cs
+++ b/WebApi/GS.QC/Service/MesQcExceptionalManager.cs
@@ -1,12 +1,14 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using System.Dynamic;
-using Gs.Toolbox;
+锘縰sing Gs.Toolbox;
using Gs.Toolbox.ApiCore.Abstract.Mvc;
using Gs.Toolbox.ApiCore.Common.Mvc;
using Gs.Toolbox.ApiCore.Group;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json.Linq;
+using System.Data;
+using System.Data.SqlClient;
+using System.Dynamic;
+using System.Text;
using static Gs.Toolbox.UtilityHelper;
namespace Gs.Wom.Service;
@@ -185,6 +187,106 @@
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
+ /// <summary>
+ /// 澧炲姞鎴栫紪杈戝疄浣�-浠呭鐞嗘槑缁嗘暟鎹殑缂栬緫鎿嶄綔
+ /// </summary>
+ /// <param name="model">鍖呭惈鏄庣粏鍒楄〃鐨勬ā鍨�</param>
+ /// <returns>澶勭悊缁撴灉</returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<ExpandoObject> EditModel([FromBody] dynamic model)
+ {
+ // 鍒濆鍖栧瓧绗︿覆鏋勫缓鍣ㄥ鐞嗘槑缁嗘暟鎹�
+ Guid? guid = model.guid; //涓婚敭
+ var _sb = new StringBuilder();
+ var _split = "|"; // 瀛楁鍒嗛殧绗�
+ var _lineSeparator = "~"; // 琛屽垎闅旂
+
+ // 澶勭悊鏄庣粏鍒楄〃锛岃浆鎹负瀛樺偍杩囩▼鎵�闇�鏍煎紡
+ foreach (var m in model.list)
+ {
+ // 鑾峰彇鏄庣粏椤逛富閿紙鍙负绌猴紝鏂板鏃朵负绌猴級
+ string _guid = m.Guid?.ToString() ?? Guid.Empty.ToString();
+
+
+ // 鎷兼帴鍗曡鏄庣粏鏁版嵁锛殀鐢宠鏁伴噺|澶囨敞|鏄庣粏GUID
+ var _line = m.BatchQty + _split + m.GfRkqty + _split + m.LfRkqtyz + _split
+ + (UtilityHelper.CheckGuid(_guid) ? _guid : Guid.Empty.ToString());
+
+ // 澶氭潯鏄庣粏闂存坊鍔犲垎闅旂
+ if (_sb.Length > 0)
+ _sb.Append(_lineSeparator);
+ _sb.Append(_line);
+ }
+
+ // 鍑嗗杩斿洖缁撴灉瀵硅薄
+ dynamic mObj = new ExpandoObject();
+ mObj.outMsg = ""; // 鎿嶄綔娑堟伅
+ mObj.outSum = -1; // 鎿嶄綔缁撴灉鐘舵�侊紙-1琛ㄧず澶辫触锛�
+ mObj.outGuid = ""; // 鍙繚鐣欑敤浜庤繑鍥炴槑缁嗙浉鍏崇殑GUID
+ mObj.outNo = ""; // 鍙繚鐣欑敤浜庤繑鍥炴槑缁嗙浉鍏崇殑缂栧彿
+
+ // 璋冪敤瀛樺偍杩囩▼澶勭悊鏄庣粏鏁版嵁
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("[prc_Qcyc_edt]", conn)) // 寤鸿淇敼瀛樺偍杩囩▼鍚嶄负鏄庣粏涓撶敤
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+
+ // 瀹氫箟瀛樺偍杩囩▼鍙傛暟锛堜粎淇濈暀涓庢槑缁嗙浉鍏崇殑鍙傛暟锛�
+ SqlParameter[] parameters =
+ {
+ new("@outMsg", SqlDbType.NVarChar, 300), // 杈撳嚭锛氭搷浣滄秷鎭�
+ new("@outSum", SqlDbType.Int), // 杈撳嚭锛氱粨鏋滅姸鎬侊紙>0琛ㄧず鎴愬姛锛�
+ new("@outGuid", SqlDbType.UniqueIdentifier),// 杈撳嚭锛氬彲杩斿洖澶勭悊鍚庣殑鏄庣粏鍏宠仈ID
+ new("@outNo", SqlDbType.NVarChar, 300), // 杈撳嚭锛氬彲杩斿洖鏄庣粏鐩稿叧缂栧彿
+ new("@inOrderGuid",UtilityHelper.CheckGuid(guid)? guid : DBNull.Value),//涓昏〃GUID
+ new("@inEdtUserGuid", _userGuid), // 杈撳叆锛氭搷浣滅敤鎴稧UID
+ new("@inLineList", _sb.ToString()) // 杈撳叆锛氬鐞嗗悗鐨勬槑缁嗗瓧绗︿覆
+ };
+
+ // 璁剧疆杈撳嚭鍙傛暟鏂瑰悜
+ parameters[0].Direction = ParameterDirection.Output;
+ parameters[1].Direction = ParameterDirection.Output;
+ parameters[2].Direction = ParameterDirection.Output;
+ parameters[3].Direction = ParameterDirection.Output;
+
+ // 娣诲姞鍙傛暟鍒板懡浠ゅ璞�
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+
+ // 鎵ц瀛樺偍杩囩▼
+ cmd.ExecuteNonQuery();
+
+ // 浠庤緭鍑哄弬鏁拌幏鍙栫粨鏋�
+ mObj.outMsg = parameters[0].Value?.ToString() ?? "澶勭悊鎴愬姛";
+ mObj.outSum = int.TryParse(parameters[1].Value?.ToString(), out int sum) ? sum : -1;
+ mObj.outGuid = parameters[2].Value?.ToString() ?? "";
+ mObj.outNo = parameters[3].Value?.ToString() ?? "";
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍寮傚父鏃ュ織
+ LogHelper.Debug(ToString(), $"澶勭悊鏄庣粏鏃跺嚭閿欙細{ex.Message}");
+ mObj.outMsg = ex.Message;
+ mObj.outSum = -1;
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+
+ // 鏍规嵁澶勭悊缁撴灉杩斿洖瀵瑰簲鐘舵��
+ if (mObj.outSum <= 0)
+ return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Exception, mObj.outMsg);
+
+ return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success, mObj.outMsg);
+ }
+
/// <summary>
/// 寮傚父鍗昈AtoMes
diff --git a/WebApi/Gs.HostIIS/appsettings.json b/WebApi/Gs.HostIIS/appsettings.json
index 67e3df5..11bc731 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.100:8056/MesToKd.asmx/MesToErpinfoTest",
+ "TestErpUrl": "http://192.168.1.101:8083/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",
diff --git a/WebApi/Gs.Sys/Services/FmController.cs b/WebApi/Gs.Sys/Services/FmController.cs
index d985ea0..d3adfee 100644
--- a/WebApi/Gs.Sys/Services/FmController.cs
+++ b/WebApi/Gs.Sys/Services/FmController.cs
@@ -296,6 +296,7 @@
taskname = keyTaskName,
optype = keyMeth,
datajson = JsonConvert.SerializeObject(_datajson),
+ // datajson = (_datajson),
};
return JsonConvert.SerializeObject(_obj);
}
diff --git a/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs b/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
index d21ba21..fbf8c8b 100644
--- a/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
@@ -377,6 +377,7 @@
new("@inEdtUserGuid", _userGuid),
new("@inOrderGuid", _guid),
new("@inFieldValue", 1),
+ new("@inFieldName", ""),
new("@in1", ""),
new("@in2", "")
};
@@ -385,8 +386,11 @@
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
cmd.ExecuteNonQuery();
+
+
m.outMsg = parameters[0].Value.ToString();
m.outSum = int.Parse(parameters[1].Value.ToString());
+
}
catch (Exception ex)
{
--
Gitblit v1.9.3