diff --git a/.vs/ProjectEvaluation/seyounth.auto.hs.metadata.v9.bin b/.vs/ProjectEvaluation/seyounth.auto.hs.metadata.v9.bin index 691cf24..c12ae83 100644 Binary files a/.vs/ProjectEvaluation/seyounth.auto.hs.metadata.v9.bin and b/.vs/ProjectEvaluation/seyounth.auto.hs.metadata.v9.bin differ diff --git a/.vs/ProjectEvaluation/seyounth.auto.hs.projects.v9.bin b/.vs/ProjectEvaluation/seyounth.auto.hs.projects.v9.bin index 1769032..9796e69 100644 Binary files a/.vs/ProjectEvaluation/seyounth.auto.hs.projects.v9.bin and b/.vs/ProjectEvaluation/seyounth.auto.hs.projects.v9.bin differ diff --git a/.vs/ProjectEvaluation/seyounth.auto.hs.strings.v9.bin b/.vs/ProjectEvaluation/seyounth.auto.hs.strings.v9.bin index 235a159..8021668 100644 Binary files a/.vs/ProjectEvaluation/seyounth.auto.hs.strings.v9.bin and b/.vs/ProjectEvaluation/seyounth.auto.hs.strings.v9.bin differ diff --git a/.vs/Seyounth.Auto.Hs/DesignTimeBuild/.dtbcache.v2 b/.vs/Seyounth.Auto.Hs/DesignTimeBuild/.dtbcache.v2 index 0701fb9..0f8860d 100644 Binary files a/.vs/Seyounth.Auto.Hs/DesignTimeBuild/.dtbcache.v2 and b/.vs/Seyounth.Auto.Hs/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Seyounth.Auto.Hs/v17/.futdcache.v2 b/.vs/Seyounth.Auto.Hs/v17/.futdcache.v2 index 3ca9782..a2e0615 100644 Binary files a/.vs/Seyounth.Auto.Hs/v17/.futdcache.v2 and b/.vs/Seyounth.Auto.Hs/v17/.futdcache.v2 differ diff --git a/.vs/Seyounth.Auto.Hs/v17/.suo b/.vs/Seyounth.Auto.Hs/v17/.suo index 9ab7f39..6589d22 100644 Binary files a/.vs/Seyounth.Auto.Hs/v17/.suo and b/.vs/Seyounth.Auto.Hs/v17/.suo differ diff --git a/.vs/Seyounth.Auto.Hs/v17/DocumentLayout.backup.json b/.vs/Seyounth.Auto.Hs/v17/DocumentLayout.backup.json index bc0accc..793a296 100644 --- a/.vs/Seyounth.Auto.Hs/v17/DocumentLayout.backup.json +++ b/.vs/Seyounth.Auto.Hs/v17/DocumentLayout.backup.json @@ -2,17 +2,29 @@ "Version": 1, "WorkspaceRootPath": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\", "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\service\\boxservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\service\\boxservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\service\\downservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\service\\downservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A454C322-58E6-4FEB-B709-5E277C7E71B7}|services\\Syc.Basic.Web.WMS.Application.Contracts\\Syc.Basic.Web.WMS.Application.Contracts.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application.contracts\\dtos\\box\\boxdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A454C322-58E6-4FEB-B709-5E277C7E71B7}|services\\Syc.Basic.Web.WMS.Application.Contracts\\Syc.Basic.Web.WMS.Application.Contracts.csproj|solutionrelative:services\\syc.basic.web.wms.application.contracts\\dtos\\box\\boxdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{B1BFBB4E-0213-4D41-A05B-43C276F9CDAB}|services\\Syc.Basic.Web.WMS.Domain\\Syc.Basic.Web.WMS.Domain.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.domain\\entitys\\box.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{B1BFBB4E-0213-4D41-A05B-43C276F9CDAB}|services\\Syc.Basic.Web.WMS.Domain\\Syc.Basic.Web.WMS.Domain.csproj|solutionrelative:services\\syc.basic.web.wms.domain\\entitys\\box.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\enum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\enum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\service\\produceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\service\\produceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\service\\boxservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\service\\boxservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\dto\\silkdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\dto\\silkdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\dto\\produceselectdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -21,10 +33,6 @@ { "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\service\\silkservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\service\\silkservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\dto\\checksilkdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\dto\\checksilkdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -34,67 +42,79 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 0, + "SelectedChildIndex": 7, "Children": [ - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "Enum.cs", - "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Enum.cs", - "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Enum.cs", - "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Enum.cs", - "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Enum.cs", - "ViewState": "AgIAAAgAAAAAAAAAAAAwwBsAAAAFAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-12-30T03:56:17.049Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 1, - "Title": "ProduceService.cs", - "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\ProduceService.cs", - "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Service\\ProduceService.cs", - "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\ProduceService.cs", - "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Service\\ProduceService.cs", - "ViewState": "AgIAACEAAAAAAAAAAAAAwDQAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-12-30T03:55:24.347Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 5, - "Title": "CheckSilkDto.cs", - "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Dto\\CheckSilkDto.cs", - "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Dto\\CheckSilkDto.cs", - "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Dto\\CheckSilkDto.cs", - "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Dto\\CheckSilkDto.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAsAAAAoAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-12-30T03:54:12.811Z", - "EditorCaption": "" - }, { "$type": "Bookmark", "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}" }, { "$type": "Document", - "DocumentIndex": 4, - "Title": "SilkService.cs", - "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\SilkService.cs", - "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Service\\SilkService.cs", - "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\SilkService.cs", - "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Service\\SilkService.cs", - "ViewState": "AgIAAG4AAAAAAAAAAAAQwH8AAAAAAAAAAAAAAA==", + "DocumentIndex": 5, + "Title": "SilkDto.cs", + "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Dto\\SilkDto.cs", + "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Dto\\SilkDto.cs", + "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Dto\\SilkDto.cs", + "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Dto\\SilkDto.cs", + "ViewState": "AgIAABQAAAAAAAAAAAAUwCIAAAAwAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-12-30T01:54:12.849Z", + "WhenOpened": "2026-01-05T03:13:36.179Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 3, + "Title": "Box.cs", + "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Domain\\Entitys\\Box.cs", + "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Domain\\Entitys\\Box.cs", + "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Domain\\Entitys\\Box.cs", + "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Domain\\Entitys\\Box.cs", + "ViewState": "AgIAAB0AAAAAAAAAAAA5wCcAAAAWAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2026-01-05T01:47:02.162Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "DownService.cs", + "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\DownService.cs", + "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Service\\DownService.cs", + "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\DownService.cs", + "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Service\\DownService.cs", + "ViewState": "AgIAAKkAAAAAAAAAAADwv6EAAABVAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2026-01-05T01:11:29.472Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "Enum.cs", + "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Enum.cs", + "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Enum.cs", + "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Enum.cs", + "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Enum.cs", + "ViewState": "AgIAAAYAAAAAAAAAAAAAABEAAAASAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-12-30T03:56:17.049Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "SilkService.cs", + "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\SilkService.cs", + "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Service\\SilkService.cs", + "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\SilkService.cs", + "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Service\\SilkService.cs", + "ViewState": "AgIAAJkAAAAAAAAAAAAIwPUAAAAQAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-12-30T01:54:12.849Z" + }, + { + "$type": "Document", + "DocumentIndex": 6, "Title": "ProduceSelectDto.cs", "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Dto\\ProduceSelectDto.cs", "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Dto\\ProduceSelectDto.cs", @@ -102,21 +122,33 @@ "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Dto\\ProduceSelectDto.cs", "ViewState": "AgIAAAgAAAAAAAAAAAAwwBEAAAAlAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-12-29T01:51:55.211Z", - "EditorCaption": "" + "WhenOpened": "2025-12-29T01:51:55.211Z" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 0, "Title": "BoxService.cs", "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\BoxService.cs", "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Service\\BoxService.cs", "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\BoxService.cs", "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Service\\BoxService.cs", - "ViewState": "AgIAANACAAAAAAAAAAAAAOACAAAJAAAAAAAAAA==", + "ViewState": "AgIAAHUDAAAAAAAAAAAAAIUDAABCAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-11-04T05:53:30.627Z", "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "BoxDto.cs", + "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application.Contracts\\Dtos\\Box\\BoxDto.cs", + "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application.Contracts\\Dtos\\Box\\BoxDto.cs", + "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application.Contracts\\Dtos\\Box\\BoxDto.cs", + "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application.Contracts\\Dtos\\Box\\BoxDto.cs", + "ViewState": "AgIAABwAAAAAAAAAAAAmwCIAAAAnAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2026-01-05T06:30:37.861Z", + "EditorCaption": "" } ] } diff --git a/.vs/Seyounth.Auto.Hs/v17/DocumentLayout.json b/.vs/Seyounth.Auto.Hs/v17/DocumentLayout.json index 2828a86..fba56ab 100644 --- a/.vs/Seyounth.Auto.Hs/v17/DocumentLayout.json +++ b/.vs/Seyounth.Auto.Hs/v17/DocumentLayout.json @@ -2,21 +2,29 @@ "Version": 1, "WorkspaceRootPath": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\", "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\service\\boxservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\service\\boxservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\service\\downservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\service\\downservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, + { + "AbsoluteMoniker": "D:0:0:{A454C322-58E6-4FEB-B709-5E277C7E71B7}|services\\Syc.Basic.Web.WMS.Application.Contracts\\Syc.Basic.Web.WMS.Application.Contracts.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application.contracts\\dtos\\box\\boxdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A454C322-58E6-4FEB-B709-5E277C7E71B7}|services\\Syc.Basic.Web.WMS.Application.Contracts\\Syc.Basic.Web.WMS.Application.Contracts.csproj|solutionrelative:services\\syc.basic.web.wms.application.contracts\\dtos\\box\\boxdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{B1BFBB4E-0213-4D41-A05B-43C276F9CDAB}|services\\Syc.Basic.Web.WMS.Domain\\Syc.Basic.Web.WMS.Domain.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.domain\\entitys\\box.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{B1BFBB4E-0213-4D41-A05B-43C276F9CDAB}|services\\Syc.Basic.Web.WMS.Domain\\Syc.Basic.Web.WMS.Domain.csproj|solutionrelative:services\\syc.basic.web.wms.domain\\entitys\\box.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\enum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\enum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\service\\produceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\service\\produceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\service\\boxservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\service\\boxservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\dto\\silkdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\dto\\silkdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\dto\\produceselectdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -25,10 +33,6 @@ { "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\service\\silkservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\service\\silkservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|d:\\d\u76D8\\\u9879\u76EE\\\u6986\u6797\\yulinhscode\\seyounth.auto.hs\\services\\syc.basic.web.wms.application\\dto\\checksilkdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{3137A5F4-375A-4FB0-AA4B-7C0380A48BB2}|services\\Syc.Basic.Web.WMS.Application\\Syc.Basic.Web.WMS.Application.csproj|solutionrelative:services\\syc.basic.web.wms.application\\dto\\checksilkdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -38,7 +42,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 1, + "SelectedChildIndex": 7, "Children": [ { "$type": "Bookmark", @@ -46,69 +50,71 @@ }, { "$type": "Document", - "DocumentIndex": 0, - "Title": "DownService.cs", - "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\DownService.cs", - "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Service\\DownService.cs", - "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\DownService.cs", - "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Service\\DownService.cs", - "ViewState": "AgIAADoAAAAAAAAAAAAIwEsAAABDAAAAAAAAAA==", + "DocumentIndex": 5, + "Title": "SilkDto.cs", + "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Dto\\SilkDto.cs", + "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Dto\\SilkDto.cs", + "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Dto\\SilkDto.cs", + "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Dto\\SilkDto.cs", + "ViewState": "AgIAABQAAAAAAAAAAAAUwCIAAAAwAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-12-31T00:56:05.768Z", + "WhenOpened": "2026-01-05T03:13:36.179Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "Box.cs", + "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Domain\\Entitys\\Box.cs", + "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Domain\\Entitys\\Box.cs", + "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Domain\\Entitys\\Box.cs", + "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Domain\\Entitys\\Box.cs", + "ViewState": "AgIAAB0AAAAAAAAAAAA5wCcAAAAWAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2026-01-05T01:47:02.162Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 1, + "Title": "DownService.cs", + "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\DownService.cs", + "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Service\\DownService.cs", + "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\DownService.cs", + "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Service\\DownService.cs", + "ViewState": "AgIAAKkAAAAAAAAAAADwv6EAAABVAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2026-01-05T01:11:29.472Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, "Title": "Enum.cs", "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Enum.cs", "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Enum.cs", "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Enum.cs", "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Enum.cs", - "ViewState": "AgIAAAkAAAAAAAAAAAAAABsAAAAFAAAAAAAAAA==", + "ViewState": "AgIAAAYAAAAAAAAAAAAAABEAAAASAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-12-30T03:56:17.049Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, - "Title": "ProduceService.cs", - "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\ProduceService.cs", - "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Service\\ProduceService.cs", - "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\ProduceService.cs", - "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Service\\ProduceService.cs", - "ViewState": "AgIAACEAAAAAAAAAAAAAwDQAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-12-30T03:55:24.347Z" - }, - { - "$type": "Document", - "DocumentIndex": 6, - "Title": "CheckSilkDto.cs", - "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Dto\\CheckSilkDto.cs", - "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Dto\\CheckSilkDto.cs", - "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Dto\\CheckSilkDto.cs", - "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Dto\\CheckSilkDto.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAsAAAAoAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-12-30T03:54:12.811Z" - }, - { - "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 7, "Title": "SilkService.cs", "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\SilkService.cs", "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Service\\SilkService.cs", "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\SilkService.cs", "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Service\\SilkService.cs", - "ViewState": "AgIAAG4AAAAAAAAAAAAQwH8AAAAAAAAAAAAAAA==", + "ViewState": "AgIAAJkAAAAAAAAAAAAIwPUAAAAQAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-12-30T01:54:12.849Z" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 6, "Title": "ProduceSelectDto.cs", "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Dto\\ProduceSelectDto.cs", "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Dto\\ProduceSelectDto.cs", @@ -120,15 +126,29 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 0, "Title": "BoxService.cs", "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\BoxService.cs", "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application\\Service\\BoxService.cs", "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application\\Service\\BoxService.cs", "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application\\Service\\BoxService.cs", - "ViewState": "AgIAANACAAAAAAAAAAAAAOACAAAJAAAAAAAAAA==", + "ViewState": "AgIAAG8DAAAAAAAAAAAAAIQDAAAqAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-11-04T05:53:30.627Z" + "WhenOpened": "2025-11-04T05:53:30.627Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "BoxDto.cs", + "DocumentMoniker": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application.Contracts\\Dtos\\Box\\BoxDto.cs", + "RelativeDocumentMoniker": "services\\Syc.Basic.Web.WMS.Application.Contracts\\Dtos\\Box\\BoxDto.cs", + "ToolTip": "D:\\D\u76D8\\\u9879\u76EE\\\u6986\u6797\\YuLInHSCode\\Seyounth.Auto.Hs\\services\\Syc.Basic.Web.WMS.Application.Contracts\\Dtos\\Box\\BoxDto.cs", + "RelativeToolTip": "services\\Syc.Basic.Web.WMS.Application.Contracts\\Dtos\\Box\\BoxDto.cs", + "ViewState": "AgIAABwAAAAAAAAAAAAmwCIAAAAnAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2026-01-05T06:30:37.861Z", + "EditorCaption": "" } ] } diff --git a/services/Syc.Basic.Web.WMS.Application.Contracts/Dtos/Box/BoxDto.cs b/services/Syc.Basic.Web.WMS.Application.Contracts/Dtos/Box/BoxDto.cs index 27b24e4..a1345c0 100644 --- a/services/Syc.Basic.Web.WMS.Application.Contracts/Dtos/Box/BoxDto.cs +++ b/services/Syc.Basic.Web.WMS.Application.Contracts/Dtos/Box/BoxDto.cs @@ -32,6 +32,7 @@ namespace Syc.Basic.Web.WMS.Dto public string? Exp_Time { get; set; } public int DataType { get; set; } public string Mark { get; set; } + public int? BoxId { get; set; } /// /// 是否在装箱 /// diff --git a/services/Syc.Basic.Web.WMS.Application/Dto/SilkDto.cs b/services/Syc.Basic.Web.WMS.Application/Dto/SilkDto.cs index cdc1382..13ff28d 100644 --- a/services/Syc.Basic.Web.WMS.Application/Dto/SilkDto.cs +++ b/services/Syc.Basic.Web.WMS.Application/Dto/SilkDto.cs @@ -1,4 +1,5 @@ -using System; +using Syc.Basic.Web.WMS.Entitys; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -31,5 +32,6 @@ namespace Syc.Basic.Web.WMS.Dto public int? BoxId { get; set; } public int IsDelete { get; set; } + public List children { get; set; } } } diff --git a/services/Syc.Basic.Web.WMS.Application/Enum.cs b/services/Syc.Basic.Web.WMS.Application/Enum.cs index 1b4bd99..d5a1c9d 100644 --- a/services/Syc.Basic.Web.WMS.Application/Enum.cs +++ b/services/Syc.Basic.Web.WMS.Application/Enum.cs @@ -14,7 +14,8 @@ namespace Syc.Basic.Web.WMS 成箱码垛, 手动装箱, 手动成箱未包含单品信息, - 选中打印标签 + 选中打印标签, + 选中打印成箱码垛标签 } public enum SilkStatus { diff --git a/services/Syc.Basic.Web.WMS.Application/Service/BoxService.cs b/services/Syc.Basic.Web.WMS.Application/Service/BoxService.cs index a3aa1de..a9939b5 100644 --- a/services/Syc.Basic.Web.WMS.Application/Service/BoxService.cs +++ b/services/Syc.Basic.Web.WMS.Application/Service/BoxService.cs @@ -1,6 +1,7 @@ using JetBrains.Annotations; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.Extensions.Logging; using NUglify.Helpers; using Seyounth.Auto.Hs.Runtime.Plc; @@ -9,6 +10,7 @@ using Syc.Abp.Application.Contracts; using Syc.Basic.Web.WMS.Dto; using Syc.Basic.Web.WMS.Entitys; using Syc.Basic.Web.WMS.IService; +using Syc.Core.Tools; using System; using System.Collections; using System.Collections.Generic; @@ -45,6 +47,62 @@ namespace Syc.Basic.Web.WMS.Service this.valueRepository = valueRepository; } /// + /// 通过boxid查询丝锭/纸箱信息 + /// + /// + /// + [HttpGet] + public async Task> GetListByBoxid(int id) + { + var silklist = await silkRepository.GetListAsync(x => x.IsDelete == 0&& x.BoxId == id); + var boxlist = await boxRepository.GetListAsync(x => x.IsDelete == 0&& x.BoxId == id); + + List list = new List(); + + var data = silklist.Select(x => new SilkDto + { + Name = x.Name, + Net_Weight = x.Net_Weight, + Lot_No = x.Lot_No, + Code = x.Code, + Date = x.Date, + Id = x.Id, + Color = x.Color, + Length = x.Length, + Type = x.Type, + BoxId = x.BoxId, + Status = x.Status, + Status_Details = x.Status_Details + }).ToList() ; + list.AddRange(data); + + if (boxlist.Count()>0) + { + foreach(var box in boxlist) + { + var x = await boxRepository.FirstOrDefaultAsync(y => y.Id == box.Id); + var silkslist = await silkRepository.GetListAsync(y => y.BoxId == x.Id); + list.Add(new SilkDto + { + Name = x.Type, + Net_Weight = x.Net_Weight, + Lot_No = x.Lot_No, + Code = x.Code, + Date = x.Dom_Time, + Id = x.Id, + Color = x.Color, + Length = x.Length, + Type = x.Spec, + BoxId = x.BoxId, + Status = x.DataType, + Status_Details = x.Mark, + children = silkslist + }); + } + } + return list; + } + /// /// 查询纸箱 /// /// @@ -88,6 +146,7 @@ namespace Syc.Basic.Web.WMS.Service Qty = e.Qty, Id = e.Id, Code = e.Code, + BoxId=e.BoxId, Dom_Time = DateTime.Parse(e.Dom_Time.ToString()).ToString("yyyy-MM-dd HH:mm:ss"), DataType = e.DataType, Mark = e.Mark, @@ -343,6 +402,8 @@ namespace Syc.Basic.Web.WMS.Service box.IsDelete = 1; box.Delete_Time = DateTime.Now; + var list = await boxRepository.GetListAsync(x => x.BoxId.Value == box.Id); + if (input.IfDeleteSilk) { foreach (var silk in silks) @@ -351,6 +412,15 @@ namespace Syc.Basic.Web.WMS.Service silk.BoxId = 0; silk.Status = 1; } + if (list.Count() > 0) + { + foreach (var item in list) + { + item.Mark = $"从{item.BoxId}码垛中删除待重新码垛"; + item.BoxId = 0; + item.DataType = 0; + } + } } else { @@ -381,6 +451,8 @@ namespace Syc.Basic.Web.WMS.Service boxs[i].IsDelete = 1; boxs[i].Delete_Time = DateTime.Now; + var list = await boxRepository.GetListAsync(x => x.BoxId.Value == boxs[i].Id); + if (input.IfDeleteSilk) { foreach (var silk in silks) @@ -389,6 +461,15 @@ namespace Syc.Basic.Web.WMS.Service silk.BoxId = 0; silk.Status = 1; } + if (list.Count() > 0) + { + foreach (var box in list) + { + box.Mark = $"从{box.BoxId}码垛中删除待重新打印"; + box.BoxId = 0; + box.DataType = 0; + } + } } else { @@ -471,10 +552,9 @@ namespace Syc.Basic.Web.WMS.Service throw Oops.Oh($"没有{input.Num}条{produce.Type}的整箱的信息,只有{boxs.Count}条,无法创建码垛信息"); //return; } - - #region 生成自定义Code var netWeight = boxs.Sum(x => x.Net_Weight); + #region 生成自定义Code var date = DateOnly.Parse(DateTime.Now.ToString("yyyy-MM-dd")); var autolabel = await autoRepository.FirstOrDefaultAsync(x => x.Date == date && x.Type == (int)AutoLabelType.成箱码垛流水号); var timestr = DateTime.Now.ToString("yyyyMMddHHmmss"); @@ -520,6 +600,7 @@ namespace Syc.Basic.Web.WMS.Service List list = new List(); foreach (var item in boxs) { + item.BoxId = Box.Id; item.DataType = (int)BoxDataType.已码垛; item.Mark = "已码垛到编号" + Box.Code + "中,码垛数据编号ID" + Box.Id; list.Add(item); @@ -649,7 +730,7 @@ namespace Syc.Basic.Web.WMS.Service } /// - /// 选中打印标签大标签 + /// 选中丝锭信息打印标签大标签 /// /// /// @@ -710,7 +791,7 @@ namespace Syc.Basic.Web.WMS.Service IsDelete = 0, DataType = (int)BoxDataType.选中打印标签, Create_Time = DateTime.Now, - Mark = "选中打印标签数量" + num + Mark = "选中丝锭数量" + num }; var Box = await boxRepository.InsertAsync(box, true); @@ -721,7 +802,7 @@ namespace Syc.Basic.Web.WMS.Service { silk.Status = 6; silk.BoxId = Box.Id; - silk.Status_Details = "选中打印标签"; + silk.Status_Details = "选中丝锭码垛"; list.Add(silk); } @@ -735,6 +816,94 @@ namespace Syc.Basic.Web.WMS.Service #endregion } + /// + /// 选中成箱信息打印标签大标签 + /// + /// + /// + [HttpPost] + public async Task CheckBoxsPrint(CheckSilkDto input) + { + var produce = await produceRepository.FirstOrDefaultAsync(x => x.Id == input.Pid); + + var boxsQuery = await boxRepository.GetQueryableAsync(); + var boxslist = boxsQuery + .Where(x => input.Ids.Contains(x.Id)); + + var netWeight = boxslist.Sum(x => x.Net_Weight); + var num = boxslist.Count(); + var iscreate = boxslist.Any(x => x.DataType == (int)BoxDataType.装箱||x.DataType==(int)BoxDataType.选中打印标签); + + if (produce == null) + throw Oops.Oh("没有生产设置"); + if (boxslist.Count() == 0) + throw Oops.Oh("没有选中的丝锭"); + if (!iscreate) + throw Oops.Oh("选中的列表中包含未装箱的成箱信息,无法创建码垛信息"); + + #region 自动生成成箱码垛流水号 + var date = DateOnly.Parse(DateTime.Now.ToString("yyyy-MM-dd")); + var autolabel = await autoRepository.FirstOrDefaultAsync(x => x.Date == date && x.Type == (int)AutoLabelType.成箱码垛流水号); + var timestr = DateTime.Now.ToString("yyyyMMddHHmmss"); + + if (autolabel == null) + { + autolabel = await autoRepository.InsertAsync(new AutoLabel() + { + Date = date, + Sort = 0, + Mark = timestr, + Type = (int)AutoLabelType.成箱码垛流水号 + }, true); + + } + autolabel.Sort += 1; + logger.LogInformation("选中成箱信息码垛生成Code" + timestr + autolabel.Sort.ToString().PadLeft(4, '0')); + await autoRepository.UpdateAsync(autolabel); + #endregion + + var box = new Box() + { + Dom_Time = Convert.ToDateTime(input.Date), + Type = produce.Type, + Exp_Time = Convert.ToDateTime(input.ExpTime), + Qty = num, + Length = produce.Length, + Lot_No = produce.Lot_No, + Color = input.Color, + //Code = Guid.NewGuid().ToString().Substring(9, 18), + Code = timestr + autolabel.Sort.ToString().PadLeft(4, '0'), + Net_Weight = netWeight, + Spec = produce.Spec, + IsUse = true, + IsDelete = 0, + DataType = (int)BoxDataType.选中打印成箱码垛标签, + Create_Time = DateTime.Now, + Mark = "选中打印成箱信息数量" + num + }; + + var Box = await boxRepository.InsertAsync(box, true); + logger.LogInformation($"已添加码垛信息,码垛编号:{box.Code},包含单品数量:{boxslist.Count()}"); + + List list = new List(); + foreach (var boxs in boxslist) + { + boxs.DataType = (int)BoxDataType.已码垛; + boxs.BoxId = Box.Id; + boxs.Mark = "选中打印成箱信息码垛,成箱标签id"+Box.Id; + list.Add(boxs); + } + + await boxRepository.UpdateManyAsync(list); + + #region 打印标签 + //打印标签 + BarTenderHelper.BoxPrint(box); + logger.LogInformation($"打印条码{box.Code},成箱码垛标签打印成功"); + //throw Oops.Oh("丝锭码垛标签打印成功"); + #endregion + } + /// /// 求总 /// diff --git a/services/Syc.Basic.Web.WMS.Application/Service/DownService.cs b/services/Syc.Basic.Web.WMS.Application/Service/DownService.cs index edd885f..74c8be7 100644 --- a/services/Syc.Basic.Web.WMS.Application/Service/DownService.cs +++ b/services/Syc.Basic.Web.WMS.Application/Service/DownService.cs @@ -87,7 +87,23 @@ namespace Syc.Basic.Web.WMS.Service [HttpPost("api/DownSilkByBoxid")] public async Task DownLoadSilkByBoxid(IdsInput input) { + var boxs = await boxRepository.GetListAsync(x => input.Ids.Contains(x.BoxId.Value)); var silks = await silkRepository.GetListAsync(x => input.Ids.Contains(x.BoxId.Value)); + + List list = new List(); + + if (boxs.Count > 0) + { + foreach (var item in boxs) + { + logger.LogInformation("Box Code: {BoxCode}, Box Id: {BoxId}", item.Code, item.Id); + + var silk = await silkRepository.GetListAsync(x => x.BoxId.Value == item.Id); + silks.AddRange(silk); + } + } + + var silklist = silks.Select(x => new DownSilkDto { Id = x.Id, @@ -104,9 +120,11 @@ namespace Syc.Basic.Web.WMS.Service Status_Details = x.Status_Details }).ToList(); - if (silks.Count == 0) + if (list.Count == 0 && silklist.Count == 0) throw Oops.Oh("没有导出的数据"); + list.AddRange(silklist); + // 2. 自定义 Excel 表头(可选:替换模型属性名) var customHeaders = new Dictionary { @@ -128,7 +146,7 @@ namespace Syc.Basic.Web.WMS.Service // 3. 生成 Excel 内存流 var fileName1 = $"{DateTime.Now.ToString("yyyyMMddHHmmss")}.xlsx"; var fiePath = Path.Combine(webHost.WebRootPath, fileName1); - ExcelExporter.ExportToExcelStream(silklist, "丝锭数据报表", fiePath, customHeaders); + ExcelExporter.ExportToExcelStream(list, "丝锭数据报表", fiePath, customHeaders); // 4. 配置下载响应(解决中文文件名乱码) string fileName = $"丝锭数据报表_{DateTime.Now:yyyyMMddHHmmss}.xlsx"; @@ -142,8 +160,24 @@ namespace Syc.Basic.Web.WMS.Service public async Task DownLoadBox(IdsInput input) { var box = await boxRepository.GetListAsync(x => input.Ids.Contains(x.Id)); - var boxlist = box.Select(x => new DownBoxDto + + List list = new List(); + list.AddRange(box); + + var boxchildren = box.Where(x => x.DataType == (int)BoxDataType.成箱码垛 || x.DataType == (int)BoxDataType.选中打印成箱码垛标签); + + if (boxchildren.Count() > 0) { + foreach (var boxchild in boxchildren) + { + var boxs = await boxRepository.GetListAsync(x => x.BoxId == boxchild.Id); + list.AddRange(boxs); + } + } + + var boxlist = list.Select(x => new DownBoxDto + { + Id=x.Id, Code = x.Code, Lot_No = x.Lot_No, Type = x.Type, @@ -159,7 +193,7 @@ namespace Syc.Basic.Web.WMS.Service Create_Time = x.Create_Time }).ToList(); - if (box.Count == 0) + if (list.Count == 0) throw Oops.Oh("没有导出的数据"); // 2. 自定义 Excel 表头(可选:替换模型属性名) diff --git a/services/Syc.Basic.Web.WMS.Application/Syc.Basic.Web.WMS.Application.xml b/services/Syc.Basic.Web.WMS.Application/Syc.Basic.Web.WMS.Application.xml index 44076b3..c4ba924 100644 --- a/services/Syc.Basic.Web.WMS.Application/Syc.Basic.Web.WMS.Application.xml +++ b/services/Syc.Basic.Web.WMS.Application/Syc.Basic.Web.WMS.Application.xml @@ -114,6 +114,13 @@ + + + 通过boxid查询丝锭/纸箱信息 + + + + 查询纸箱 @@ -204,7 +211,14 @@ - 选中打印标签大标签 + 选中丝锭信息打印标签大标签 + + + + + + + 选中成箱信息打印标签大标签 diff --git a/services/Syc.Basic.Web.WMS.Domain/Entitys/Box.cs b/services/Syc.Basic.Web.WMS.Domain/Entitys/Box.cs index edb4649..5f9318e 100644 --- a/services/Syc.Basic.Web.WMS.Domain/Entitys/Box.cs +++ b/services/Syc.Basic.Web.WMS.Domain/Entitys/Box.cs @@ -34,6 +34,7 @@ namespace Syc.Basic.Web.WMS.Entitys public int DataType { get; set; } //描述 public string? Mark { get; set; } + public int? BoxId { get; set; } /// /// 是否在装箱 ///