From 6edc6ea392f354f2e4ca7003cdd58a691347d772 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 11 七月 2025 15:35:54 +0800
Subject: [PATCH] 生产任务单新增字段、仓库新增仓位启用字段
---
.vs/MESApplication/v17/DocumentLayout.backup.json | 130 +++++++++++++++++++++++++
MES.Service/Dto/webApi/ErpCAB.cs | 2
MES.Service/Dto/webApi/ErpCAA.cs | 3
.vs/MESApplication/DesignTimeBuild/.dtbcache.v2 | 0
MES.Service/service/WomcaaManager.cs | 7 +
MES.Service/Dto/webApi/ErpDepots.cs | 2
.vs/ProjectEvaluation/mesapplication.metadata.v9.bin | 0
/dev/null | 0
MES.Service/Modes/Womcab.cs | 6 +
.vs/ProjectEvaluation/mesapplication.projects.v9.bin | 0
MES.Service/Modes/Womcaa.cs | 6 +
.vs/MESApplication/v17/DocumentLayout.json | 130 +++++++++++++++++++++++++
.vs/ProjectEvaluation/mesapplication.strings.v9.bin | 0
.vs/MESApplication/v17/.futdcache.v2 | 0
MES.Service/Modes/MesDepots.cs | 6 +
MES.Service/service/BasicData/MesDepotsManager.cs | 3
MESApplication/appsettings.json | 2
17 files changed, 288 insertions(+), 9 deletions(-)
diff --git a/.vs/MESApplication/DesignTimeBuild/.dtbcache.v2 b/.vs/MESApplication/DesignTimeBuild/.dtbcache.v2
index a3bd5bb..83ab16c 100644
--- a/.vs/MESApplication/DesignTimeBuild/.dtbcache.v2
+++ b/.vs/MESApplication/DesignTimeBuild/.dtbcache.v2
Binary files differ
diff --git a/.vs/MESApplication/FileContentIndex/4b05edfb-15f6-4b04-a028-362972182fe6.vsidx b/.vs/MESApplication/FileContentIndex/4b05edfb-15f6-4b04-a028-362972182fe6.vsidx
deleted file mode 100644
index 70aef67..0000000
--- a/.vs/MESApplication/FileContentIndex/4b05edfb-15f6-4b04-a028-362972182fe6.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/MESApplication/FileContentIndex/4f5e9628-bcef-4db5-a37e-47736fdf609b.vsidx b/.vs/MESApplication/FileContentIndex/4f5e9628-bcef-4db5-a37e-47736fdf609b.vsidx
deleted file mode 100644
index 33071dd..0000000
--- a/.vs/MESApplication/FileContentIndex/4f5e9628-bcef-4db5-a37e-47736fdf609b.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/MESApplication/FileContentIndex/c47b71e3-9720-45f1-a567-7247049821e4.vsidx b/.vs/MESApplication/FileContentIndex/c47b71e3-9720-45f1-a567-7247049821e4.vsidx
deleted file mode 100644
index 70aef67..0000000
--- a/.vs/MESApplication/FileContentIndex/c47b71e3-9720-45f1-a567-7247049821e4.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/MESApplication/v17/.futdcache.v2 b/.vs/MESApplication/v17/.futdcache.v2
index 2dced4c..1c2f847 100644
--- a/.vs/MESApplication/v17/.futdcache.v2
+++ b/.vs/MESApplication/v17/.futdcache.v2
Binary files differ
diff --git a/.vs/MESApplication/v17/DocumentLayout.backup.json b/.vs/MESApplication/v17/DocumentLayout.backup.json
index bd18343..86561bf 100644
--- a/.vs/MESApplication/v17/DocumentLayout.backup.json
+++ b/.vs/MESApplication/v17/DocumentLayout.backup.json
@@ -5,6 +5,30 @@
{
"AbsoluteMoniker": "D:0:0:{C0B360C5-E8CC-4BC3-AAA5-3F03A2D6C0AA}|MESApplication\\MESApplication.csproj|e:\\messourcecode\\meserpinterface\\mesapplication\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
"RelativeMoniker": "D:0:0:{C0B360C5-E8CC-4BC3-AAA5-3F03A2D6C0AA}|MESApplication\\MESApplication.csproj|solutionrelative:mesapplication\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|e:\\messourcecode\\meserpinterface\\mes.service\\service\\womcaamanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|solutionrelative:mes.service\\service\\womcaamanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|e:\\messourcecode\\meserpinterface\\mes.service\\modes\\womcaa.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|solutionrelative:mes.service\\modes\\womcaa.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|e:\\messourcecode\\meserpinterface\\mes.service\\modes\\womcab.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|solutionrelative:mes.service\\modes\\womcab.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{C0B360C5-E8CC-4BC3-AAA5-3F03A2D6C0AA}|MESApplication\\MESApplication.csproj|e:\\messourcecode\\meserpinterface\\mesapplication\\controllers\\womcaacontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C0B360C5-E8CC-4BC3-AAA5-3F03A2D6C0AA}|MESApplication\\MESApplication.csproj|solutionrelative:mesapplication\\controllers\\womcaacontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|e:\\messourcecode\\meserpinterface\\mes.service\\dto\\webapi\\erpcab.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|solutionrelative:mes.service\\dto\\webapi\\erpcab.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|e:\\messourcecode\\meserpinterface\\mes.service\\dto\\webapi\\erpcaa.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|solutionrelative:mes.service\\dto\\webapi\\erpcaa.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -14,8 +38,86 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 0,
+ "SelectedChildIndex": 6,
"Children": [
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "Title": "Womcab.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Modes\\Womcab.cs",
+ "RelativeDocumentMoniker": "MES.Service\\Modes\\Womcab.cs",
+ "ToolTip": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Modes\\Womcab.cs",
+ "RelativeToolTip": "MES.Service\\Modes\\Womcab.cs",
+ "ViewState": "AgIAAPQAAAAAaGZmZmYmwAQBAAABAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-09T12:15:06.215Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 2,
+ "Title": "Womcaa.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Modes\\Womcaa.cs",
+ "RelativeDocumentMoniker": "MES.Service\\Modes\\Womcaa.cs",
+ "ToolTip": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Modes\\Womcaa.cs",
+ "RelativeToolTip": "MES.Service\\Modes\\Womcaa.cs",
+ "ViewState": "AgIAAJoBAAAAAAAAAAAowLABAAApAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-09T12:13:29.129Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 1,
+ "Title": "WomcaaManager.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\service\\WomcaaManager.cs",
+ "RelativeDocumentMoniker": "MES.Service\\service\\WomcaaManager.cs",
+ "ToolTip": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\service\\WomcaaManager.cs",
+ "RelativeToolTip": "MES.Service\\service\\WomcaaManager.cs",
+ "ViewState": "AgIAAJcAAAAAaGZmZmb+v6cAAAArAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-09T12:13:00.149Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 5,
+ "Title": "ErpCAB.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Dto\\webApi\\ErpCAB.cs",
+ "RelativeDocumentMoniker": "MES.Service\\Dto\\webApi\\ErpCAB.cs",
+ "ToolTip": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Dto\\webApi\\ErpCAB.cs",
+ "RelativeToolTip": "MES.Service\\Dto\\webApi\\ErpCAB.cs",
+ "ViewState": "AgIAABwAAAAAAAAAAAA5wCgAAAABAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-09T12:11:57.697Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 6,
+ "Title": "ErpCAA.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Dto\\webApi\\ErpCAA.cs",
+ "RelativeDocumentMoniker": "MES.Service\\Dto\\webApi\\ErpCAA.cs",
+ "ToolTip": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Dto\\webApi\\ErpCAA.cs",
+ "RelativeToolTip": "MES.Service\\Dto\\webApi\\ErpCAA.cs",
+ "ViewState": "AgIAACUAAAAAAAAAAAAUwDIAAAAwAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-09T12:10:33.1Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
+ "Title": "WomcaaController.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\MesErpInterface\\MESApplication\\Controllers\\WomcaaController.cs",
+ "RelativeDocumentMoniker": "MESApplication\\Controllers\\WomcaaController.cs",
+ "ToolTip": "E:\\MesSourceCode\\MesErpInterface\\MESApplication\\Controllers\\WomcaaController.cs",
+ "RelativeToolTip": "MESApplication\\Controllers\\WomcaaController.cs",
+ "ViewState": "AgIAABgAAAAAAAAAAADwvyYAAAAdAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-08T08:46:48.79Z",
+ "EditorCaption": ""
+ },
{
"$type": "Document",
"DocumentIndex": 0,
@@ -24,12 +126,36 @@
"RelativeDocumentMoniker": "MESApplication\\appsettings.json",
"ToolTip": "E:\\MesSourceCode\\MesErpInterface\\MESApplication\\appsettings.json",
"RelativeToolTip": "MESApplication\\appsettings.json",
- "ViewState": "AgIAAAAAAAAAAAAAAADwvwUAAAAxAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
"WhenOpened": "2025-06-24T00:45:55.908Z",
"EditorCaption": ""
}
]
+ },
+ {
+ "DockedWidth": 127,
+ "SelectedChildIndex": -1,
+ "Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}"
+ },
+ {
+ "$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/.vs/MESApplication/v17/DocumentLayout.json b/.vs/MESApplication/v17/DocumentLayout.json
index f29b54b..9fcdd6a 100644
--- a/.vs/MESApplication/v17/DocumentLayout.json
+++ b/.vs/MESApplication/v17/DocumentLayout.json
@@ -3,8 +3,32 @@
"WorkspaceRootPath": "E:\\MesSourceCode\\MesErpInterface\\",
"Documents": [
{
+ "AbsoluteMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|e:\\messourcecode\\meserpinterface\\mes.service\\dto\\webapi\\erpcaa.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|solutionrelative:mes.service\\dto\\webapi\\erpcaa.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|e:\\messourcecode\\meserpinterface\\mes.service\\dto\\webapi\\erpcab.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|solutionrelative:mes.service\\dto\\webapi\\erpcab.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
"AbsoluteMoniker": "D:0:0:{C0B360C5-E8CC-4BC3-AAA5-3F03A2D6C0AA}|MESApplication\\MESApplication.csproj|e:\\messourcecode\\meserpinterface\\mesapplication\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
"RelativeMoniker": "D:0:0:{C0B360C5-E8CC-4BC3-AAA5-3F03A2D6C0AA}|MESApplication\\MESApplication.csproj|solutionrelative:mesapplication\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|e:\\messourcecode\\meserpinterface\\mes.service\\service\\womcaamanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|solutionrelative:mes.service\\service\\womcaamanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|e:\\messourcecode\\meserpinterface\\mes.service\\modes\\womcaa.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|solutionrelative:mes.service\\modes\\womcaa.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|e:\\messourcecode\\meserpinterface\\mes.service\\modes\\womcab.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{4E2F9B6C-9CB2-4091-80BE-469707FA85B9}|MES.Service\\MES.Service.csproj|solutionrelative:mes.service\\modes\\womcab.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{C0B360C5-E8CC-4BC3-AAA5-3F03A2D6C0AA}|MESApplication\\MESApplication.csproj|e:\\messourcecode\\meserpinterface\\mesapplication\\controllers\\womcaacontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C0B360C5-E8CC-4BC3-AAA5-3F03A2D6C0AA}|MESApplication\\MESApplication.csproj|solutionrelative:mesapplication\\controllers\\womcaacontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -14,22 +38,124 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 0,
+ "SelectedChildIndex": 4,
"Children": [
{
"$type": "Document",
+ "DocumentIndex": 5,
+ "Title": "Womcab.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Modes\\Womcab.cs",
+ "RelativeDocumentMoniker": "MES.Service\\Modes\\Womcab.cs",
+ "ToolTip": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Modes\\Womcab.cs",
+ "RelativeToolTip": "MES.Service\\Modes\\Womcab.cs",
+ "ViewState": "AgIAAPQAAAAAaGZmZmYmwAQBAAABAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-09T12:15:06.215Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
+ "Title": "Womcaa.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Modes\\Womcaa.cs",
+ "RelativeDocumentMoniker": "MES.Service\\Modes\\Womcaa.cs",
+ "ToolTip": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Modes\\Womcaa.cs",
+ "RelativeToolTip": "MES.Service\\Modes\\Womcaa.cs",
+ "ViewState": "AgIAAJoBAAAAAAAAAAAowLABAAApAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-09T12:13:29.129Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "Title": "WomcaaManager.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\service\\WomcaaManager.cs",
+ "RelativeDocumentMoniker": "MES.Service\\service\\WomcaaManager.cs",
+ "ToolTip": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\service\\WomcaaManager.cs",
+ "RelativeToolTip": "MES.Service\\service\\WomcaaManager.cs",
+ "ViewState": "AgIAAJcAAAAAaGZmZmb+v6cAAAArAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-09T12:13:00.149Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 1,
+ "Title": "ErpCAB.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Dto\\webApi\\ErpCAB.cs",
+ "RelativeDocumentMoniker": "MES.Service\\Dto\\webApi\\ErpCAB.cs",
+ "ToolTip": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Dto\\webApi\\ErpCAB.cs",
+ "RelativeToolTip": "MES.Service\\Dto\\webApi\\ErpCAB.cs",
+ "ViewState": "AgIAAB4AAAAAAAAAAAA6wCgAAAABAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-09T12:11:57.697Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
"DocumentIndex": 0,
+ "Title": "ErpCAA.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Dto\\webApi\\ErpCAA.cs",
+ "RelativeDocumentMoniker": "MES.Service\\Dto\\webApi\\ErpCAA.cs",
+ "ToolTip": "E:\\MesSourceCode\\MesErpInterface\\MES.Service\\Dto\\webApi\\ErpCAA.cs",
+ "RelativeToolTip": "MES.Service\\Dto\\webApi\\ErpCAA.cs",
+ "ViewState": "AgIAACUAAAAAAAAAAAAUwDMAAAABAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-09T12:10:33.1Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 6,
+ "Title": "WomcaaController.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\MesErpInterface\\MESApplication\\Controllers\\WomcaaController.cs",
+ "RelativeDocumentMoniker": "MESApplication\\Controllers\\WomcaaController.cs",
+ "ToolTip": "E:\\MesSourceCode\\MesErpInterface\\MESApplication\\Controllers\\WomcaaController.cs",
+ "RelativeToolTip": "MESApplication\\Controllers\\WomcaaController.cs",
+ "ViewState": "AgIAABgAAAAAAAAAAADwvyYAAAAdAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-08T08:46:48.79Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 2,
"Title": "appsettings.json",
"DocumentMoniker": "E:\\MesSourceCode\\MesErpInterface\\MESApplication\\appsettings.json",
"RelativeDocumentMoniker": "MESApplication\\appsettings.json",
"ToolTip": "E:\\MesSourceCode\\MesErpInterface\\MESApplication\\appsettings.json",
"RelativeToolTip": "MESApplication\\appsettings.json",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
"WhenOpened": "2025-06-24T00:45:55.908Z",
"EditorCaption": ""
}
]
+ },
+ {
+ "DockedWidth": 127,
+ "SelectedChildIndex": -1,
+ "Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}"
+ },
+ {
+ "$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/.vs/ProjectEvaluation/mesapplication.metadata.v9.bin b/.vs/ProjectEvaluation/mesapplication.metadata.v9.bin
index 261cb8e..e91a539 100644
--- a/.vs/ProjectEvaluation/mesapplication.metadata.v9.bin
+++ b/.vs/ProjectEvaluation/mesapplication.metadata.v9.bin
Binary files differ
diff --git a/.vs/ProjectEvaluation/mesapplication.projects.v9.bin b/.vs/ProjectEvaluation/mesapplication.projects.v9.bin
index 1c020ba..e8aefc2 100644
--- a/.vs/ProjectEvaluation/mesapplication.projects.v9.bin
+++ b/.vs/ProjectEvaluation/mesapplication.projects.v9.bin
Binary files differ
diff --git a/.vs/ProjectEvaluation/mesapplication.strings.v9.bin b/.vs/ProjectEvaluation/mesapplication.strings.v9.bin
index ddf64ed..88b94a3 100644
--- a/.vs/ProjectEvaluation/mesapplication.strings.v9.bin
+++ b/.vs/ProjectEvaluation/mesapplication.strings.v9.bin
Binary files differ
diff --git a/MES.Service/Dto/webApi/ErpCAA.cs b/MES.Service/Dto/webApi/ErpCAA.cs
index 5851070..7eb73b0 100644
--- a/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/MES.Service/Dto/webApi/ErpCAA.cs
@@ -46,4 +46,7 @@
public string? Btbz { get; set; }
public string? TypeA { get; set; }
+
+ //榫欏穽瀛楁 姝ｈ埅閿�鍞鍗曞彿
+ public string? F_WPVT_TEXT_CA9 { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpCAB.cs b/MES.Service/Dto/webApi/ErpCAB.cs
index 7948eea..fa4e655 100644
--- a/MES.Service/Dto/webApi/ErpCAB.cs
+++ b/MES.Service/Dto/webApi/ErpCAB.cs
@@ -36,4 +36,6 @@
public string? FMustQty { get; set; }
public string? TypeB { get; set; }
+ //榫欏穽瀛楁 鐗╂枡淇濈鍛�
+ public string? F_WPVT_TEXT_RE5 { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpDepots.cs b/MES.Service/Dto/webApi/ErpDepots.cs
index 1f70ffd..8868de6 100644
--- a/MES.Service/Dto/webApi/ErpDepots.cs
+++ b/MES.Service/Dto/webApi/ErpDepots.cs
@@ -20,7 +20,7 @@
public string? FCustomerId { get; set; }
public string? FDocumentStatus { get; set; }
public string? FStockStatusType { get; set; }
-
+ public string? FISOPENLOCATION { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesDepots.cs b/MES.Service/Modes/MesDepots.cs
index 8099302..ac6cc7b 100644
--- a/MES.Service/Modes/MesDepots.cs
+++ b/MES.Service/Modes/MesDepots.cs
@@ -244,6 +244,12 @@
[SugarColumn(ColumnName = "FStockStatusType")]
public string? FStockStatusType { get; set; }
+ /// <summary>
+ /// 鍚敤浠撲綅绠＄悊
+ /// </summary>
+ [SugarColumn(ColumnName = "FISOPENLOCATION")]
+ public string? FISOPENLOCATION { get; set; }
+
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index d5f7e5f..4840a67 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -426,4 +426,10 @@
/// </summary>
[SugarColumn(ColumnName = "SYNCHRONOUS_DATE")]
public DateTime? SynchronousDate { get; set; }
+
+ /// <summary>
+ /// 姝ｈ埅閿�鍞鍗曞彿(榫欏穽)
+ /// </summary>
+ [SugarColumn(ColumnName = "ZH_XSDD")]
+ public string? ZH_XSDD { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcab.cs b/MES.Service/Modes/Womcab.cs
index 5288f84..64ed4b6 100644
--- a/MES.Service/Modes/Womcab.cs
+++ b/MES.Service/Modes/Womcab.cs
@@ -252,4 +252,10 @@
/// </summary>
[SugarColumn(ColumnName = "TYPEB")]
public string? Typeb { get; set; }
+
+ /// <summary>
+ /// A锛屽垱寤� B锛屽鏍镐腑 C锛屽凡瀹℃牳 D锛岄噸鏂板鏍� Z锛屾殏瀛�
+ /// </summary>
+ [SugarColumn(ColumnName = "LW_WLBGY")]
+ public string? LW_WLBGY { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs
index de65f0b..82766b4 100644
--- a/MES.Service/service/BasicData/MesDepotsManager.cs
+++ b/MES.Service/service/BasicData/MesDepotsManager.cs
@@ -112,7 +112,8 @@
Factory = "1000",
FCustomerId = depots.FCustomerId,
FDocumentStatus = depots.FDocumentStatus,
- FStockStatusType = depots.FStockStatusType
+ FStockStatusType = depots.FStockStatusType,
+ FISOPENLOCATION = depots.FISOPENLOCATION
};
}
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index cb30102..9a109f5 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -165,7 +165,9 @@
Caa0111 = dto.FPlanFinishDate, /// 棰勮瀹屽伐鏃堕棿澶囦唤
Typea = dto.TypeA, /// 棰勮瀹屽伐鏃堕棿澶囦唤
//Typeb = dto.TypeB /// 棰勮瀹屽伐鏃堕棿澶囦唤
- SynchronousDate = DateTime.Now
+ SynchronousDate = DateTime.Now,
+ ZH_XSDD = dto.F_WPVT_TEXT_CA9
+
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
@@ -218,7 +220,8 @@
UseRate = Convert.ToDecimal(dto.FUseRate),
MaterialType = dto.FMaterialType,
MustQty = Convert.ToDecimal(dto.FMustQty),
- Typeb = dto.TypeB
+ Typeb = dto.TypeB,
+ LW_WLBGY = dto.F_WPVT_TEXT_RE5
// Fsaleorderno = dto.FSALEORDERNO, /// 閿�鍞鍗�
//
// CustomerItemNumber = dto.F_XIFG_Text_re5, /// 瀹㈡埛璐у彿
diff --git a/MESApplication/appsettings.json b/MESApplication/appsettings.json
index f25b538..e509f21 100644
--- a/MESApplication/appsettings.json
+++ b/MESApplication/appsettings.json
@@ -11,7 +11,7 @@
"TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
"ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
// "DataBaseConn": "Data Source=192.168.1.187;Initial Catalog=TEST_MES;User ID=sa;Password =LongWei@2025;Encrypt=True;TrustServerCertificate=True;"
- "DataBaseConn": "Data Source=192.168.1.187;Initial Catalog=GS_MES;User ID=sa;Password =LongWei@2025;Encrypt=True;TrustServerCertificate=True;"
+ "DataBaseConn": "Data Source=192.168.1.187;Initial Catalog=TEST_MES;User ID=sa;Password =LongWei@2025;Encrypt=True;TrustServerCertificate=True;"
}
}
--
Gitblit v1.9.3