From 945a65e917ffd620fc51354245f0e5b31f7a03ab Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期二, 13 五月 2025 18:09:56 +0800
Subject: [PATCH] 中策金坛
---
wms/WMSModel.cs | 17 --
process/DeviceProcess.cs | 16 ++
wms/LocationHelper.cs | 18 +-
api/AgvController.cs | 2
.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json | 67 ++++++++-
dispatch/WcsTask.cs | 5
.gitignore | 1
.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json | 132 ++++++++++++++++++
process/TaskProcess.cs | 108 +++++++++-----
9 files changed, 281 insertions(+), 85 deletions(-)
diff --git a/.gitignore b/.gitignore
index 1c38a68..6354644 100644
--- a/.gitignore
+++ b/.gitignore
@@ -184,3 +184,4 @@
# Microsoft Fakes
FakesAssemblies/
+/.vs/HH.WCS.ZhongCeJinTan/FileContentIndex
diff --git a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
index 7a0be45..ab5dcdd 100644
--- a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
+++ b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
@@ -3,12 +3,24 @@
"WorkspaceRootPath": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\wms\\wmsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\core\\taskcore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:core\\taskcore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\config\\config.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:config\\config.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\wmsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\wmsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -18,8 +30,47 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 3,
+ "SelectedChildIndex": 2,
"Children": [
+ {
+ "$type": "Document",
+ "DocumentIndex": 2,
+ "Title": "config.json",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\config\\config.json",
+ "RelativeDocumentMoniker": "config\\config.json",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\config\\config.json",
+ "RelativeToolTip": "config\\config.json",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAAAQAAAALAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
+ "WhenOpened": "2025-05-13T02:21:47.086Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 1,
+ "Title": "TaskCore.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs",
+ "RelativeDocumentMoniker": "core\\TaskCore.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs",
+ "RelativeToolTip": "core\\TaskCore.cs",
+ "ViewState": "AgIAAEcAAAAAAAAAAAAIwF0AAAAgAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T01:45:08.835Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 0,
+ "Title": "TaskProcess.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\TaskProcess.cs",
+ "RelativeDocumentMoniker": "process\\TaskProcess.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\TaskProcess.cs",
+ "RelativeToolTip": "process\\TaskProcess.cs",
+ "ViewState": "AgIAAFUAAAAAAAAAAADwv2EAAAAmAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T00:45:23.095Z",
+ "EditorCaption": ""
+ },
{
"$type": "Bookmark",
"Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
@@ -34,26 +85,26 @@
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 4,
"Title": "WmsController.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WmsController.cs",
"RelativeDocumentMoniker": "api\\WmsController.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WmsController.cs",
"RelativeToolTip": "api\\WmsController.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==",
+ "ViewState": "AgIAAB8AAAAAAAAAAAAUwD4AAAAlAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-12T09:36:08.931Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 3,
"Title": "WMSModel.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
"RelativeDocumentMoniker": "wms\\WMSModel.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
"RelativeToolTip": "wms\\WMSModel.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
+ "ViewState": "AgIAABcEAAAAAAAAAAAiwCMEAAARAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-12T09:36:05.064Z",
"EditorCaption": ""
diff --git a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json
index 612eed0..8645c60 100644
--- a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json
+++ b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json
@@ -3,8 +3,36 @@
"WorkspaceRootPath": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\",
"Documents": [
{
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\dispatch\\wcstask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:dispatch\\wcstask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\core\\taskcore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:core\\taskcore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\wms\\locationhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\locationhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\config\\config.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:config\\config.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
},
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\wmsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -18,8 +46,99 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 3,
+ "SelectedChildIndex": 0,
"Children": [
+ {
+ "$type": "Document",
+ "DocumentIndex": 0,
+ "Title": "DeviceProcess.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\DeviceProcess.cs",
+ "RelativeDocumentMoniker": "process\\DeviceProcess.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\DeviceProcess.cs",
+ "RelativeToolTip": "process\\DeviceProcess.cs",
+ "ViewState": "AgIAANcAAAAAAAAAAAAiwOsAAABMAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:22:54.115Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 1,
+ "Title": "WcsTask.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\WcsTask.cs",
+ "RelativeDocumentMoniker": "dispatch\\WcsTask.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\WcsTask.cs",
+ "RelativeToolTip": "dispatch\\WcsTask.cs",
+ "ViewState": "AgIAAJUDAAAAAAAAAAAiwLYDAAARAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:19:48.409Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 5,
+ "Title": "LocationHelper.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\LocationHelper.cs",
+ "RelativeDocumentMoniker": "wms\\LocationHelper.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\LocationHelper.cs",
+ "RelativeToolTip": "wms\\LocationHelper.cs",
+ "ViewState": "AgIAADIAAAAAAAAAAAAcwFkAAABjAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:13:15.283Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 6,
+ "Title": "AgvController.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\AgvController.cs",
+ "RelativeDocumentMoniker": "api\\AgvController.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\AgvController.cs",
+ "RelativeToolTip": "api\\AgvController.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAADwvxoAAAAjAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T03:17:31.542Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 7,
+ "Title": "config.json",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\config\\config.json",
+ "RelativeDocumentMoniker": "config\\config.json",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\config\\config.json",
+ "RelativeToolTip": "config\\config.json",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAAAQAAAALAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
+ "WhenOpened": "2025-05-13T02:21:47.086Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
+ "Title": "TaskCore.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs",
+ "RelativeDocumentMoniker": "core\\TaskCore.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs",
+ "RelativeToolTip": "core\\TaskCore.cs",
+ "ViewState": "AgIAADgAAAAAAAAAAAAAwF0AAAAnAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T01:45:08.835Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 2,
+ "Title": "TaskProcess.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\TaskProcess.cs",
+ "RelativeDocumentMoniker": "process\\TaskProcess.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\TaskProcess.cs",
+ "RelativeToolTip": "process\\TaskProcess.cs",
+ "ViewState": "AgIAAFgAAAAAAAAAAADwv2EAAAAnAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T00:45:23.095Z",
+ "EditorCaption": ""
+ },
{
"$type": "Bookmark",
"Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
@@ -34,28 +153,29 @@
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 3,
"Title": "WmsController.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WmsController.cs",
"RelativeDocumentMoniker": "api\\WmsController.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WmsController.cs",
"RelativeToolTip": "api\\WmsController.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAADwvxsAAAASAAAAAAAAAA==",
+ "ViewState": "AgIAAJUAAAAAAAAAAAAuwLAAAAAlAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-12T09:36:08.931Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 8,
"Title": "WMSModel.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
"RelativeDocumentMoniker": "wms\\WMSModel.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
"RelativeToolTip": "wms\\WMSModel.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
+ "ViewState": "AgIAABcEAAAAAAAAAAAiwCMEAAARAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-12T09:36:05.064Z"
+ "WhenOpened": "2025-05-12T09:36:05.064Z",
+ "EditorCaption": ""
}
]
}
diff --git a/api/AgvController.cs b/api/AgvController.cs
index 5020310..c3e2c53 100644
--- a/api/AgvController.cs
+++ b/api/AgvController.cs
@@ -19,7 +19,7 @@
[HttpPost]
- public ReturnResult AGVCallbackState(AgvTaskState model)
+ public ReturnResult AGVCallbackState(AgvTaskState model)
{
LogHelper.Info("AGVCallbackState Request锛� + JsonConvert.SerializeObject(model), "HosttoagvTask");
try
diff --git a/dispatch/WcsTask.cs b/dispatch/WcsTask.cs
index 1dd1249..89a5593 100644
--- a/dispatch/WcsTask.cs
+++ b/dispatch/WcsTask.cs
@@ -942,7 +942,8 @@
Type = "3";
Meshod = "AgvRequestCancel";
}
- else if (state == 4) {
+ else if (state == 4)
+ {
//鐢宠鍑洪棬
Type = "4";
Meshod = "AgvRequest";
@@ -1161,7 +1162,7 @@
var endLoc = LocationHelper.GetLocOne(task.S_END_LOC);
- var end = newDb.Queryable<Location>().Where(a => a.S_AREA_CODE == endLoc.S_AREA_CODE && a.N_ROW == endLoc.N_ROW && a.N_COL > endLoc.N_COL && a.S_LOCK_STATE == "鏃� && a.N_CURRENT_NUM == 0).OrderBy(b=>b.N_COL).First();
+ var end = newDb.Queryable<Location>().Where(a => a.S_AREA_CODE == endLoc.S_AREA_CODE && a.N_ROW == endLoc.N_ROW && a.N_COL > endLoc.N_COL && a.S_LOCK_STATE == "鏃� && a.N_CURRENT_NUM == 0 && a.C_ENABLE=="Y").OrderBy(b=>b.N_COL).First();
LogHelper.Info($"Wcs鏀捐揣鏈夎揣瀵绘壘鏂扮粓鐐逛俊鎭� + JsonConvert.SerializeObject(end), "鏀捐揣鏈夎揣");
diff --git a/process/DeviceProcess.cs b/process/DeviceProcess.cs
index 94af32b..9be624d 100644
--- a/process/DeviceProcess.cs
+++ b/process/DeviceProcess.cs
@@ -231,6 +231,12 @@
}else
{
+ if (safety.type == 1)
+ {
+ LogHelper.Info($"鎺ラ┏浣嶅畨鍏ㄤ氦浜掑紑濮�浠诲姟鍙�{mst.S_CODE},浜や簰绫诲瀷涓�锛屽彇璐у畬鎴�, "瀹夊叏浜や簰");
+ //鍙栬揣瀹屾垚閫氱煡绔嬪簱
+ WcsTask.WcsCallback(mst, state, fkNo);
+ }
//1102鍙栬揣瀹屾垚
if (safety.type == 2)
{
@@ -324,8 +330,14 @@
}
else
{
- //1104鍗歌揣瀹屾垚
- if (safety.type == 2)
+ if (safety.type == 1)
+ {
+ LogHelper.Info($"鎺ラ┏浣嶅畨鍏ㄤ氦浜掑紑濮�浠诲姟鍙�{mst.S_CODE},浜や簰绫诲瀷涓�锛屽嵏璐у畬鎴�, "瀹夊叏浜や簰");
+ //鍗歌揣瀹屾垚閫氱煡绔嬪簱
+ WcsTask.WcsCallback(mst, state, fkNo);
+ }
+ //1104鍗歌揣瀹屾垚
+ if (safety.type == 2)
{
var safetyLoc = Settings.TmDeviceInfos.Where(a => a.locCode.Contains(mst.S_END_LOC) && a.deviceType == 2).FirstOrDefault();
if (safetyLoc != null)
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index a9a515f..72934f9 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -116,8 +116,22 @@
}
else if (state == 1105)
{
- //鍒ゆ柇鎺ラ┏浣嶅拰宸烽亾鏄惁鍙敤 涓嶅彲鐢ㄩ渶瑕佹敼閬�- changeBit(mst);
+ var workFlow = TaskHelper.selectWorkFlowByType(mst.N_TYPE.ToString(), mst.TOOLSTYPE);
+
+ if (workFlow == null)
+ {
+ LogHelper.Info($"鍒ゆ柇鎺ラ┏浣嶄互鍙婂贩閬撴槸鍚﹀彲鐢紝BUSI_TYpe:{mst.N_TYPE},娌℃壘鍒板搴斾綔涓氭祦绋�, "鏀归亾瀹夊叏浜や簰");
+ return;
+ }
+
+ var wcsTask = TaskHelper.GetTask(mst.S_OP_CODE + "_2");
+ if (wcsTask == null)
+ {
+ LogHelper.Info($"鍒ゆ柇宸烽亾鍙敤澶辫触锛屾病鎵惧埌瀵瑰簲{mst.S_OP_CODE + "_2"}浠诲姟", "鏀归亾瀹夊叏浜や簰");
+ return;
+ }
+ //鍒ゆ柇绌烘墭缂撳瓨銆佹帴椹充綅鍜屽贩閬撴槸鍚﹀彲鐢�涓嶅彲鐢ㄩ渶瑕佹敼閬�+ changeBit(mst,wcsTask,workFlow);
}
else if (state == 1023 || state == 1025)
{
@@ -187,38 +201,22 @@
private static object locLocker = new object();
- internal static void changeBit(WMSTask task) {
+ internal static void changeBit(WMSTask task, WMSTask wcsTask, WorkFlow workFlow) {
var db = new SqlHelper<object>().GetInstance();
try
{
- var workFlow = TaskHelper.selectWorkFlowByType(task.N_TYPE.ToString(), task.TOOLSTYPE);
-
- if (workFlow == null)
- {
- LogHelper.Info($"鍒ゆ柇鎺ラ┏浣嶄互鍙婂贩閬撴槸鍚﹀彲鐢紝BUSI_TYpe:{task.N_TYPE},娌℃壘鍒板搴斾綔涓氭祦绋�, "鏀归亾瀹夊叏浜や簰");
- throw new Exception($"鍒ゆ柇鎺ラ┏浣嶄互鍙婂贩閬撴槸鍚﹀彲鐢紝BUSI_TYpe:{task.N_TYPE},娌℃壘鍒板搴斾綔涓氭祦绋�);
- }
-
- var wcsTask = db.Queryable<WMSTask>().Where(e => e.S_CODE == task.S_OP_CODE + "_2")?.First();
- if (wcsTask == null)
- {
- LogHelper.Info($"鍒ゆ柇宸烽亾鍙敤澶辫触锛屾病鎵惧埌瀵瑰簲{task.S_OP_CODE + "_2"}浠诲姟", "鏀归亾瀹夊叏浜や簰");
- throw new Exception($"鍒ゆ柇宸烽亾鍙敤澶辫触,娌℃壘鍒板搴攞task.S_OP_CODE + "_2"}浠诲姟");
- }
-
+
//鍒ゆ柇鎺ラ┏浣嶅彲鐢� var flag = true;
//绌烘墭鍏ュ簱鍒ゆ柇绌烘墭鍑虹紦瀛樿〃锛屾湁瀵瑰簲璁板綍鐩存帴鏀归亾鍒扮紦瀛樿〃缁堢偣
if (workFlow.FLOWCODE=="3") {
- var kt = db.Queryable<MesKtTask>().Where(e => e.TOOLS_TPYE==task.TOOLSTYPE && e.Status=="N").First();
+ var kt = db.Queryable<MesKtTask>().Where(e => e.TOOLS_TPYE==task.TOOLSTYPE && e.Status=="N").OrderBy(a=>a.CreateDate).First();
if (kt == null)
{
- LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}娌℃壘鍒扮┖鎵樺嚭缂撳瓨璁板綍锛屼笉闇�鏀归亾锛岀洿鎺ヤ慨鏀瑰弬鏁�涓�", "鏀归亾瀹夊叏浜や簰");
- NDCApi.ChangeOrderParam(task.S_CODE, 6, "1");
- return;
+ LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}娌℃壘鍒扮┖鎵樺嚭缂撳瓨璁板綍", "鏀归亾瀹夊叏浜や簰");
}
else {
@@ -231,32 +229,59 @@
//{
// LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}鏀归亾缁堢偣澶辫触锛岀粓鐐�{kt.Location_To},娌℃壘鍒版垨鏈夐攣", "鏀归亾瀹夊叏浜や簰");
//}
-
+ TaskHelper.Fail(wcsTask);
+ TaskProcess.OperateStatus(wcsTask, 7);
LocationHelper.LockLoc(end.S_CODE, "鍏ュ簱閿�, 1);
- var endLoc = LocationHelper.GetLocOne(task.S_END_LOC);
- endLoc.N_LOCK_STATE = 0;
- endLoc.S_LOCK_STATE = "鏃�;
db.BeginTran();
- db.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE }).ExecuteCommand();
//鏀逛竴娈典换鍔＄粓鐐� task.S_END_LOC = end.S_CODE;
- db.Updateable(task).UpdateColumns(it => new { it.S_END_LOC }).ExecuteCommand();
+ task.S_END_AREA = end.S_AREA_CODE;
+ db.Updateable(task).UpdateColumns(it => new { it.S_END_LOC,it.S_END_AREA}).ExecuteCommand();
kt.Status = "Y";
db.Updateable(kt).UpdateColumns(it => new { it.Status }).ExecuteCommand();
db.CommitTran();
-
- WcsTask.WcsCancellTask(wcsTask);
var site = LocationHelper.GetAgvSiteZc(end.S_CODE);
LogHelper.Info($"浠诲姟{task.S_CODE}鏀归亾鎴愬姛锛屾敼鍙傛暟2涓簕site},鍙傛暟6涓�", "鏀归亾瀹夊叏浜や簰");
NDCApi.ChangeOrderParam(task.S_CODE, 2, site);
NDCApi.ChangeOrderParam(task.S_CODE, 6, "1");
-
+ return;
}
-
}
if (workFlow.FLOWNAME.Contains("鍏ュ簱"))
{
+ var loc1 = LocationHelper.GetLocOne(wcsTask.S_END_LOC);
+ //鏌ユ壘鍙敤宸烽亾
+ var rowdwa = db.Queryable<RoadWayEnable>().Where(x => x.areaCode == wcsTask.S_END_AREA && x.status == "0" && x.roadWay == loc1.N_ROADWAY.ToString()).First();
+ if (rowdwa == null)
+ {
+ LogHelper.Info($"鍒ゆ柇宸烽亾鍙敤,褰撳墠搴撳尯{wcsTask.S_END_AREA}褰撳墠宸烽亾{loc1.N_ROADWAY}鍙敤,涓嶉渶瑕佹敼閬�, "鏀归亾瀹夊叏浜や簰");
+ }
+ else
+ {
+ LogHelper.Info($"褰撳墠宸烽亾涓嶅彲鐢紝闇�鏀归亾", "鏀归亾瀹夊叏浜や簰");
+ var endLoc = LocationHelper.GetLocOne(wcsTask.S_END_LOC);
+
+ var endList = LocationHelper.GetAllLocList1(workFlow.ENDAREA);
+ var end = LocationHelper.FindEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
+ LogHelper.Info($"褰撳墠宸烽亾涓嶅彲鐢紝闇�鏀归亾锛屾柊缁堢偣淇℃伅" + JsonConvert.SerializeObject(end), "鏀归亾瀹夊叏浜や簰");
+ if (end == null)
+ {
+ LogHelper.Info($"褰撳墠宸烽亾涓嶅彲鐢紝缁堢偣搴撳尯{workFlow.ENDAREA},娌℃壘鍒扮粓鐐�, "鏀归亾瀹夊叏浜や簰");
+ throw new Exception($"缁堢偣搴撳尯{workFlow.ENDAREA},娌℃壘鍒扮粓鐐�);
+ }
+ LocationHelper.LockLoc(end.S_CODE, "鍏ュ簱閿�, 1);
+ db.BeginTran();
+ endLoc.N_LOCK_STATE = 0;
+ endLoc.S_LOCK_STATE = "鏃�;
+ db.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE }).ExecuteCommand();
+ wcsTask.S_END_LOC = end.S_CODE;
+ db.Updateable(wcsTask).UpdateColumns(it => new { it.S_END_LOC }).ExecuteCommand();
+ db.CommitTran();
+ }
+
+
+
var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);
var usableConnectionList = WcsTask.WcsPositionAvailable(task.S_CODE, connectionList);
if (usableConnectionList != null && usableConnectionList.code == "0")
@@ -264,8 +289,9 @@
foreach (var item in usableConnectionList.available)
{
var con = LocationHelper.GetLoc(item);
- if (con.S_CODE.Contains(task.S_END_LOC))
+ if (con.S_CODE.Contains(task.S_END_LOC) && con.C_ENABLE=="Y")
{
+
flag = false;
LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}鎺ラ┏浣峽con.S_CODE}鍙敤锛屼笉闇�鏀归亾锛岀洿鎺ヤ慨鏀瑰弬鏁�涓�", "鏀归亾瀹夊叏浜や簰");
NDCApi.ChangeOrderParam(task.S_CODE, 6, "1");
@@ -286,7 +312,7 @@
foreach (var item in usableConnectionList.available)
{
var con = LocationHelper.GetLoc(item);
- if (con.S_LOCK_STATE == "鏃� && con.N_CURRENT_NUM < 2)
+ if (con.N_CURRENT_NUM < 2)
{
connection = con.S_CODE;
LogHelper.Info($"鏀归亾瀵绘壘鍒板彲鐢ㄦ帴椹充綅{connection}", "鏀归亾瀹夊叏浜や簰");
@@ -300,8 +326,7 @@
var loc = LocationHelper.GetLocOne(connection);
- if (workFlow.FLOWNAME.Contains("鍏ュ簱"))
- {
+
LocationHelper.LockLoc(loc.S_CODE, "鍏ュ簱閿�, 1);
var endLoc = LocationHelper.GetLocOne(task.S_END_LOC);
endLoc.N_LOCK_STATE = 0;
@@ -310,11 +335,14 @@
db.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE }).ExecuteCommand();
//鏀逛竴娈典换鍔＄粓鐐� task.S_END_LOC = loc.S_CODE;
- db.Updateable(task).UpdateColumns(it => new { it.S_END_LOC }).ExecuteCommand();
+ task.S_END_AREA = loc.S_AREA_CODE;
+ db.Updateable(task).UpdateColumns(it => new { it.S_END_LOC, it.S_END_AREA }).ExecuteCommand();
+
//鏀逛簩娈典换鍔¤捣鐐� wcsTask.S_START_LOC = loc.S_CODE;
- db.Updateable(wcsTask).UpdateColumns(it => new { it.S_START_LOC }).ExecuteCommand();
+ wcsTask.S_START_AREA = loc.S_AREA_CODE;
+ db.Updateable(wcsTask).UpdateColumns(it => new { it.S_START_LOC ,it.S_START_AREA}).ExecuteCommand();
db.CommitTran();
var site = LocationHelper.GetAgvSiteZc(loc.S_CODE);
@@ -322,7 +350,7 @@
NDCApi.ChangeOrderParam(task.S_CODE, 2, site);
NDCApi.ChangeOrderParam(task.S_CODE, 6, "1");
- }
+
//} else if (workFlow.FLOWNAME.Contains("鍑哄簱")) {
// var endLoc = LocationHelper.GetLocOne(task.S_START_LOC);
// endLoc.N_LOCK_STATE = 3;
@@ -1280,7 +1308,7 @@
foreach (var item in usableConnectionList.available)
{
var con = LocationHelper.GetLoc(item);
- if (con.S_LOCK_STATE == "鏃� && con.N_CURRENT_NUM < 2)
+ if (con.N_CURRENT_NUM < 2 && con.C_ENABLE == "Y")
{
connection = con.S_CODE;
LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍒板彲鐢ㄦ帴椹充綅{connection}", "Mes浠诲姟涓嬪彂");
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index f806d68..3a438b9 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -68,7 +68,7 @@
internal static List<Location> GetAllLocList1(string S_AREA_CODE)
{
var db = new SqlHelper<object>().GetInstance();
- return db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE).OrderBy(a=> a.N_ROW).OrderBy(a => a.N_COL).ToList();
+ return db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE && s.C_ENABLE == "Y").OrderBy(a=> a.N_ROW).OrderBy(a => a.N_COL).ToList();
}
/// <summary>
@@ -77,7 +77,7 @@
internal static List<Location> GetAllLocList2(string S_AREA_CODE)
{
var db = new SqlHelper<object>().GetInstance();
- return db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE).OrderBy(a => a.N_ROW).OrderByDescending(a => a.N_COL).ToList();
+ return db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE && s.C_ENABLE == "Y").OrderBy(a => a.N_ROW).OrderByDescending(a => a.N_COL).ToList();
}
@@ -87,7 +87,7 @@
internal static List<string> GetConnectionList(string S_AREA_CODE)
{
var db = new SqlHelper<object>().GetInstance();
- var ConnectionList = db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE).OrderBy(a => a.N_ROW).OrderBy(a => a.N_COL).ToList();
+ var ConnectionList = db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE && s.C_ENABLE == "Y").OrderBy(a => a.N_ROW).OrderBy(a => a.N_COL).ToList();
List<string> result = new List<string>();
foreach (var item in ConnectionList)
{
@@ -176,10 +176,10 @@
{
other = rowList.Where(b => b.S_LOCK_STATE == "鏃�).OrderBy(a => a.N_COL).Where(a => a.N_COL > full.N_COL).FirstOrDefault();
}
- if (other != null && (!string.IsNullOrEmpty(other.C_ENABLE) && other.C_ENABLE == "绂佺敤"))
+ if (other != null && (!string.IsNullOrEmpty(other.C_ENABLE) && other.C_ENABLE == "N"))
{
//绂佺敤浜嗛�鎷╁悗闈竴涓揣浣�- other = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => (string.IsNullOrEmpty(a.C_ENABLE) || a.C_ENABLE.Trim() != "绂佺敤") && a.S_AREA_CODE == other.S_AREA_CODE && a.S_LOCK_STATE=="鏃�&& a.N_ROW == other.N_ROW && a.N_COL > other.N_COL).First();
+ other = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => (string.IsNullOrEmpty(a.C_ENABLE) || a.C_ENABLE.Trim() != "N") && a.S_AREA_CODE == other.S_AREA_CODE && a.S_LOCK_STATE=="鏃�&& a.N_ROW == other.N_ROW && a.N_COL > other.N_COL).First();
}
if (other != null)
{
@@ -253,10 +253,10 @@
{
other = rowList.Where(b => b.S_LOCK_STATE == "鏃�).OrderBy(a => a.N_COL).Where(a => a.N_COL > full.N_COL).FirstOrDefault();
}
- if (other != null && (!string.IsNullOrEmpty(other.C_ENABLE) && other.C_ENABLE == "绂佺敤"))
+ if (other != null && (!string.IsNullOrEmpty(other.C_ENABLE) && other.C_ENABLE == "N"))
{
//绂佺敤浜嗛�鎷╁悗闈竴涓揣浣�- other = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => (string.IsNullOrEmpty(a.C_ENABLE) || a.C_ENABLE.Trim() != "绂佺敤") && a.S_AREA_CODE == other.S_AREA_CODE && a.S_LOCK_STATE == "鏃� && a.N_ROW == other.N_ROW && a.N_COL > other.N_COL).First();
+ other = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => (string.IsNullOrEmpty(a.C_ENABLE) || a.C_ENABLE.Trim() != "N") && a.S_AREA_CODE == other.S_AREA_CODE && a.S_LOCK_STATE == "鏃� && a.N_ROW == other.N_ROW && a.N_COL > other.N_COL).First();
}
if (other != null)
{
@@ -313,10 +313,10 @@
{
other = rowList.Where(b => b.S_LOCK_STATE == "鏃�).OrderBy(a => a.N_COL).Where(a => a.N_COL > full.N_COL).FirstOrDefault();
}
- if (other != null && (!string.IsNullOrEmpty(other.C_ENABLE) && other.C_ENABLE == "绂佺敤"))
+ if (other != null && (!string.IsNullOrEmpty(other.C_ENABLE) && other.C_ENABLE == "N"))
{
//绂佺敤浜嗛�鎷╁悗闈竴涓揣浣�- other = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => (string.IsNullOrEmpty(a.C_ENABLE) || a.C_ENABLE.Trim() != "绂佺敤") && a.S_AREA_CODE == other.S_AREA_CODE && a.S_LOCK_STATE == "鏃� && a.N_ROW == other.N_ROW && a.N_COL > other.N_COL).First();
+ other = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => (string.IsNullOrEmpty(a.C_ENABLE) || a.C_ENABLE.Trim() != "N") && a.S_AREA_CODE == other.S_AREA_CODE && a.S_LOCK_STATE == "鏃� && a.N_ROW == other.N_ROW && a.N_COL > other.N_COL).First();
}
if (other != null)
{
diff --git a/wms/WMSModel.cs b/wms/WMSModel.cs
index 49944b1..9f5cbb7 100644
--- a/wms/WMSModel.cs
+++ b/wms/WMSModel.cs
@@ -1059,7 +1059,6 @@
[ST("绌烘墭鍑虹紦瀛樿〃")]
public class MesKtTask : BaseModel
{
-
/// <summary>
/// 宸ヨ绫诲瀷 鑳庝晶25,鍐呰‖35,鑳庝綋/甯樺竷45,甯︽潫55,鑳庡湀65,鑳庨潰15,绾ょ淮85锛岄挗涓�5
/// </summary>
@@ -1081,22 +1080,6 @@
/// <summary>
/// 涓氬姟绫诲瀷
- /// 1 鍗婃垚鍝佹弧鎵樺叆搴�- /// 2 鎴愬瀷鏈哄崐妗跺洖搴�- /// 3 鎴愬瀷鏈虹┖妗跺洖搴�- /// 4 鎴愬瀷鏈烘弧鎵樺嚭搴�- /// 5 鎴愬瀷鏈哄甫鏉熷洖搴�- /// 6 鎴愬瀷鏈哄甫鏉熸弧鎵樺嚭搴�- /// 7 鍗婃垚鍝佺┖鎵樺嚭搴�- /// 8 鑳舵枡鍏ュ簱
- /// 9 鍛煎彨鑳舵枡
- /// 10 鍙犵洏鏈虹┖鎵樺叆搴�- /// 11 鑳舵枡鍗婃《鍥炲簱
- /// 12 绌烘灦瀛愬叆搴�- /// 13 鑳庡湀绌烘墭鍏ヤ笉甯﹀灚鐗�- /// 14 鑳庡湀绌烘墭鍑轰笉甯﹀灚鐗�- /// 100 缁戝畾
- /// 200 瑙ｇ粦
/// </summary>
public string BUSI_TYPE { get; set; }
--
Gitblit v1.9.1