From bd327b1c240ed2aca48ab6e427285dcb12235f72 Mon Sep 17 00:00:00 2001
From: pengmn <pmn@HanInfo>
Date: 星期三, 02 七月 2025 17:38:11 +0800
Subject: [PATCH] 1
---
HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs | 4 +-
.vs/HH.WCS.Mobox3/FileContentIndex/c94ce55b-8f58-464e-9ebc-90a5a8b6e2ab.vsidx | 0
HH.WCS.Mobox3.HangYang/models/InOrder.cs | 2
.vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json | 39 +++++++++----------
/dev/null | 0
HH.WCS.Mobox3.HangYang/models/OutOrder.cs | 12 +++---
HH.WCS.Mobox3.HangYang/process/TaskProcess.cs | 4 +-
.vs/HH.WCS.Mobox3/v17/DocumentLayout.json | 35 ++++++++---------
8 files changed, 45 insertions(+), 51 deletions(-)
diff --git a/.vs/HH.WCS.Mobox3/FileContentIndex/6824153d-8b71-4170-a49e-26273ac7c5db.vsidx b/.vs/HH.WCS.Mobox3/FileContentIndex/6824153d-8b71-4170-a49e-26273ac7c5db.vsidx
deleted file mode 100644
index 2f239c9..0000000
--- a/.vs/HH.WCS.Mobox3/FileContentIndex/6824153d-8b71-4170-a49e-26273ac7c5db.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3/FileContentIndex/c94ce55b-8f58-464e-9ebc-90a5a8b6e2ab.vsidx b/.vs/HH.WCS.Mobox3/FileContentIndex/c94ce55b-8f58-464e-9ebc-90a5a8b6e2ab.vsidx
new file mode 100644
index 0000000..9070cb5
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3/FileContentIndex/c94ce55b-8f58-464e-9ebc-90a5a8b6e2ab.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json b/.vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json
index 6f363ff..bfe6802 100644
--- a/.vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json
+++ b/.vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json
@@ -3,11 +3,7 @@
"WorkspaceRootPath": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
@@ -17,6 +13,10 @@
{
"AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -54,7 +54,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 5,
+ "SelectedChildIndex": 2,
"Children": [
{
"$type": "Bookmark",
@@ -66,20 +66,20 @@
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 0,
"Title": "TaskProcess.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
"ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
- "ViewState": "AgIAAMEGAAAAAAAAAAAuwMUGAAAgAAAAAAAAAA==",
+ "ViewState": "AgIAALMBAAAAAAAAAADwv78BAABEAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-19T00:42:44.641Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 2,
"Title": "AgvController.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
@@ -87,34 +87,32 @@
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
"ViewState": "AgIAAA4AAAAAAAAAAAAqwBoAAAAcAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-20T02:48:30.565Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-20T02:48:30.565Z"
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 1,
"Title": "WmsController.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
"ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
- "ViewState": "AgIAAHcAAAAAAAAAAAAAwIEAAAArAAAAAAAAAA==",
+ "ViewState": "AgIAABsAAAAAAAAAAADwvysAAAAqAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-19T00:41:35.255Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 3,
"Title": "WMSHelper.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
- "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs \u2B24",
- "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs \u2B24",
- "ViewState": "AgIAAOoCAAAAAAAAAAAAAPYCAACIAAAAAAAAAA==",
+ "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
+ "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
+ "ViewState": "AgIAAOECAAAAAAAAAAAAAPQCAAA2AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-06-23T06:28:50.054Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-06-23T06:28:50.054Z"
},
{
"$type": "Document",
@@ -138,8 +136,7 @@
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\Program.cs",
"ViewState": "AgIAAE8AAAAAAAAAAAAuwF0AAAArAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-19T06:01:09.462Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-19T06:01:09.462Z"
},
{
"$type": "Document",
diff --git a/.vs/HH.WCS.Mobox3/v17/DocumentLayout.json b/.vs/HH.WCS.Mobox3/v17/DocumentLayout.json
index 4c43e6f..87f623f 100644
--- a/.vs/HH.WCS.Mobox3/v17/DocumentLayout.json
+++ b/.vs/HH.WCS.Mobox3/v17/DocumentLayout.json
@@ -3,11 +3,7 @@
"WorkspaceRootPath": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
@@ -17,6 +13,10 @@
{
"AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -54,7 +54,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 5,
+ "SelectedChildIndex": 2,
"Children": [
{
"$type": "Bookmark",
@@ -66,20 +66,20 @@
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 0,
"Title": "TaskProcess.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
"ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
- "ViewState": "AgIAAMEGAAAAAAAAAAAuwMUGAAAgAAAAAAAAAA==",
+ "ViewState": "AgIAAL4BAAAAAAAAAAAAAMUBAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-19T00:42:44.641Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 2,
"Title": "AgvController.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
@@ -87,34 +87,32 @@
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
"ViewState": "AgIAAA4AAAAAAAAAAAAqwBoAAAAcAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-20T02:48:30.565Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-20T02:48:30.565Z"
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 1,
"Title": "WmsController.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
"ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
- "ViewState": "AgIAAHcAAAAAAAAAAAAAwIEAAAArAAAAAAAAAA==",
+ "ViewState": "AgIAACgAAAAAAAAAAAAIwCsAAAAqAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-19T00:41:35.255Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 3,
"Title": "WMSHelper.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
"ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
- "ViewState": "AgIAAOoCAAAAAAAAAAAAAPYCAACIAAAAAAAAAA==",
+ "ViewState": "AgIAAOECAAAAAAAAAAAAAPQCAAA2AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-06-23T06:28:50.054Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-06-23T06:28:50.054Z"
},
{
"$type": "Document",
@@ -138,8 +136,7 @@
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\Program.cs",
"ViewState": "AgIAAE8AAAAAAAAAAAAuwF0AAAArAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-19T06:01:09.462Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-19T06:01:09.462Z"
},
{
"$type": "Document",
diff --git a/HH.WCS.Mobox3.HangYang/models/InOrder.cs b/HH.WCS.Mobox3.HangYang/models/InOrder.cs
index 8b6659b..16caef2 100644
--- a/HH.WCS.Mobox3.HangYang/models/InOrder.cs
+++ b/HH.WCS.Mobox3.HangYang/models/InOrder.cs
@@ -60,6 +60,6 @@
[Navigate(NavigateType.OneToMany, nameof(S_NO))]
public List<InOrderDetail> InOrderDetail { get; set; }
- public List<OrderDetail> OrderDetail { get; set; }
+ //public List<OrderDetail> OrderDetail { get; set; }
}
}
diff --git a/HH.WCS.Mobox3.HangYang/models/OutOrder.cs b/HH.WCS.Mobox3.HangYang/models/OutOrder.cs
index f85cacb..b92ecf9 100644
--- a/HH.WCS.Mobox3.HangYang/models/OutOrder.cs
+++ b/HH.WCS.Mobox3.HangYang/models/OutOrder.cs
@@ -75,13 +75,13 @@
[Navigate(NavigateType.OneToMany, nameof(S_NO))]
public List<OutOrderDetail> OutOrderDetail { get; set; }
- public List<OrderDetail> OrderDetail { get; set; }
+ //public List<OrderDetail> OrderDetail { get; set; }
}
- public class OrderDetail
- {
- public string N_BS_ROW_NO { get; set; }
- public string S_ITEM_CODE { get; set; }
- }
+ //public class OrderDetail
+ //{
+ // public string N_BS_ROW_NO { get; set; }
+ // public string S_ITEM_CODE { get; set; }
+ //}
}
diff --git a/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs b/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs
index 8661a37..6694491 100644
--- a/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs
@@ -591,7 +591,7 @@
Result result = new Result() { success = false, };
try
{
- if (model == null || !model.OrderDetail.Any())
+ if (model == null || !model.InOrderDetail.Any())
{
result.errMsg = "鍏ュ簱鍗曞彇娑堜笉鍙负绌哄�锛�;
return result;
@@ -630,7 +630,7 @@
Result result = new Result() { success = false };
try
{
- if (model == null || !model.OrderDetail.Any())
+ if (model == null || !model.OutOrderDetail.Any())
{
result.errMsg = "鍑哄簱鍗曚笉鍙负绌哄�锛�;
return result;
diff --git a/HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs b/HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs
index 117ce1e..e5816b5 100644
--- a/HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs
+++ b/HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs
@@ -705,7 +705,7 @@
{
if (_order.N_B_STATE == 0)
{
- foreach (var item in order.OrderDetail)
+ foreach (var item in order.InOrderDetail)
{
db.Deleteable<InOrderDetail>().Where(it => it.S_ITEM_CODE.Trim() == item.S_ITEM_CODE && it.S_BS_NO == order.S_BS_NO).ExecuteCommand();
}
@@ -754,7 +754,7 @@
{
if (_order.N_B_STATE == 0)
{
- foreach (var item in order.OrderDetail)
+ foreach (var item in order.OutOrderDetail)
{
db.Deleteable<OutOrderDetail>().Where(it => it.S_ITEM_CODE.Trim() == item.S_ITEM_CODE && it.S_BS_NO == order.S_BS_NO).ExecuteCommand();
}
--
Gitblit v1.9.1