From 0bdc7da7260a10f4bbc74f64b16157a77aae568c Mon Sep 17 00:00:00 2001 From: wankeda <Administrator@DESKTOP-HAU3ST3> Date: 星期六, 12 七月 2025 11:06:14 +0800 Subject: [PATCH] 1 --- WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/ProScrapSheetStatusEnum.cs | 34 ++ WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f98ed24f-f06b-45db-9738-653c4aa99eb4.vsidx | 0 WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs | 119 +++++++ WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderDetailStatusEnum.cs | 52 +++ WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 | 0 WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/CheckOrderEnum.cs | 126 +++++++ WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/TakeStockStatusEnum.cs | 68 ++++ WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderCreateTypeEnum.cs | 24 + WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f7126b7d-25cd-483c-b637-44e831205f7f.vsidx | 0 WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj | 2 WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutProTypeEnum.cs | 23 + WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/ReturnOrderEnum.cs | 49 +++ WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f85c802c-959a-4937-ab44-c9978032618f.vsidx | 0 WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json | 59 +-- WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.bin | 0 WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2 | 0 WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.bin | 0 WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f39508af-8d3f-48ae-8073-7c5df5c8b82b.vsidx | 0 WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutboundOrderEnum.cs | 129 ++++++++ WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c9a462ca-3791-431d-bbdc-4aff0f49072a.vsidx | 0 WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/MesOutboundOrderType.cs | 59 +++ WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json | 99 +++--- WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/PurchaseOrderEnum.cs | 74 ++++ WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt | 0 WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo | 0 25 files changed, 834 insertions(+), 83 deletions(-) diff --git a/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.bin b/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.bin index 5305c4d..e18694c 100644 --- a/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.bin +++ b/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.bin Binary files differ diff --git a/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.bin b/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.bin index 373fc6d..c5a0270 100644 --- a/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.bin +++ b/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.bin Binary files differ diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2 b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2 index 37dbe53..c56f1f0 100644 --- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2 +++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2 Binary files differ diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c9a462ca-3791-431d-bbdc-4aff0f49072a.vsidx b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c9a462ca-3791-431d-bbdc-4aff0f49072a.vsidx new file mode 100644 index 0000000..70aef67 --- /dev/null +++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c9a462ca-3791-431d-bbdc-4aff0f49072a.vsidx Binary files differ diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f39508af-8d3f-48ae-8073-7c5df5c8b82b.vsidx b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f39508af-8d3f-48ae-8073-7c5df5c8b82b.vsidx new file mode 100644 index 0000000..fa56614 --- /dev/null +++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f39508af-8d3f-48ae-8073-7c5df5c8b82b.vsidx Binary files differ diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f7126b7d-25cd-483c-b637-44e831205f7f.vsidx b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f7126b7d-25cd-483c-b637-44e831205f7f.vsidx new file mode 100644 index 0000000..70aef67 --- /dev/null +++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f7126b7d-25cd-483c-b637-44e831205f7f.vsidx Binary files differ diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f85c802c-959a-4937-ab44-c9978032618f.vsidx b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f85c802c-959a-4937-ab44-c9978032618f.vsidx new file mode 100644 index 0000000..70aef67 --- /dev/null +++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f85c802c-959a-4937-ab44-c9978032618f.vsidx Binary files differ diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f98ed24f-f06b-45db-9738-653c4aa99eb4.vsidx b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f98ed24f-f06b-45db-9738-653c4aa99eb4.vsidx new file mode 100644 index 0000000..5f7600b --- /dev/null +++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f98ed24f-f06b-45db-9738-653c4aa99eb4.vsidx Binary files differ diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 index e85c90c..4df2997 100644 --- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 +++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 Binary files differ diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo index a063ed1..c3f528b 100644 --- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo +++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo Binary files differ diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json index 002017f..ef7682a 100644 --- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json +++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json @@ -3,8 +3,8 @@ "WorkspaceRootPath": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|e:\\khgithub\\jianliku\\wms\\widesea_wmsserver\\widesea_model\\models\\inbound\\dt_receiveorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|solutionrelative:widesea_model\\models\\inbound\\dt_receiveorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|e:\\khgithub\\jianliku\\wms\\widesea_wmsserver\\widesea_common\\widesea_common.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", + "RelativeMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|solutionrelative:widesea_common\\widesea_common.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" }, { "AbsoluteMoniker": "D:0:0:{9144117D-3D55-4250-9CF5-C6A8D8A07062}|WIDESEA_BasicRepository\\WIDESEA_BasicRepository.csproj|e:\\khgithub\\jianliku\\wms\\widesea_wmsserver\\widesea_basicrepository\\pallettypeinforepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -98,8 +98,21 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 6, + "SelectedChildIndex": 0, "Children": [ + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "WIDESEA_Common", + "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj", + "RelativeDocumentMoniker": "WIDESEA_Common\\WIDESEA_Common.csproj", + "ToolTip": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj", + "RelativeToolTip": "WIDESEA_Common\\WIDESEA_Common.csproj", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", + "WhenOpened": "2025-07-11T06:36:51.541Z", + "EditorCaption": "" + }, { "$type": "Bookmark", "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" @@ -127,8 +140,7 @@ "RelativeToolTip": "WIDESEA_Common\\TaskEnum\\TaskEnumHelper.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-11T06:10:37.063Z", - "EditorCaption": "" + "WhenOpened": "2025-07-11T06:10:37.063Z" }, { "$type": "Document", @@ -140,8 +152,7 @@ "RelativeToolTip": "WIDESEA_Common\\TaskEnum\\TaskStatusEnum.cs", "ViewState": "AgIAAHkAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-11T06:09:10.437Z", - "EditorCaption": "" + "WhenOpened": "2025-07-11T06:09:10.437Z" }, { "$type": "Document", @@ -153,8 +164,7 @@ "RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\Basic\\PalletTypeInfoController.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-11T06:08:37.288Z", - "EditorCaption": "" + "WhenOpened": "2025-07-11T06:08:37.288Z" }, { "$type": "Document", @@ -167,19 +177,6 @@ "ViewState": "AgIAACUAAAAAAAAAAAA0wD4AAAAeAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-07-11T06:04:27.867Z" - }, - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "Dt_ReceiveOrder.cs", - "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\Inbound\\Dt_ReceiveOrder.cs", - "RelativeDocumentMoniker": "WIDESEA_Model\\Models\\Inbound\\Dt_ReceiveOrder.cs", - "ToolTip": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\Inbound\\Dt_ReceiveOrder.cs*", - "RelativeToolTip": "WIDESEA_Model\\Models\\Inbound\\Dt_ReceiveOrder.cs*", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-11T06:00:59.633Z", - "EditorCaption": "" }, { "$type": "Document", @@ -215,8 +212,7 @@ "RelativeToolTip": "WIDESEA_TaskInfoService\\PartialTaskService_Outbound.cs", "ViewState": "AgIAACsAAAAAAAAAAAAAwDUAAAAVAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-02T02:05:02.485Z", - "EditorCaption": "" + "WhenOpened": "2025-07-02T02:05:02.485Z" }, { "$type": "Document", @@ -300,8 +296,7 @@ "RelativeToolTip": "WIDESEA_TaskInfoService\\Task_HtyService.cs", "ViewState": "AgIAAB8AAAAAAAAAAAASwE0AAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-06T01:21:26.615Z", - "EditorCaption": "" + "WhenOpened": "2025-06-06T01:21:26.615Z" }, { "$type": "Document", @@ -313,8 +308,7 @@ "RelativeToolTip": "WIDESEA_DTO\\Task\\WMSTaskDTO.cs", "ViewState": "AgIAAFoAAAAAAAAAAAAAABAAAAATAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-06T01:18:00.069Z", - "EditorCaption": "" + "WhenOpened": "2025-06-06T01:18:00.069Z" }, { "$type": "Document", @@ -326,8 +320,7 @@ "RelativeToolTip": "WIDESEA_BasicService\\Service\\LocationInfoService_Common.cs", "ViewState": "AgIAAB4AAAAAAAAAAAAswDsAAAAIAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-05T08:00:59.718Z", - "EditorCaption": "" + "WhenOpened": "2025-06-05T08:00:59.718Z" }, { "$type": "Document", @@ -339,8 +332,7 @@ "RelativeToolTip": "WIDESEA_BasicService\\Service\\AssignLocation\\LocationInfoService_BC.cs", "ViewState": "AgIAACwAAAAAAAAAAAAiwCYAAAAmAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-05T08:00:59.776Z", - "EditorCaption": "" + "WhenOpened": "2025-06-05T08:00:59.776Z" }, { "$type": "Document", @@ -364,8 +356,7 @@ "RelativeToolTip": "WIDESEA_TaskInfoService\\PartialTaskService_Inbound.cs", "ViewState": "AgIAAKsAAAAAAAAAAAAUwJ0AAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-05T07:54:51.319Z", - "EditorCaption": "" + "WhenOpened": "2025-06-05T07:54:51.319Z" }, { "$type": "Document", diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json index 94192c7..2fb0491 100644 --- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json +++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json @@ -3,6 +3,10 @@ "WorkspaceRootPath": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\", "Documents": [ { + "AbsoluteMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|e:\\khgithub\\jianliku\\wms\\widesea_wmsserver\\widesea_common\\widesea_common.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", + "RelativeMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|solutionrelative:widesea_common\\widesea_common.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + }, + { "AbsoluteMoniker": "D:0:0:{9144117D-3D55-4250-9CF5-C6A8D8A07062}|WIDESEA_BasicRepository\\WIDESEA_BasicRepository.csproj|e:\\khgithub\\jianliku\\wms\\widesea_wmsserver\\widesea_basicrepository\\pallettypeinforepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{9144117D-3D55-4250-9CF5-C6A8D8A07062}|WIDESEA_BasicRepository\\WIDESEA_BasicRepository.csproj|solutionrelative:widesea_basicrepository\\pallettypeinforepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -103,6 +107,19 @@ { "$type": "Document", "DocumentIndex": 0, + "Title": "WIDESEA_Common.csproj", + "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj", + "RelativeDocumentMoniker": "WIDESEA_Common\\WIDESEA_Common.csproj", + "ToolTip": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj", + "RelativeToolTip": "WIDESEA_Common\\WIDESEA_Common.csproj", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", + "WhenOpened": "2025-07-11T06:36:51.541Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, "Title": "PalletTypeInfoRepository.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicRepository\\PalletTypeInfoRepository.cs", "RelativeDocumentMoniker": "WIDESEA_BasicRepository\\PalletTypeInfoRepository.cs", @@ -110,12 +127,11 @@ "RelativeToolTip": "WIDESEA_BasicRepository\\PalletTypeInfoRepository.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-11T06:26:56.003Z", - "EditorCaption": "" + "WhenOpened": "2025-07-11T06:26:56.003Z" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 2, "Title": "TaskEnumHelper.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\TaskEnum\\TaskEnumHelper.cs", "RelativeDocumentMoniker": "WIDESEA_Common\\TaskEnum\\TaskEnumHelper.cs", @@ -123,12 +139,11 @@ "RelativeToolTip": "WIDESEA_Common\\TaskEnum\\TaskEnumHelper.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-11T06:10:37.063Z", - "EditorCaption": "" + "WhenOpened": "2025-07-11T06:10:37.063Z" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 6, "Title": "TaskStatusEnum.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\TaskEnum\\TaskStatusEnum.cs", "RelativeDocumentMoniker": "WIDESEA_Common\\TaskEnum\\TaskStatusEnum.cs", @@ -136,12 +151,11 @@ "RelativeToolTip": "WIDESEA_Common\\TaskEnum\\TaskStatusEnum.cs", "ViewState": "AgIAAHkAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-11T06:09:10.437Z", - "EditorCaption": "" + "WhenOpened": "2025-07-11T06:09:10.437Z" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 5, "Title": "PalletTypeInfoController.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Basic\\PalletTypeInfoController.cs", "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\Basic\\PalletTypeInfoController.cs", @@ -149,12 +163,11 @@ "RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\Basic\\PalletTypeInfoController.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-11T06:08:37.288Z", - "EditorCaption": "" + "WhenOpened": "2025-07-11T06:08:37.288Z" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 7, "Title": "ServiceBase.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\BaseServices\\ServiceBase.cs", "RelativeDocumentMoniker": "WIDESEA_Core\\BaseServices\\ServiceBase.cs", @@ -166,7 +179,7 @@ }, { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 16, "Title": "AGVTaskFeedBackModel.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\AGVTaskFeedBackModel.cs", "RelativeDocumentMoniker": "WIDESEA_Common\\AGVTaskFeedBackModel.cs", @@ -178,7 +191,7 @@ }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 12, "Title": "WarehouseEnum.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Enums\\WarehouseEnum.cs", "RelativeDocumentMoniker": "WIDESEA_Core\\Enums\\WarehouseEnum.cs", @@ -190,7 +203,7 @@ }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 10, "Title": "PartialTaskService_Outbound.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\PartialTaskService_Outbound.cs", "RelativeDocumentMoniker": "WIDESEA_TaskInfoService\\PartialTaskService_Outbound.cs", @@ -198,12 +211,11 @@ "RelativeToolTip": "WIDESEA_TaskInfoService\\PartialTaskService_Outbound.cs", "ViewState": "AgIAACsAAAAAAAAAAAAAwDUAAAAVAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-02T02:05:02.485Z", - "EditorCaption": "" + "WhenOpened": "2025-07-02T02:05:02.485Z" }, { "$type": "Document", - "DocumentIndex": 17, + "DocumentIndex": 18, "Title": "OutboundOrderDetailService.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_OutboundService\\Service\\OutboundOrderDetailService.cs", "RelativeDocumentMoniker": "WIDESEA_OutboundService\\Service\\OutboundOrderDetailService.cs", @@ -211,12 +223,11 @@ "RelativeToolTip": "WIDESEA_OutboundService\\Service\\OutboundOrderDetailService.cs", "ViewState": "AgIAAJUAAAAAAAAAAAAIwLAAAAAIAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-02T02:05:02.503Z", - "EditorCaption": "" + "WhenOpened": "2025-07-02T02:05:02.503Z" }, { "$type": "Document", - "DocumentIndex": 18, + "DocumentIndex": 19, "Title": "CustomProfile.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Filter\\CustomProfile.cs", "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Filter\\CustomProfile.cs", @@ -228,7 +239,7 @@ }, { "$type": "Document", - "DocumentIndex": 19, + "DocumentIndex": 20, "Title": "PalletTypeEnum.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Enums\\PalletTypeEnum.cs", "RelativeDocumentMoniker": "WIDESEA_Core\\Enums\\PalletTypeEnum.cs", @@ -240,7 +251,7 @@ }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 8, "Title": "InboundOrderService.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundService\\Service\\InboundOrderService.cs", "RelativeDocumentMoniker": "WIDESEA_InboundService\\Service\\InboundOrderService.cs", @@ -252,7 +263,7 @@ }, { "$type": "Document", - "DocumentIndex": 20, + "DocumentIndex": 21, "Title": "StockInfoRepository.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_StockRepository\\StockInfoRepository.cs", "RelativeDocumentMoniker": "WIDESEA_StockRepository\\StockInfoRepository.cs", @@ -260,12 +271,11 @@ "RelativeToolTip": "WIDESEA_StockRepository\\StockInfoRepository.cs", "ViewState": "AgIAACQAAAAAAAAAAAAlwDkAAAAIAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-06T01:23:57.608Z", - "EditorCaption": "" + "WhenOpened": "2025-06-06T01:23:57.608Z" }, { "$type": "Document", - "DocumentIndex": 16, + "DocumentIndex": 17, "Title": "Dt_Task.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\TaskInfo\\Dt_Task.cs", "RelativeDocumentMoniker": "WIDESEA_Model\\Models\\TaskInfo\\Dt_Task.cs", @@ -277,7 +287,7 @@ }, { "$type": "Document", - "DocumentIndex": 14, + "DocumentIndex": 15, "Title": "Task_HtyService.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\Task_HtyService.cs", "RelativeDocumentMoniker": "WIDESEA_TaskInfoService\\Task_HtyService.cs", @@ -285,12 +295,11 @@ "RelativeToolTip": "WIDESEA_TaskInfoService\\Task_HtyService.cs", "ViewState": "AgIAAB8AAAAAAAAAAAASwE0AAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-06T01:21:26.615Z", - "EditorCaption": "" + "WhenOpened": "2025-06-06T01:21:26.615Z" }, { "$type": "Document", - "DocumentIndex": 13, + "DocumentIndex": 14, "Title": "WMSTaskDTO.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_DTO\\Task\\WMSTaskDTO.cs", "RelativeDocumentMoniker": "WIDESEA_DTO\\Task\\WMSTaskDTO.cs", @@ -298,12 +307,11 @@ "RelativeToolTip": "WIDESEA_DTO\\Task\\WMSTaskDTO.cs", "ViewState": "AgIAAFoAAAAAAAAAAAAAABAAAAATAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-06T01:18:00.069Z", - "EditorCaption": "" + "WhenOpened": "2025-06-06T01:18:00.069Z" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 4, "Title": "LocationInfoService_Common.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\Service\\LocationInfoService_Common.cs", "RelativeDocumentMoniker": "WIDESEA_BasicService\\Service\\LocationInfoService_Common.cs", @@ -311,12 +319,11 @@ "RelativeToolTip": "WIDESEA_BasicService\\Service\\LocationInfoService_Common.cs", "ViewState": "AgIAAB4AAAAAAAAAAAAswDsAAAAIAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-05T08:00:59.718Z", - "EditorCaption": "" + "WhenOpened": "2025-06-05T08:00:59.718Z" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 3, "Title": "LocationInfoService_BC.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\Service\\AssignLocation\\LocationInfoService_BC.cs", "RelativeDocumentMoniker": "WIDESEA_BasicService\\Service\\AssignLocation\\LocationInfoService_BC.cs", @@ -324,12 +331,11 @@ "RelativeToolTip": "WIDESEA_BasicService\\Service\\AssignLocation\\LocationInfoService_BC.cs", "ViewState": "AgIAACwAAAAAAAAAAAAiwCYAAAAmAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-05T08:00:59.776Z", - "EditorCaption": "" + "WhenOpened": "2025-06-05T08:00:59.776Z" }, { "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 13, "Title": "LocationInfoService.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\Service\\LocationInfoService.cs", "RelativeDocumentMoniker": "WIDESEA_BasicService\\Service\\LocationInfoService.cs", @@ -337,12 +343,11 @@ "RelativeToolTip": "WIDESEA_BasicService\\Service\\LocationInfoService.cs", "ViewState": "AgIAACEAAAAAAAAAAAAswO8AAAAKAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-05T07:59:30.553Z", - "EditorCaption": "" + "WhenOpened": "2025-06-05T07:59:30.553Z" }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 9, "Title": "PartialTaskService_Inbound.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\PartialTaskService_Inbound.cs", "RelativeDocumentMoniker": "WIDESEA_TaskInfoService\\PartialTaskService_Inbound.cs", @@ -350,12 +355,11 @@ "RelativeToolTip": "WIDESEA_TaskInfoService\\PartialTaskService_Inbound.cs", "ViewState": "AgIAAKsAAAAAAAAAAAAUwJ0AAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-05T07:54:51.319Z", - "EditorCaption": "" + "WhenOpened": "2025-06-05T07:54:51.319Z" }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 11, "Title": "TaskService.cs", "DocumentMoniker": "E:\\KHGITHUB\\JiAnLiKu\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\TaskService.cs", "RelativeDocumentMoniker": "WIDESEA_TaskInfoService\\TaskService.cs", @@ -363,8 +367,7 @@ "RelativeToolTip": "WIDESEA_TaskInfoService\\TaskService.cs", "ViewState": "AgIAAFcAAAAAAAAAAAAkwFcAAAA4AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-29T02:46:54.347Z", - "EditorCaption": "" + "WhenOpened": "2025-05-29T02:46:54.347Z" } ] } diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt index 118dd9e..c514362 100644 --- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt +++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt Binary files differ diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/CheckOrderEnum.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/CheckOrderEnum.cs new file mode 100644 index 0000000..440cda1 --- /dev/null +++ b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/CheckOrderEnum.cs @@ -0,0 +1,126 @@ +锘縰sing System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_Common.OrderEnum +{ + public enum CheckOrderStatusEnum + { + /// <summary> + /// 寰呮 + /// </summary> + [Description("寰呮")] + NotCheck = 0, + + /// <summary> + /// 宸叉 + /// </summary> + [Description("宸叉")] + Checked = 1 + } + public enum CheckAcceptEnum + { + /// <summary> + /// 寰呮纭 + /// </summary> + [Description("寰呮纭")] + NotCheckAccept =0, + /// <summary> + /// 鎺ュ彈 + /// </summary> + [Description("鎺ュ彈")] + Accept=1, + + /// <summary> + /// 涓嶆帴鍙� + /// </summary> + [Description("涓嶆帴鍙�")] + UnAccept=2, + } + /// <summary> + /// + /// </summary> + public enum InspectAcceptEnum + { + /// <summary> + /// 寰呮纭 + /// </summary> + [Description("寰呮纭")] + NotCheckAccept = 0, + /// <summary> + /// 鎺ュ彈 + /// </summary> + [Description("鎺ュ彈")] + Accept = 1, + + /// <summary> + /// 涓嶆帴鍙� + /// </summary> + [Description("涓嶆帴鍙�")] + UnAccept = 2, + /// <summary> + /// 鐗归噰鎺ュ彈 + /// </summary> + [Description("鐗归噰鎺ュ彈")] + DefectAccept = 3 + } + public enum CheckResultEnum + { + /// <summary> + /// 閫�璐� + /// </summary> + [Description("閫�璐�")] + Return, + + ///// <summary> + ///// 鐗归噰 + ///// </summary> + //[Description("鐗归噰")] + //Defect, + + ///// <summary> + ///// 鎶ュ簾 + ///// </summary> + //[Description("鎶ュ簾")] + //Scrapped + } + public enum InspectResultEnum + { + /// <summary> + /// 閫�璐� + /// </summary> + [Description("閫�璐�")] + Return, + + /// <summary> + /// 鐗归噰 + /// </summary> + [Description("鐗归噰")] + Defect, + + /// <summary> + /// 鎶ュ簾 + /// </summary> + [Description("鎶ュ簾")] + Scrapped + } + /// <summary> + /// 妫�楠屼笂浼犵姸鎬� + /// </summary> + public enum CheckUploadEnum + { + /// <summary> + /// 鏈笂浼� + /// </summary> + [Description("鏈笂浼�")] + UploadNo=0, + /// <summary> + /// 宸蹭笂浼� + /// </summary> + [Description("宸蹭笂浼�")] + UploadOk=1 + } +} diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs new file mode 100644 index 0000000..20c0435 --- /dev/null +++ b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs @@ -0,0 +1,119 @@ +锘縰sing System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_Common.OrderEnum +{ + /// <summary> + /// 鍏ュ簱鍗曟嵁鐘舵�� 0锛屾湭寮�濮� 1锛屽叆搴撲腑 2锛屽叆搴撳畬鎴� + /// </summary> + public enum InOrderStatusEnum + { + /// <summary> + /// 鏈紑濮� + /// </summary> + [Description("鏈紑濮�")] + 鏈紑濮� = 0, + + /// <summary> + /// 鍏ュ簱涓� + /// </summary> + [Description("鍏ュ簱涓�")] + 鍏ュ簱涓� = 1, + + /// <summary> + /// 鍏ュ簱瀹屾垚 + /// </summary> + [Description("鍏ュ簱瀹屾垚")] + 鍏ュ簱瀹屾垚 = 2, + + /// <summary> + /// 鍏抽棴 + /// </summary> + [Description("鍏抽棴")] + 鍏抽棴 = 99, + + /// <summary> + /// 鍙栨秷 + /// </summary> + [Description("鍙栨秷")] + 鍙栨秷 = 98 + } + + /// <summary> + /// 鍏ュ簱鍗曠被鍨� 100 鐢熶骇鍏ュ簱鍗�;200 鐢熶骇閫�鏂欏崟;300 閲囪喘鍏ュ簱鍗�;400 璋冩嫧鍏ュ簱鍗�;500 閿�鍞��璐у崟;600 绌虹洏鍏ュ簱鍗�;700 鍏朵粬鍏ュ簱鍗� + /// </summary> + public enum InOrderTypeEnum + { + /// <summary> + /// 鐢熶骇鍏ュ簱鍗� + /// </summary> + [Description("鐢熶骇鍏ュ簱鍗�")] + Product = 100, + + /// <summary> + /// 鐢熶骇閫�鏂欏崟 + /// </summary> + [Description("鐢熶骇閫�鏂欏崟")] + Return = 105, + + /// <summary> + /// 閲囪喘鍏ュ簱鍗� + /// </summary> + [Description("閲囪喘鍏ュ簱鍗�")] + Purchase = 110, + + /// <summary> + /// 璋冩嫧鍏ュ簱鍗� + /// </summary> + [Description("璋冩嫧鍏ュ簱鍗�")] + Allocat = 115, + + /// <summary> + /// 閿�鍞��璐у崟 + /// </summary> + [Description("閿�鍞��璐у崟")] + SaleReturn = 120, + + /// <summary> + /// 绌虹洏鍏ュ簱鍗� + /// </summary> + [Description("绌虹洏鍏ュ簱鍗�")] + EmptyDisk = 125, + + /// <summary> + /// 鍏朵粬鍏ュ簱鍗� + /// </summary> + [Description("鍏朵粬鍏ュ簱鍗�")] + Other = 130, + /// <summary> + /// 瀹緵鍥炴敹 + /// </summary> + [Description("瀹緵鍥炴敹")] + CustomerRecovery=135, + /// <summary> + /// 閫佹鍏ュ簱鍗� + /// </summary> + [Description("閫佹鍏ュ簱鍗�")] + Inspect = 140, + } + /// <summary> + /// 鎴愬搧鍏ュ簱鍗曟嵁绫诲瀷 + /// </summary> + public enum ErpProOrderTypeEnum + { + /// <summary> + /// 鎴愬搧璋冩嫧鍏ュ簱鍗� + /// </summary> + [Description("鎴愬搧璋冩嫧鍏ュ簱鍗�")] + ProAllocat =1, + /// <summary> + /// 鎴愬搧瀵勫敭鍏ュ簱鍗� + /// </summary> + [Description("鎴愬搧瀵勫敭鍏ュ簱鍗�")] + ProConsign = 2, + } +} diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/MesOutboundOrderType.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/MesOutboundOrderType.cs new file mode 100644 index 0000000..fc74d28 --- /dev/null +++ b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/MesOutboundOrderType.cs @@ -0,0 +1,59 @@ +锘縰sing System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_Common.OrderEnum +{ + /// <summary> + /// + /// </summary> + public enum MesOutboundOrderTypeEnum + { + /// <summary> + /// 鍩烘澘鍑哄簱 + /// </summary> + [Description("鍩烘澘鍑哄簱")] + SubstrateOut = 100, + + /// <summary> + /// 鍩烘澘浣欐枡閫�搴� + /// </summary> + [Description("鍩烘澘浣欐枡閫�搴�")] + SubstrateBack = 200, + + /// <summary> + /// 鎵嬪姩鍩烘澘鍑哄簱 + /// </summary> + [Description("鎵嬪姩鍩烘澘鍑哄簱")] + HandSubstrateOut = 300, + + /// <summary> + /// 鎵嬪姩鍩烘澘鍑哄簱鎷i�� + /// </summary> + [Description("鎵嬪姩鍩烘澘鍑哄簱鎷i��")] + HandSubstrateOutPick = 400, + } + public enum MesRworkOutTypeEnum + { + /// <summary> + /// 瀹㈤�� + /// </summary> + [Description("瀹㈤��")] + ReturnGuest = 1, + + /// <summary> + /// 搴撳瓨涓嶈壇 + /// </summary> + [Description("搴撳瓨涓嶈壇")] + OutOfStock = 2, + + /// <summary> + /// 浣欐暟鎻愪粨 + /// </summary> + [Description("浣欐暟鎻愪粨")] + Withdrawn = 3 + } +} diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderCreateTypeEnum.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderCreateTypeEnum.cs new file mode 100644 index 0000000..79c5516 --- /dev/null +++ b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderCreateTypeEnum.cs @@ -0,0 +1,24 @@ +锘縰sing System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_Common.OrderEnum +{ + public enum OrderCreateTypeEnum + { + /// <summary> + /// 绯荤粺鍐呭垱寤� + /// </summary> + [Description("绯荤粺鍐呭垱寤�")] + CreateInSystem, + + /// <summary> + /// 涓婃父绯荤粺鎺ㄩ�� + /// </summary> + [Description("涓婃父绯荤粺鎺ㄩ��")] + UpperSystemPush + } +} diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderDetailStatusEnum.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderDetailStatusEnum.cs new file mode 100644 index 0000000..8e849dc --- /dev/null +++ b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderDetailStatusEnum.cs @@ -0,0 +1,52 @@ +锘縰sing System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_Common.OrderEnum +{ + public enum OrderDetailStatusEnum + { + /// <summary> + /// 鏂板缓 + /// </summary> + [Description("鏂板缓")] + New = 0, + + /// <summary> + /// 缁勭洏鍏ュ簱 + /// </summary> + [Description("缁勭洏鍏ュ簱")] + GroupAndInbound = 10, + /// <summary> + /// 鍏ュ簱涓� + /// </summary> + [Description("鍏ュ簱涓�")] + Inbounding = 20, + /// <summary> + /// 鍑哄簱閮ㄥ垎鍒嗛厤瀹屾垚 + /// </summary> + [Description("鍑哄簱閮ㄥ垎鍒嗛厤瀹屾垚")] + AssignOverPartial = 60, + + /// <summary> + /// 鍑哄簱鍒嗛厤瀹屾垚 + /// </summary> + [Description("鍑哄簱鍒嗛厤瀹屾垚")] + AssignOver = 70, + + /// <summary> + /// 鍑哄簱涓� + /// </summary> + [Description("鍑哄簱涓�")] + Outbound = 80, + + /// <summary> + /// 瀹屾垚 + /// </summary> + [Description("瀹屾垚")] + Over = 100 + } +} diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutProTypeEnum.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutProTypeEnum.cs new file mode 100644 index 0000000..1b76f01 --- /dev/null +++ b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutProTypeEnum.cs @@ -0,0 +1,23 @@ +锘縰sing System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_Common.OrderEnum +{ + public enum OutProTypeEnum + { + /// <summary> + /// 鎴愬搧鍑哄簱鍗� + /// </summary> + [Description("鎴愬搧鍑哄簱鍗�")] + ProOut=1, + /// <summary> + /// 瀵勫敭璁㈠崟杞粨 + /// </summary> + [Description("瀵勫敭璁㈠崟杞粨")] + SendProOut=2 + } +} diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutboundOrderEnum.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutboundOrderEnum.cs new file mode 100644 index 0000000..79a1f01 --- /dev/null +++ b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutboundOrderEnum.cs @@ -0,0 +1,129 @@ +锘縰sing System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_Common.OrderEnum +{ + public enum OutOrderStatusEnum + { + /// <summary> + /// 鏈紑濮� + /// </summary> + [Description("鏈紑濮�")] + 鏈紑濮� = 0, + + /// <summary> + /// 鍑哄簱涓� + /// </summary> + [Description("鍑哄簱涓�")] + 鍑哄簱涓� = 1, + + /// <summary> + /// 鍑哄簱瀹屾垚 + /// </summary> + [Description("鍑哄簱瀹屾垚")] + 鍑哄簱瀹屾垚 = 2, + + /// <summary> + /// 鍏抽棴 + /// </summary> + [Description("鍏抽棴")] + 鍏抽棴 = 99, + + /// <summary> + /// 鍙栨秷 + /// </summary> + [Description("鍙栨秷")] + 鍙栨秷 = 98 + } + + /// <summary> + /// 鍑哄簱鍗曠被鍨� + /// </summary> + public enum OutOrderTypeEnum + { + + /// <summary> + /// MES鍑哄簱鍗� + /// </summary> + [Description("MES鍑哄簱鍗�")] + MesOutOrder = 100, + /// <summary> + /// 鐢熶骇杩斿伐鍗� + /// </summary> + [Description("鐢熶骇杩斿伐鍗�")] + Rework = 200, + + /// <summary> + /// 鐢熶骇鍙戞枡鍗� + /// </summary> + [Description("鐢熶骇鍙戞枡鍗�")] + Issue = 205, + + /// <summary> + /// 閲囪喘閫�璐у崟 + /// </summary> + [Description("閲囪喘閫�璐у崟")] + ProcureReturn = 210, + + /// <summary> + /// 璋冩嫧鍑哄簱鍗� + /// </summary> + [Description("璋冩嫧鍑哄簱鍗�")] + Allocate = 215, + + /// <summary> + /// 閿�鍞嚭搴撳崟 + /// </summary> + [Description("閿�鍞嚭搴撳崟")] + SaleOut = 220, + + /// <summary> + /// 绌虹洏鍑哄簱鍗� + /// </summary> + [Description("绌虹洏鍑哄簱鍗�")] + EmptyDisk = 225, + + /// <summary> + /// 璐ㄦ鍑哄簱鍗� + /// </summary> + [Description("璐ㄦ鍑哄簱鍗�")] + Quality = 230, + + /// <summary> + /// 鍏朵粬鍑哄簱鍗� + /// </summary> + [Description("鍏朵粬鍑哄簱鍗�")] + Other = 235, + + /// <summary> + /// 缁翠慨鍙戞枡鍗� + /// </summary> + [Description("缁翠慨鍙戞枡鍗�")] + MaintenanceIssue = 240, + } + public enum ProOrderTypeEnum + { + /// <summary> + /// 璁㈠崟鍑哄簱 + /// </summary> + [Description("璁㈠崟鍑哄簱")] + ProDeliveryOut=1, + /// <summary> + /// 瀵勫敭璁㈠崟鍑哄簱 + /// </summary> + [Description("瀵勫敭璁㈠崟鍑哄簱")] + ProConsignOut = 2 + } + public enum ErpProOutTypeEnum + { + /// <summary> + /// 鎴愬搧璋冩嫧鍑哄簱鍗� + /// </summary> + [Description("鎴愬搧璋冩嫧鍑哄簱鍗�")] + ProOutAllocat = 1, + } +} diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/ProScrapSheetStatusEnum.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/ProScrapSheetStatusEnum.cs new file mode 100644 index 0000000..c9a17e4 --- /dev/null +++ b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/ProScrapSheetStatusEnum.cs @@ -0,0 +1,34 @@ +锘縰sing System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_Common.OrderEnum +{ + public enum ProScrapSheetStatusEnum + { + /// <summary> + /// 寰呮牳鍑� + /// </summary> + [Description("寰呮牳鍑�")] + TOChecked, + /// <summary> + /// 宸叉牳鍑� + /// </summary> + [Description("宸叉牳鍑�")] + Valid + ///// <summary> + ///// 鐗归噰 + ///// </summary> + //[Description("鐗归噰")] + //Defect, + + ///// <summary> + ///// 鎶ュ簾 + ///// </summary> + //[Description("鎶ュ簾")] + //Scrapped + } +} diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/PurchaseOrderEnum.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/PurchaseOrderEnum.cs new file mode 100644 index 0000000..a43dd7e --- /dev/null +++ b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/PurchaseOrderEnum.cs @@ -0,0 +1,74 @@ +锘縰sing System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_Common.OrderEnum +{ + public enum PurchaseOrderStatusEnum + { + /// <summary> + /// 鏈敹璐� + /// </summary> + [Description("鏈敹璐�")] + NotReceived = 0, + + /// <summary> + /// 鏀惰揣涓� + /// </summary> + [Description("鏀惰揣涓�")] + Receiving = 1, + + /// <summary> + /// 鏀惰揣瀹屾垚 + /// </summary> + [Description("鏀惰揣瀹屾垚")] + Received = 2, + /// <summary> + /// 璁㈠崟鍏抽棴 + /// </summary> + [Description("璁㈠崟鍏抽棴")] + Closed = 3 + } + + public enum PurchaseOrderDetailStatusEnum + { + /// <summary> + /// 鏈敹璐� + /// </summary> + [Description("鏀惰揣")] + NotReceived = 0, + /// <summary> + /// 鏀惰揣涓� + /// </summary> + [Description("鏀惰揣涓�")] + Receiving = 1, + /// <summary> + /// 鏀惰揣瀹屾垚 + /// </summary> + [Description("鏀惰揣瀹屾垚")] + Received = 2, + /// <summary> + /// 璁㈠崟鍏抽棴 + /// </summary> + [Description("璁㈠崟鍏抽棴")] + Closed = 3 + } + + public enum PurchaseOrderTypeEnum + { + /// <summary> + /// 鏍囧噯鍏ュ簱 + /// </summary> + [Description("鏍囧噯鍏ュ簱")] + S = 1, + + /// <summary> + /// 瀵勫敭琛ョ粰鍏ュ簱 + /// </summary> + [Description("瀵勫敭琛ョ粰鍏ュ簱")] + V = 2 + } +} diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/ReturnOrderEnum.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/ReturnOrderEnum.cs new file mode 100644 index 0000000..1a04ffb --- /dev/null +++ b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/ReturnOrderEnum.cs @@ -0,0 +1,49 @@ +锘縰sing System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_Common.OrderEnum +{ + /// <summary> + /// 閫�鏂欑姸鎬� + /// </summary> + public enum ReturnOrderStatusEnum + { + /// <summary> + /// 鏈��鏂� + /// </summary> + [Description("鏈��鏂�")] + NotReturn = 0, + + /// <summary> + /// 閫�鏂欎腑 + /// </summary> + [Description("閫�鏂欎腑")] + Returning = 1, + + /// <summary> + /// 閫�鏂欏畬鎴� + /// </summary> + [Description("閫�鏂欏畬鎴�")] + Returned = 2 + } + /// <summary> + /// 閫�鏂欑被鍨� + /// </summary> + public enum ReturnOrderTypeEnum + { + /// <summary> + /// 鏍囧噯閫�鏂� + /// </summary> + [Description("鏍囧噯閫�鏂�")] + StandardReturn = 1, + /// <summary> + /// Bom閫�鏂� + /// </summary> + [Description("Bom閫�鏂�")] + BomReturn = 2 + } +} diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/TakeStockStatusEnum.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/TakeStockStatusEnum.cs new file mode 100644 index 0000000..cf918d8 --- /dev/null +++ b/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/TakeStockStatusEnum.cs @@ -0,0 +1,68 @@ +锘縰sing System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_Common.OrderEnum +{ + /// <summary> + /// 鐩樼偣鐘舵�� + /// </summary> + public enum TakeStockStatusEnum + { + /// <summary> + /// 鏈洏鐐� + /// </summary> + [Description("鏈洏鐐�")] + 鏈洏鐐� = 0, + + /// <summary> + /// 鐩樼偣涓� + /// </summary> + [Description("鐩樼偣涓�")] + 鐩樼偣涓� = 1, + + /// <summary> + /// 鐩樼偣瀹屾垚 + /// </summary> + [Description("鐩樼偣瀹屾垚")] + 鐩樼偣瀹屾垚 = 2, + + /// <summary> + /// 鐩樼偣鍏抽棴 + /// </summary> + [Description("鐩樼偣鍏抽棴")] + 鐩樼偣鍏抽棴 = 3, + } + /// <summary> + /// 鐩樼偣鏄庣粏鐘舵�� + /// </summary> + public enum TakeStockDetailStatusEnum + { + /// <summary> + /// 鏈洏鐐� + /// </summary> + [Description("鏈洏鐐�")] + 鏈洏鐐� = 0, + + /// <summary> + /// 鐩樼偣涓� + /// </summary> + [Description("鐩樼偣鍑哄簱涓�")] + 鐩樼偣鍑哄簱涓� = 1, + + /// <summary> + /// 鐩樼偣鍑哄簱瀹屾垚 + /// </summary> + [Description("鐩樼偣鍑哄簱瀹屾垚")] + 鐩樼偣鍑哄簱瀹屾垚 = 2, + + /// <summary> + /// 鐩樼偣瀹屾垚 + /// </summary> + [Description("鐩樼偣瀹屾垚")] + 鐩樼偣瀹屾垚 = 3 + } +} diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj b/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj index 6b6e2fc..f14a168 100644 --- a/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj +++ b/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +锘�<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net6.0</TargetFramework> -- Gitblit v1.9.3