From 0603ed63da0fdaeb2fb71b3455f184427373a018 Mon Sep 17 00:00:00 2001 From: pengmn <pmn@HanInfo> Date: 星期二, 20 五月 2025 10:55:37 +0800 Subject: [PATCH] 升降量表 --- HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs | 216 ++++++++++++++++++ HH.WCS.Mobox3.HangYang/models/InOrder.cs | 17 + HH.WCS.Mobox3.HangYang/util/Settings.cs | 16 + .vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json | 164 +++++++++++++ HH.WCS.Mobox3.HangYang/core/WCSCore.cs | 3 HH.WCS.Mobox3.HangYang/models/wms/AddChangeModel.cs | 36 +++ HH.WCS.Mobox3.HangYang/models/wms/Algorit.cs | 4 HH.WCS.Mobox3.HangYang/models/OutOrder.cs | 20 + HH.WCS.Mobox3.HangYang/util/HttpHelper.cs | 48 +++ HH.WCS.Mobox3.HangYang/process/TaskProcess.cs | 10 HH.WCS.Mobox3.HangYang/HH.WCS.HangYang.csproj | 1 .vs/HH.WCS.Mobox3/v17/DocumentLayout.json | 164 +++++++++++++ 12 files changed, 692 insertions(+), 7 deletions(-) diff --git a/.vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json b/.vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json new file mode 100644 index 0000000..f018368 --- /dev/null +++ b/.vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json @@ -0,0 +1,164 @@ +{ + "Version": 1, + "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\\core\\wcscore.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\\core\\wcscore.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\\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}" + }, + { + "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\\api\\wmscontroller.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\\wmscontroller.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\\util\\httphelper.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\\util\\httphelper.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}", + "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\program.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\\models\\inorder.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\\models\\inorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + } + ], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": 0, + "Children": [ + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "WCSCore.cs", + "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs", + "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs", + "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs", + "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs", + "ViewState": "AgIAACIAAAAAAAAAAAAuwCkAAAAiAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-20T02:48:52.339Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "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", + "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\AgvController.cs", + "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\AgvController.cs", + "ViewState": "AgIAABcAAAAAAAAAAADwvxoAAAAfAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-20T02:48:30.565Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "HttpHelper.cs", + "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs", + "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs", + "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs", + "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs", + "ViewState": "AgIAAAUAAAAAAAAAAAAuwAwAAAAKAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-19T08:17:19.57Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "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": "AgIAAN4EAAAAAAAAAAAuwE4FAAApAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-19T08:08:45.432Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "Program.cs", + "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\Program.cs", + "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\Program.cs", + "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\Program.cs", + "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\Program.cs", + "ViewState": "AgIAAFAAAAAAAAAAAAAuwF0AAAAxAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-19T06:01:09.462Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "InOrder.cs", + "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\InOrder.cs", + "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\models\\InOrder.cs", + "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\InOrder.cs", + "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\models\\InOrder.cs", + "ViewState": "AgIAABMAAAAAAAAAAAAcwB4AAAAfAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-19T01:29:32.619Z", + "EditorCaption": "" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "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": "AgIAAFsAAAAAAAAAAAAqwGcAAAARAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-19T00:42:44.641Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "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": "AgIAAAUAAAAAAAAAAAAuwCsAAAAqAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-19T00:41:35.255Z", + "EditorCaption": "" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/.vs/HH.WCS.Mobox3/v17/DocumentLayout.json b/.vs/HH.WCS.Mobox3/v17/DocumentLayout.json new file mode 100644 index 0000000..f018368 --- /dev/null +++ b/.vs/HH.WCS.Mobox3/v17/DocumentLayout.json @@ -0,0 +1,164 @@ +{ + "Version": 1, + "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\\core\\wcscore.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\\core\\wcscore.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\\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}" + }, + { + "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\\api\\wmscontroller.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\\wmscontroller.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\\util\\httphelper.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\\util\\httphelper.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}", + "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\program.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\\models\\inorder.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\\models\\inorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + } + ], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": 0, + "Children": [ + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "WCSCore.cs", + "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs", + "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs", + "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs", + "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs", + "ViewState": "AgIAACIAAAAAAAAAAAAuwCkAAAAiAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-20T02:48:52.339Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "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", + "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\AgvController.cs", + "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\AgvController.cs", + "ViewState": "AgIAABcAAAAAAAAAAADwvxoAAAAfAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-20T02:48:30.565Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "HttpHelper.cs", + "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs", + "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs", + "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs", + "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs", + "ViewState": "AgIAAAUAAAAAAAAAAAAuwAwAAAAKAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-19T08:17:19.57Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "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": "AgIAAN4EAAAAAAAAAAAuwE4FAAApAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-19T08:08:45.432Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "Program.cs", + "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\Program.cs", + "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\Program.cs", + "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\Program.cs", + "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\Program.cs", + "ViewState": "AgIAAFAAAAAAAAAAAAAuwF0AAAAxAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-19T06:01:09.462Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "InOrder.cs", + "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\InOrder.cs", + "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\models\\InOrder.cs", + "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\InOrder.cs", + "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\models\\InOrder.cs", + "ViewState": "AgIAABMAAAAAAAAAAAAcwB4AAAAfAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-19T01:29:32.619Z", + "EditorCaption": "" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "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": "AgIAAFsAAAAAAAAAAAAqwGcAAAARAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-19T00:42:44.641Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "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": "AgIAAAUAAAAAAAAAAAAuwCsAAAAqAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-19T00:41:35.255Z", + "EditorCaption": "" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/HH.WCS.Mobox3.HangYang/HH.WCS.HangYang.csproj b/HH.WCS.Mobox3.HangYang/HH.WCS.HangYang.csproj index 431c469..61f000b 100644 --- a/HH.WCS.Mobox3.HangYang/HH.WCS.HangYang.csproj +++ b/HH.WCS.Mobox3.HangYang/HH.WCS.HangYang.csproj @@ -245,6 +245,7 @@ <Compile Include="models\Wcsmodel.cs" /> <Compile Include="models\WHInventory.cs" /> <Compile Include="models\TN_WMS_Const.cs" /> + <Compile Include="models\wms\AddChangeModel.cs" /> <Compile Include="models\wms\Algorit.cs" /> <Compile Include="models\Zone.cs" /> <Compile Include="models\ZoneCls.cs" /> diff --git a/HH.WCS.Mobox3.HangYang/core/WCSCore.cs b/HH.WCS.Mobox3.HangYang/core/WCSCore.cs index 472b915..8f4b425 100644 --- a/HH.WCS.Mobox3.HangYang/core/WCSCore.cs +++ b/HH.WCS.Mobox3.HangYang/core/WCSCore.cs @@ -49,8 +49,9 @@ { //瀹屾垚浣滀笟 WMSHelper.UpdateWmsTask(TN_Task, 3); - } + WMSHelper.AddChange(TN_Task); + WMSHelper.DeleteChange(TN_Task); break; case 7: TaskProcess.OperateStatus(TN_Task, 7); diff --git a/HH.WCS.Mobox3.HangYang/models/InOrder.cs b/HH.WCS.Mobox3.HangYang/models/InOrder.cs index 8908977..5ed27b2 100644 --- a/HH.WCS.Mobox3.HangYang/models/InOrder.cs +++ b/HH.WCS.Mobox3.HangYang/models/InOrder.cs @@ -39,7 +39,22 @@ /// 0 --鏈墽琛�1 缁勭洏 2 鈥�缁勭洏瀹屾垚 3 -- 鍏ュ簱瀹屾垚 /// </summary> public int N_B_STATE { get; set; } - + + /// <summary> + /// 宸ュ巶鏍囪瘑 + /// </summary> + public string S_FACTORY { get; set; } + + /// <summary> + /// 浠撳簱缂栧彿 + /// </summary> + public string S_WH_CODE { get; set; } + + /// <summary> + /// 搴撳尯缂栫爜 + /// </summary> + public string S_AREA_CODE { get; set; } + [SugarColumn(IsIgnore = true)] [Navigate(NavigateType.OneToMany, nameof(S_NO))] diff --git a/HH.WCS.Mobox3.HangYang/models/OutOrder.cs b/HH.WCS.Mobox3.HangYang/models/OutOrder.cs index 1603475..8635fac 100644 --- a/HH.WCS.Mobox3.HangYang/models/OutOrder.cs +++ b/HH.WCS.Mobox3.HangYang/models/OutOrder.cs @@ -46,6 +46,26 @@ /// </summary> public int N_B_STATE { get; set; } + /// <summary> + /// 鏉ユ簮绫诲瀷 + /// </summary> + public string S_BS_TYPE { get; set; } + + /// <summary> + /// 宸ュ巶鏍囪瘑 + /// </summary> + public string S_FACTORY { get; set; } + + /// <summary> + /// 浠撳簱缂栧彿 + /// </summary> + public string S_WH_CODE { get; set; } + + /// <summary> + /// 搴撳尯缂栫爜 + /// </summary> + public string S_AREA_CODE { get; set; } + [SugarColumn(IsIgnore = true)] [Navigate(NavigateType.OneToMany, nameof(S_NO))] public List<OutOrderDetail> OutOrderDetail { get; set; } diff --git a/HH.WCS.Mobox3.HangYang/models/wms/AddChangeModel.cs b/HH.WCS.Mobox3.HangYang/models/wms/AddChangeModel.cs new file mode 100644 index 0000000..27a51cc --- /dev/null +++ b/HH.WCS.Mobox3.HangYang/models/wms/AddChangeModel.cs @@ -0,0 +1,36 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HH.WCS.HangYang.LISTA.models.wms +{ + public class AddChangeModel + { + /// <summary> + /// 5 - 浠撳簱鍔犲瓨鍌ㄩ噺锛岀敤浜�鍏ュ簱瀹屾垚 + /// 6 - 搴撳尯鍔犲瓨鍌ㄩ噺锛岀敤浜庡簱鍖哄叆搴撳畬鎴愶紝 + /// 7 - 搴撳尯鍑忓瓨鍌ㄣ�鍒嗛厤閲忥紝鐢ㄤ簬 搴撳尯鍑哄簱瀹屾垚 + /// 8 - 浠撳簱鍑忓瓨鍌ㄩ噺锛� - 搴撳尯鍑忓瓨鍌ㄩ噺 + /// 10 - 浠撳簱鍑忓垎閰嶉噺锛岀敤浜�閰嶈揣鍚庡彇娑堬紝 + /// 11 - 搴撳尯鍑忓垎閰嶉噺锛岀敤浜�閰嶈揣鍚庡彇娑�+ /// </summary> + public int op_type { get; set; } + public List<itemModel> item_info { get; set; } = new List<itemModel>(); + public class itemModel + { + public string wh_code { get; set; } = ""; + public string area_code { get; set; } = ""; + public string loc_code { get; set; } = ""; + public string item_code { get; set; } + public string item_name { get; set; } + public float qty { get; set; } + } + } + public class moboxres + { + public int err_code { get; set; } + public string err_msg { get; set; } = ""; + } +} diff --git a/HH.WCS.Mobox3.HangYang/models/wms/Algorit.cs b/HH.WCS.Mobox3.HangYang/models/wms/Algorit.cs index 2c9b720..4139f22 100644 --- a/HH.WCS.Mobox3.HangYang/models/wms/Algorit.cs +++ b/HH.WCS.Mobox3.HangYang/models/wms/Algorit.cs @@ -57,10 +57,6 @@ /// 浣滀笟浠诲姟鍙� /// </summary> public string opCode { get; set; } - - - - } public class LocationParams diff --git a/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs b/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs index 2cf2ffd..294b195 100644 --- a/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs +++ b/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs @@ -16,6 +16,7 @@ using System.Reflection; using System.Security.Cryptography; using System.Threading.Tasks; +using static HH.WCS.HangYang.api.OtherModel.Putaway_Order_In; using static HH.WCS.HangYang.LISTA.process.HttpModel; using static HH.WCS.HangYang.wms.WMSHelper; using static System.Runtime.CompilerServices.RuntimeHelpers; @@ -464,6 +465,7 @@ return result; } item.S_EXT_ATTR1 = itemType.S_ITEM_TYPE; + item.S_ITEM_NAME = itemType.S_ITEM_NAME; } var groupedInOrders = model.InOrderDetail @@ -475,6 +477,9 @@ S_OP_TYPE = model.S_OP_TYPE, S_BS_TYPE = model.S_BS_TYPE, S_NOTE = model.S_NOTE, + S_FACTORY = "HY001", + S_WH_CODE = "CK001", + S_AREA_CODE = group.Key.Equals("鏂欑搴�) ? "LXLKQ" : "TPLKQ", InOrderDetail = group.Select(detail => { // 淇敼 group 涓殑 S_IO_NO 瀛楁涓�S_NO 鐨勫� @@ -534,6 +539,7 @@ return result; } item.S_EXT_ATTR1 = itemType.S_ITEM_TYPE; + item.S_ITEM_NAME = itemType.S_ITEM_NAME; } var groupedInOrders = model.OutOrderDetail @@ -544,6 +550,10 @@ S_BS_NO = model.S_BS_NO, S_OP_TYPE = model.S_OP_TYPE, S_NOTE = model.S_NOTE, + S_BS_TYPE = "ERP", + S_FACTORY = "HY001", + S_WH_CODE = "CK001", + S_AREA_CODE = group.Key.Equals("鏂欑搴�) ? "LXLKQ" : "TPLKQ", OutOrderDetail = group.Select(detail => { // 淇敼 group 涓殑 S_IO_NO 瀛楁涓�S_NO 鐨勫� diff --git a/HH.WCS.Mobox3.HangYang/util/HttpHelper.cs b/HH.WCS.Mobox3.HangYang/util/HttpHelper.cs index 56bbfa2..7e1a661 100644 --- a/HH.WCS.Mobox3.HangYang/util/HttpHelper.cs +++ b/HH.WCS.Mobox3.HangYang/util/HttpHelper.cs @@ -6,7 +6,53 @@ using System.Text; namespace HH.WCS.HangYang.util { - public class HttpHelper { + public class HttpHelper + { + #region 鏉哀WebHelper + + public string WebPost(string url, string postData, string cotentType = "application/json", string AppKey = "", string ReqTime = "", string ReqVerify = "") + { + Console.WriteLine(url); + WebRequest request = WebRequest.Create(url); + request.Method = "POST"; + + if (!string.IsNullOrEmpty(AppKey) && !string.IsNullOrEmpty(ReqTime) && !string.IsNullOrEmpty(ReqVerify)) + { + request.Headers.Set("AppKey", AppKey); + request.Headers.Set("ReqTime", ReqTime); + request.Headers.Set("ReqVerify", ReqVerify); + } + //string postData = JsonConvert.SerializeObject(data); ; + byte[] byteArray = Encoding.UTF8.GetBytes(postData); + request.ContentType = cotentType; + request.ContentLength = byteArray.Length; + request.Timeout = 3000; + + try + { + Stream dataStream = request.GetRequestStream(); + dataStream.Write(byteArray, 0, byteArray.Length); + dataStream.Close(); + WebResponse response = request.GetResponse(); + //Console.WriteLine(((HttpWebResponse)response).StatusDescription); + dataStream = response.GetResponseStream(); + StreamReader reader = new StreamReader(dataStream, Encoding.UTF8); + string responseFromServer = reader.ReadToEnd(); + reader.Close(); + dataStream.Close(); + response.Close(); + return responseFromServer; + } + catch (Exception e) + { + Console.WriteLine(e.Message); + return ""; + } + } + + + #endregion + public string WebPost(string url, string postData, string cotentType = "application/json") { Console.WriteLine(url); WebRequest request = WebRequest.Create(url); diff --git a/HH.WCS.Mobox3.HangYang/util/Settings.cs b/HH.WCS.Mobox3.HangYang/util/Settings.cs index 5e552a3..d44ea6b 100644 --- a/HH.WCS.Mobox3.HangYang/util/Settings.cs +++ b/HH.WCS.Mobox3.HangYang/util/Settings.cs @@ -13,6 +13,10 @@ public static string GZSeverUrl { get; set; } public static string SqlServer { get; set; } public static string SqlServer1 { get; set; } + public static string MoboxSeverUrl { get; set; } + public static string AppKey { get; set; } + public static string AppSecret { get; set; } + public static List<deviceInfo> deviceInfos { get; set; } public static List<TableUrl> tableUrls { get; set; } public static List<LocArea> LocAreas { get; set; } @@ -48,6 +52,18 @@ { HostToAgvServerUrl = keyValue.Value.ToString(); } + if (keyValue.Name == "AppKey") + { + AppKey = keyValue.Value.ToString(); + } + if (keyValue.Name == "AppSecret") + { + AppSecret = keyValue.Value.ToString(); + } + if (keyValue.Name == "MoboxSeverUrl") + { + MoboxSeverUrl = keyValue.Value.ToString(); + } if (keyValue.Name == "HASeverUrl") { HASeverUrl = keyValue.Value.ToString(); diff --git a/HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs b/HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs index 099bb7f..e083743 100644 --- a/HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs +++ b/HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs @@ -1,5 +1,6 @@ 锘縰sing HH.WCS.HangYang.api; using HH.WCS.HangYang.LISTA.models; +using HH.WCS.HangYang.LISTA.models.wms; using HH.WCS.HangYang.models.other; using HH.WCS.HangYang.util; using Newtonsoft.Json; @@ -14,6 +15,7 @@ using System.Linq.Expressions; using System.Reflection; using System.Runtime.Remoting.Messaging; +using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using System.Text; using System.Threading; @@ -608,6 +610,7 @@ } return result; } + #region 鏉哀WMS甯姪鏂规硶 /// <summary> /// 鏂板鍏ュ簱鍗�@@ -1237,5 +1240,218 @@ } } #endregion + + #region 鏉哀鍗囬檷閲忚〃甯姪鏂规硶 + /// <summary> + /// MD5鍔犲瘑 + /// </summary> + /// <param name="sInput"></param> + /// <returns></returns> + public static string GetMd5FromString(string sInput) + { + var lstData = Encoding.GetEncoding("utf-8").GetBytes(sInput); + var lstHash = new MD5CryptoServiceProvider().ComputeHash(lstData); + var result = new StringBuilder(32); + for (int i = 0; i < lstHash.Length; i++) + { + result.Append(lstHash[i].ToString("x2").ToUpper()); + } + return result.ToString(); + } + + /// <summary> + /// 鏍规嵁浠诲姟鍗囬噺 + /// </summary> + /// <param name="task"></param> + internal static void AddChange(WCSTask task) + { + var db = new SqlHelper<object>().GetInstance(); + var result = true; + try + { + var itemlist = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE == task.S_CNTR_CODE).ToList(); + if (itemlist.Count > 0) + { + var url = Settings.MoboxSeverUrl + "inventory/AddChange"; + //浠撳簱閲忚〃鍗囬噺 + var req = new AddChangeModel { op_type = 5 }; + //搴撳尯閲忚〃鍗囬噺 + var req2 = new AddChangeModel { op_type = 6 }; + itemlist.ForEach(a => + { + LogHelper.Info($"濉厖鏁版嵁"); + LogHelper.Info($"娣诲姞浠撳簱閲忚〃鏁版嵁 浠撳簱{task.S_END_WH} 鐗╂枡缂栫爜{a.S_ITEM_CODE} 鐗╂枡鍚嶇О{a.S_ITEM_NAME} 鏁伴噺{a.F_QTY}"); + req.item_info.Add(new AddChangeModel.itemModel + { + wh_code = task.S_END_WH, + item_code = a.S_ITEM_CODE, + item_name = a.S_ITEM_NAME, + qty = a.F_QTY + }); + LogHelper.Info($"娣诲姞搴撳尯閲忚〃鏁版嵁 搴撳尯{task.S_END_AREA} 鐗╂枡缂栫爜{a.S_ITEM_CODE} 鐗╂枡鍚嶇О{a.S_ITEM_NAME} 鏁伴噺{a.F_QTY}"); + req2.item_info.Add(new AddChangeModel.itemModel + { + wh_code = task.S_END_WH, + area_code = task.S_END_AREA, + item_code = a.S_ITEM_CODE, + item_name = a.S_ITEM_NAME, + qty = a.F_QTY + }); + }); + var reqData = JsonConvert.SerializeObject(req); + var AppKey = Settings.AppKey; + var AppSecret = Settings.AppSecret; + var ReqTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString(); + //var ReqTime = GetTimeStamp(DateTime.Now.AddHours(-8), 1, 2); + LogHelper.Info($"鍔犲瘑鍓�AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime}"); + var ReqVerify = GetMd5FromString(AppKey + AppSecret + ReqTime); + LogHelper.Info($"鍔犲瘑鍚�AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime} ReqVerify={ReqVerify} url={url} req={reqData}"); + var res = new HttpHelper().WebPost(url, reqData, "application/json", AppKey, ReqTime, ReqVerify); + if (!string.IsNullOrEmpty(res)) + { + LogHelper.Info($"mobox 浠撳簱鍗囬噺鎺ュ彛杩斿洖 {res}"); + var moboxres = JsonConvert.DeserializeObject<moboxres>(res); + if (moboxres.err_code != 0) + { + result = false; + } + } + else + { + LogHelper.Info($"mobox 浠撳簱鍗囬噺鎺ュ彛杩斿洖涓虹┖"); + result = false; + } + var reqData2 = JsonConvert.SerializeObject(req2); + var ReqTime2 = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString(); + //var ReqTime2 = GetTimeStamp(DateTime.Now.AddHours(-8), 1, 2); + LogHelper.Info($"鍔犲瘑鍓�AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime2}"); + var ReqVerify2 = GetMd5FromString(AppKey + AppSecret + ReqTime2); + LogHelper.Info($"鍔犲瘑鍚�AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime2} ReqVerify={ReqVerify2} url={url} req={reqData2}"); + var res2 = new HttpHelper().WebPost(url, reqData2, "application/json", AppKey, ReqTime2, ReqVerify2); + if (!string.IsNullOrEmpty(res2)) + { + LogHelper.Info($"mobox 搴撳尯鍗囬噺鎺ュ彛杩斿洖 {res2}"); + var moboxres = JsonConvert.DeserializeObject<moboxres>(res); + if (moboxres.err_code != 0) + { + result = false; + } + } + else + { + LogHelper.Info($"mobox 搴撳尯鍗囬噺鎺ュ彛杩斿洖涓虹┖"); + result = false; + } + + } + else LogHelper.Info($"鎵樼洏{task.S_CNTR_CODE} 鍦ㄥ鍣ㄨ揣鍝佹槑缁嗕腑鎵句笉鍒版暟鎹�); + } + catch (Exception ex) + { + LogHelper.Error($"浠撳簱鍗囬噺寮傚父 寮傚父淇℃伅={ex.Message}", ex); + } + } + + /// <summary> + /// 鏍规嵁浠诲姟闄嶉噺 + /// </summary> + /// <param name="task"></param> + internal static void DeleteChange(WCSTask task) + { + var db = new SqlHelper<object>().GetInstance(); + var result = true; + try + { + var wmstask = db.Queryable<WMSTask>().Where(a => a.S_CODE == task.S_OP_CODE).First(); + if (wmstask != null) + { + var itemlist = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE == task.S_CNTR_CODE).ToList(); + if (itemlist.Count > 0) + { + var url = Settings.MoboxSeverUrl + "inventory/AddChange"; + //浠撳簱閲忚〃鍗囬噺 + var req = new AddChangeModel { op_type = 4 }; + //搴撳尯閲忚〃鍗囬噺 + var req2 = new AddChangeModel { op_type = 7 }; + itemlist.ForEach(a => + { + LogHelper.Info($"濉厖鏁版嵁"); + LogHelper.Info($"鍑忎粨搴撻噺琛ㄦ暟鎹�浠撳簱{task.S_END_WH} 鐗╂枡缂栫爜{a.S_ITEM_CODE} 鐗╂枡鍚嶇О{a.S_ITEM_NAME} 鏁伴噺{a.F_QTY}"); + req.item_info.Add(new AddChangeModel.itemModel + { + wh_code = wmstask.S_START_WH, + item_code = a.S_ITEM_CODE, + item_name = a.S_ITEM_NAME, + qty = a.F_QTY + }); + LogHelper.Info($"鍑忓簱鍖洪噺琛ㄦ暟鎹�搴撳尯{task.S_END_AREA} 鐗╂枡缂栫爜{a.S_ITEM_CODE} 鐗╂枡鍚嶇О{a.S_ITEM_NAME} 鏁伴噺{a.F_QTY}"); + req2.item_info.Add(new AddChangeModel.itemModel + { + wh_code = wmstask.S_START_WH, + area_code = wmstask.S_START_AREA, + item_code = a.S_ITEM_CODE, + item_name = a.S_ITEM_NAME, + qty = a.F_QTY + }); + }); + var reqData = JsonConvert.SerializeObject(req); + var AppKey = Settings.AppKey; + var AppSecret = Settings.AppSecret; + var ReqTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString(); + //var ReqTime = GetTimeStamp(DateTime.Now.AddHours(-8), 1, 2); + LogHelper.Info($"鍔犲瘑鍓�AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime}"); + var ReqVerify = GetMd5FromString(AppKey + AppSecret + ReqTime); + LogHelper.Info($"鍔犲瘑鍚�AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime} ReqVerify={ReqVerify} url={url} req={reqData}"); + var res = new HttpHelper().WebPost(url, reqData, "application/json", AppKey, ReqTime, ReqVerify); + if (!string.IsNullOrEmpty(res)) + { + LogHelper.Info($"mobox 浠撳簱闄嶉噺鎺ュ彛杩斿洖 {res}"); + var moboxres = JsonConvert.DeserializeObject<moboxres>(res); + if (moboxres.err_code != 0) + { + result = false; + } + } + else + { + LogHelper.Info($"mobox 浠撳簱闄嶉噺鎺ュ彛杩斿洖涓虹┖"); + result = false; + } + var reqData2 = JsonConvert.SerializeObject(req2); + var ReqTime2 = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString(); + //var ReqTime2 = GetTimeStamp(DateTime.Now.AddHours(-8), 1, 2); + LogHelper.Info($"鍔犲瘑鍓�AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime2}"); + var ReqVerify2 = GetMd5FromString(AppKey + AppSecret + ReqTime2); + LogHelper.Info($"鍔犲瘑鍚�AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime2} ReqVerify={ReqVerify2} url={url} req={reqData2}"); + var res2 = new HttpHelper().WebPost(url, reqData2, "application/json", AppKey, ReqTime2, ReqVerify2); + if (!string.IsNullOrEmpty(res2)) + { + LogHelper.Info($"mobox 搴撳尯闄嶉噺鎺ュ彛杩斿洖 {res2}"); + var moboxres = JsonConvert.DeserializeObject<moboxres>(res); + if (moboxres.err_code != 0) + { + result = false; + } + } + else + { + LogHelper.Info($"mobox 搴撳尯闄嶉噺鎺ュ彛杩斿洖涓虹┖"); + result = false; + } + + } + else LogHelper.Info($"鎵樼洏{task.S_CNTR_CODE} 鍦ㄥ鍣ㄨ揣鍝佹槑缁嗕腑鎵句笉鍒版暟鎹�); + } + else LogHelper.Info($"鏈壘鍒颁换鍔task.S_CODE} 瀵瑰簲鐨勪綔涓�); + + } + catch (Exception ex) + { + LogHelper.Error($"浠撳簱闄嶉噺寮傚父 寮傚父淇℃伅={ex.Message}", ex); + } + } + + + #endregion } } -- Gitblit v1.9.1