From d29337ee533cb2452189da81411eb14db11a9934 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 17 七月 2025 14:51:17 +0800
Subject: [PATCH] 推送接口开启删除类型
---
WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json | 25 ++++++++++--
WebApi/Gs.Sys/Services/FmController.cs | 4 +-
WebApi/.vs/GsMesSolution/v17/DocumentLayout.json | 69 ++++------------------------------
3 files changed, 32 insertions(+), 66 deletions(-)
diff --git a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
index 8f5db3b..aa7e59f 100644
--- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
+++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
@@ -7,6 +7,10 @@
"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\\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:{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}"
},
@@ -22,8 +26,21 @@
"DocumentGroups": [
{
"DockedWidth": 681,
- "SelectedChildIndex": 0,
+ "SelectedChildIndex": 1,
"Children": [
+ {
+ "$type": "Document",
+ "DocumentIndex": 1,
+ "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": "AgIAAF0AAAAAAAAAAAAIwG0AAAA4AAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-16T10:04:03.958Z",
+ "EditorCaption": ""
+ },
{
"$type": "Document",
"DocumentIndex": 0,
@@ -32,14 +49,14 @@
"RelativeDocumentMoniker": "Gs.Warehouse\\Services\\MesInvItemArnManager.cs",
"ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesInvItemArnManager.cs",
"RelativeToolTip": "Gs.Warehouse\\Services\\MesInvItemArnManager.cs",
- "ViewState": "AgIAAGEAAAAAAAAAAAAiwHkAAAA6AAAAAAAAAA==",
+ "ViewState": "AgIAAGcBAAAAzczMzMwYwHMBAAA9AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-07-16T05:20:26.899Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 2,
"Title": "XlsInOutController.cs",
"DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Report\\XlsInOutController.cs",
"RelativeDocumentMoniker": "Gs.Report\\XlsInOutController.cs",
@@ -52,7 +69,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 3,
"Title": "MesFileController.cs",
"DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\MesFileController.cs",
"RelativeDocumentMoniker": "Gs.Sys\\Services\\MesFileController.cs",
diff --git a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
index 652a1cd..fea20d5 100644
--- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
+++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
@@ -3,20 +3,8 @@
"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\\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:{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:{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:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.sys\\services\\mesfilecontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|solutionrelative:gs.sys\\services\\mesfilecontroller.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": [
@@ -31,53 +19,14 @@
{
"$type": "Document",
"DocumentIndex": 0,
- "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": "AgIAAF0AAAAAAAAAAAAIwG0AAAA4AAAAAAAAAA==",
+ "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": "AgIAAPEAAAAAAAAAAAArwAEBAAAPAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-16T10:04:03.958Z",
- "EditorCaption": ""
- },
- {
- "$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": "AgIAAGEAAAAAAAAAAAAiwHkAAAA6AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-16T05:20:26.899Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 2,
- "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": "AgIAALcBAAAAAAAAAAAvwLEBAAAoAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-16T04:46:07.329Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 3,
- "Title": "MesFileController.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\MesFileController.cs",
- "RelativeDocumentMoniker": "Gs.Sys\\Services\\MesFileController.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\MesFileController.cs",
- "RelativeToolTip": "Gs.Sys\\Services\\MesFileController.cs",
- "ViewState": "AgIAAB4AAAAAAAAAAAAgwCEAAAAEAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-16T02:51:58.045Z",
+ "WhenOpened": "2025-07-17T05:31:54.431Z",
"EditorCaption": ""
}
]
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();
--
Gitblit v1.9.3