From 3fc8ff165721877e81e7ab181176be6ed5109744 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期六, 26 七月 2025 14:01:23 +0800
Subject: [PATCH] 产品工序维护更新
---
WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json | 146 +++++---------------
WebApi/Gs.Wom/WorkService/WorkTechniqueController.cs | 59 ++++---
WebApi/Gs.Wom/WorkService/WorkProController.cs | 11 +
WebApi/.vs/GsMesSolution/v17/DocumentLayout.json | 146 +++++---------------
4 files changed, 113 insertions(+), 249 deletions(-)
diff --git a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
index c0faae5..c99ad8e 100644
--- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
+++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
@@ -1,30 +1,14 @@
{
"Version": 1,
- "WorkspaceRootPath": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\",
+ "WorkspaceRootPath": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\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:{63823BC6-6242-4EBC-8B15-B72B89E8CEDA}|Gs.Wom\\Gs.Wom.csproj|d:\\visual studios job\\lw\\lw_messervice\\webapi\\gs.wom\\workservice\\worktechniquecontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{63823BC6-6242-4EBC-8B15-B72B89E8CEDA}|Gs.Wom\\Gs.Wom.csproj|solutionrelative:gs.wom\\workservice\\worktechniquecontroller.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:{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:{63823BC6-6242-4EBC-8B15-B72B89E8CEDA}|Gs.Wom\\Gs.Wom.csproj|d:\\visual studios job\\lw\\lw_messervice\\webapi\\gs.wom\\workservice\\workprocontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{63823BC6-6242-4EBC-8B15-B72B89E8CEDA}|Gs.Wom\\Gs.Wom.csproj|solutionrelative:gs.wom\\workservice\\workprocontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -33,106 +17,50 @@
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
- "DockedWidth": 681,
- "SelectedChildIndex": 4,
+ "DockedWidth": 200,
+ "SelectedChildIndex": 5,
"Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{b1e99781-ab81-11d0-b683-00aa00a3ee26}"
+ },
{
"$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": "WorkProController.cs",
+ "DocumentMoniker": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\Gs.Wom\\WorkService\\WorkProController.cs",
+ "RelativeDocumentMoniker": "Gs.Wom\\WorkService\\WorkProController.cs",
+ "ToolTip": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\Gs.Wom\\WorkService\\WorkProController.cs",
+ "RelativeToolTip": "Gs.Wom\\WorkService\\WorkProController.cs",
+ "ViewState": "AgIAADEAAAAAAAAAAAD4v0EAAAAPAAAAAAAAAA==",
"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-25T08:37:36.545Z",
"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": "WorkTechniqueController.cs",
+ "DocumentMoniker": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\Gs.Wom\\WorkService\\WorkTechniqueController.cs",
+ "RelativeDocumentMoniker": "Gs.Wom\\WorkService\\WorkTechniqueController.cs",
+ "ToolTip": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\Gs.Wom\\WorkService\\WorkTechniqueController.cs",
+ "RelativeToolTip": "Gs.Wom\\WorkService\\WorkTechniqueController.cs",
+ "ViewState": "AgIAAFkAAAAAAAAAAAAQwGMAAAArAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-17T08:35:48.139Z",
+ "WhenOpened": "2025-07-25T07:18:05.468Z",
"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": ""
- }
- ]
- },
- {
- "DockedWidth": 189,
- "SelectedChildIndex": -1,
- "Children": [
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
- }
- ]
- },
- {
- "DockedWidth": 364,
- "SelectedChildIndex": -1,
- "Children": [
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
}
]
}
diff --git a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
index c0faae5..c99ad8e 100644
--- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
+++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
@@ -1,30 +1,14 @@
{
"Version": 1,
- "WorkspaceRootPath": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\",
+ "WorkspaceRootPath": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\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:{63823BC6-6242-4EBC-8B15-B72B89E8CEDA}|Gs.Wom\\Gs.Wom.csproj|d:\\visual studios job\\lw\\lw_messervice\\webapi\\gs.wom\\workservice\\worktechniquecontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{63823BC6-6242-4EBC-8B15-B72B89E8CEDA}|Gs.Wom\\Gs.Wom.csproj|solutionrelative:gs.wom\\workservice\\worktechniquecontroller.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:{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:{63823BC6-6242-4EBC-8B15-B72B89E8CEDA}|Gs.Wom\\Gs.Wom.csproj|d:\\visual studios job\\lw\\lw_messervice\\webapi\\gs.wom\\workservice\\workprocontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{63823BC6-6242-4EBC-8B15-B72B89E8CEDA}|Gs.Wom\\Gs.Wom.csproj|solutionrelative:gs.wom\\workservice\\workprocontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -33,106 +17,50 @@
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
- "DockedWidth": 681,
- "SelectedChildIndex": 4,
+ "DockedWidth": 200,
+ "SelectedChildIndex": 5,
"Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{b1e99781-ab81-11d0-b683-00aa00a3ee26}"
+ },
{
"$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": "WorkProController.cs",
+ "DocumentMoniker": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\Gs.Wom\\WorkService\\WorkProController.cs",
+ "RelativeDocumentMoniker": "Gs.Wom\\WorkService\\WorkProController.cs",
+ "ToolTip": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\Gs.Wom\\WorkService\\WorkProController.cs",
+ "RelativeToolTip": "Gs.Wom\\WorkService\\WorkProController.cs",
+ "ViewState": "AgIAADEAAAAAAAAAAAD4v0EAAAAPAAAAAAAAAA==",
"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-25T08:37:36.545Z",
"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": "WorkTechniqueController.cs",
+ "DocumentMoniker": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\Gs.Wom\\WorkService\\WorkTechniqueController.cs",
+ "RelativeDocumentMoniker": "Gs.Wom\\WorkService\\WorkTechniqueController.cs",
+ "ToolTip": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\Gs.Wom\\WorkService\\WorkTechniqueController.cs",
+ "RelativeToolTip": "Gs.Wom\\WorkService\\WorkTechniqueController.cs",
+ "ViewState": "AgIAAFkAAAAAAAAAAAAQwGMAAAArAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-17T08:35:48.139Z",
+ "WhenOpened": "2025-07-25T07:18:05.468Z",
"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": ""
- }
- ]
- },
- {
- "DockedWidth": 189,
- "SelectedChildIndex": -1,
- "Children": [
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
- }
- ]
- },
- {
- "DockedWidth": 364,
- "SelectedChildIndex": -1,
- "Children": [
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
}
]
}
diff --git a/WebApi/Gs.Wom/WorkService/WorkProController.cs b/WebApi/Gs.Wom/WorkService/WorkProController.cs
index 95d19cf..8c7cb2c 100644
--- a/WebApi/Gs.Wom/WorkService/WorkProController.cs
+++ b/WebApi/Gs.Wom/WorkService/WorkProController.cs
@@ -38,6 +38,9 @@
[RequestMethod(RequestMethods.POST)]
public ReturnDto<PageList<dynamic>> GetListPage([FromBody] PageQuery model)
{
+
+ //(case a.isStatus when 1 then '姝ｅ父' when - 1 then '绂佺敤' else cast(a.isStatus as nvarchar(4)) end) as isStatusTxt
+
var currentPage = model.currentPage;
var everyPageSize = model.everyPageSize;
var sortName = string.IsNullOrEmpty(model.sortName)
@@ -49,7 +52,7 @@
sbSql.Append("( ");
sbSql.Append("select top 100000 ROW_NUMBER() over(order by " +
sortName + " " + model.sortOrder +
- ") as rowIndex,cast(0 as bit) as chkInt, a.*,(a.processNo+':'+a.processName) as processNoAndName,(case a.isStatus when 1 then '姝ｅ父' when -1 then '绂佺敤' else cast(a.isStatus as nvarchar(4)) end) as isStatusTxt from WORK_PROCESS a where 1=1" +
+ ") as rowIndex,cast(0 as bit) as chkInt, a.*,(a.PROC_NO+':'+a.PROC_NAME) as processNoAndName from MES_PROC_INFO a where 1=1" +
keyWhere);
sbSql.Append(") as T ");
sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" +
@@ -57,8 +60,8 @@
everyPageSize);
sbSql.Append(" order by rowindex asc ");
sbSql.Append(
- " select count(1) as intTotal from WORK_PROCESS a where 1=1 " +
- keyWhere);
+ " select count(1) as intTotal from MES_PROC_INFO a where 1=1 " +
+ keyWhere);
var dset = new DataSet();
try
{
@@ -120,7 +123,7 @@
return ReturnDto<int>.QuickReturn(default(int?),
ReturnCode.Exception, "鍒犻櫎澶辫触锛岃淇℃伅宸茶瀹℃牳锛�");
System.Text.StringBuilder sbSql = new StringBuilder();
- sbSql.Append("delete from WORK_PROCESS ");
+ sbSql.Append("delete from MES_PROC_INFO ");
sbSql.Append(" where guid in (select line from dbo.fn_split('" + sbGuid.ToString() + "',','))");
var rows = DbHelperSQL.ExecuteSql(sbSql.ToString());
rtnInt = rows;
diff --git a/WebApi/Gs.Wom/WorkService/WorkTechniqueController.cs b/WebApi/Gs.Wom/WorkService/WorkTechniqueController.cs
index 8c8b8fe..25c4145 100644
--- a/WebApi/Gs.Wom/WorkService/WorkTechniqueController.cs
+++ b/WebApi/Gs.Wom/WorkService/WorkTechniqueController.cs
@@ -49,7 +49,8 @@
var dset = new DataSet();
try
{
- dset = DbHelperSQL.RunProcedure("[work_technique_mx]", parameters, "0");
+ //dset = DbHelperSQL.RunProcedure("[work_technique_mx]", parameters, "0");
+ dset = DbHelperSQL.RunProcedure("[mes_prod_gx_mx]", parameters, "0");
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0)
{
@@ -57,7 +58,7 @@
m = dr.RowToDynamic();
var _tb = dset.Tables[1].TableToDynamicList();
m.list = _tb;
- var _tb2 = dset.Tables[1].TableToDynamicList();
+ var _tb2 = dset.Tables[2].TableToDynamicList();
m.list2 = _tb2;
}
}
@@ -80,28 +81,36 @@
public ReturnDto<ExpandoObject> EditModel([FromBody] dynamic model)
{
Guid? guid = model.guid; //浜у搧涓婚敭
- string fType = model.fType;
- string fBegDate = model.fBegDate;
- string fEndDate = model.fEndDate;
- string fJingDu = model.fJingDu;
- string fCapacity = model.fCapacity;
- string fMaxWeight = model.fMaxWeight;
- string fMinWeight = model.fMinWeight;
- string fSumPeople = model.fSumPeople;
- string remark = model.remark;
+ string orgName = model.orgName;
+ string itemNo = model.itemNo;
var _sb = new StringBuilder();
var _split = "|";
foreach (var m in model.list)
{
- var _line = m.fSeq + _split
+ var _line = m.guid + _split
+ m.processNo + _split
- + m.statStatus + _split
- + m.collectionName + _split
- + m.remark + _split
+ + m.gxOrder + _split
+ + m.signingFlag + _split
+ + m.storageFlag + _split
+ m.frontProcessNo;
if (_sb.Length > 0)
_sb.Append("~");
_sb.Append(_line);
+ }
+ var _sb2 = new StringBuilder();
+ var _split2 = "|";
+ foreach (var m in model.list2)
+ {
+ var _line2 = m.guid + _split2
+ + m.workers + _split2
+ + m.hours + _split2
+ + m.capacity + _split2
+ + m.sCapacity + _split2
+ + m.lineType + _split2
+ + m.changeTime;
+ if (_sb2.Length > 0)
+ _sb2.Append("~");
+ _sb2.Append(_line2);
}
dynamic mObj = new ExpandoObject();
mObj.outMsg = "";
@@ -110,7 +119,8 @@
mObj.outNo = "";
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- using (var cmd = new SqlCommand("[work_technique_edt]", conn))
+ //using (var cmd = new SqlCommand("[work_technique_edt]", conn))
+ using (var cmd = new SqlCommand("[mes_prod_gx_edt]", conn))
{
try
{
@@ -123,17 +133,11 @@
new("@outGuid", SqlDbType.UniqueIdentifier),
new("@outNo", SqlDbType.NVarChar, 300),
new("@inOrderGuid", CheckGuid(guid) ? guid : DBNull.Value),
- new("@fType", fType),
- new("@fBegDate", fBegDate),
- new("@fEndDate", fEndDate),
- new("@fJingDu", fJingDu),
- new("@fCapacity", fCapacity),
- new("@fMaxWeight", fMaxWeight),
- new("@fMinWeight", fMinWeight),
- new("@fSumPeople", fSumPeople),
- new("@remark", remark),
+ new("@orgName", orgName),
+ new("@itemNo", itemNo),
new("@inEdtUserGuid", _userGuid),
- new("@inLineList", _sb.ToString())
+ new("@inLineList", _sb.ToString()),
+ new("@inLineList2", _sb2.ToString())
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -241,7 +245,8 @@
var _outSum = -1;
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- using (var cmd = new SqlCommand("[work_technique_del]", conn))
+ //using (var cmd = new SqlCommand("[work_technique_del]", conn))
+ using (var cmd = new SqlCommand("[mes_prod_gx_del]", conn))
{
try
{
--
Gitblit v1.9.3