From e2ca0e329d7bcfde486cdfdb1d0d6d8790c3abf5 Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Tue, 22 Oct 2024 11:07:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=9D=9E=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E9=80=80=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DTOs/UnplannedReceiptJobDTO.cs            |  6 +++++
 .../Inputs/UnplannedReceiptJobEditInput.cs    |  6 +++++
 .../UnplannedReceiptJobAppService.cs          | 24 +++++++++++++++++++
 .../UnplannedReceiptJob.cs                    |  6 +++++
 4 files changed, 42 insertions(+)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs
index f6ade924b..0d68af082 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs
@@ -112,4 +112,10 @@ public class UnplannedReceiptJobDTO : SfsJobDTOBase<UnplannedReceiptJobDetailDTO
     /// </summary>
     [Display(Name = "数量")]
     public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 是否有箱码
+    /// </summary>
+    [Display(Name = "是否有箱码")]
+    public bool IsHasPackingCode { get; set; }
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs
index 83b2ad5ee..cce9d0881 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs
@@ -138,4 +138,10 @@ public class UnplannedReceiptJobEditInput : SfsJobCreateUpdateInputBase,
     /// </summary>
     [Display(Name = "数量")]
     public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 是否有箱码
+    /// </summary>
+    [Display(Name = "是否有箱码")]
+    public bool IsHasPackingCode { get; set; }
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs
index b50a45be2..b044346f2 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs
@@ -220,16 +220,40 @@ public class UnplannedReceiptJobAppService
             switch(locationDtos.First().Type)
             {
                 case EnumLocationType.SEMI:
+                    job.IsHasPackingCode = false;
+                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
+                    break;
                 case EnumLocationType.CUST:
+                    job.IsHasPackingCode = false;
+                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
+                    break;
                 case EnumLocationType.FG:
+                    job.IsHasPackingCode = false;
+                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
+                    break;
                 case EnumLocationType.RAW:
+                    job.IsHasPackingCode = true;
+                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
+                    break;
                 case EnumLocationType.THIRDPARTY:
+                    job.IsHasPackingCode = false;
+                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
+                    break;
                 case EnumLocationType.OUTSIDE:
+                    job.IsHasPackingCode = false;
+                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
+                    break;
                 case EnumLocationType.DimensionalStorehouse:
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
+                    job.IsHasPackingCode = false;
                     break;
+
                 case EnumLocationType.KittingWip:
+                    job.IsHasPackingCode = false;
+                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Wip;
+                    break;
                 case EnumLocationType.WIP:
+                    job.IsHasPackingCode = false;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Wip;
                     break;
             }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs
index 87bf6a96b..7a320bb13 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs
@@ -118,6 +118,12 @@ public class UnplannedReceiptJob : SfsJobAggregateRootBase<UnplannedReceiptJobDe
     [IgnoreUpdate]
     public override List<UnplannedReceiptJobDetail> Details { get; set; } = new();
 
+    /// <summary>
+    /// 是否有箱码
+    /// </summary>
+    [Display(Name = "是否有箱码")]
+    public bool IsHasPackingCode { get; set; }
+
     /// <summary>
     ///     设置任务明细的实际库位和实际数量
     /// </summary>