From 29299a0cbc21014412e6062f11dfb9aaf6aaadd2 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Wed, 26 Jun 2024 09:48:54 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=8E=BB=E6=8E=89=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20[PurchaseInfo=5FAsnNumber1],=20[PurchaseIn?= =?UTF-8?q?fo=5FPoNumber1]=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=8B=86=E7=AE=B1?= =?UTF-8?q?=E6=97=B6PoLine=E8=87=AA=E5=A2=9E=E4=B8=80"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8bc3af386b2d3a11ab9f392f958249e11223fe0b. --- .../SplitPackingRecAutoMapperProfile.cs | 4 ++-- .../IHasPurchaseInfo.cs | 16 ++++++++-------- .../Jobs/InspectJobs/InspectJobAppService.cs | 4 ++-- .../PurchaseReceiptJobAppService.cs | 4 ++-- .../PurchaseReceiptRequestAppService.cs | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAutoMapperProfile.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAutoMapperProfile.cs index d6fc96e2c..35486936c 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAutoMapperProfile.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAutoMapperProfile.cs @@ -39,9 +39,9 @@ public static class LabelCommonMapperExtensions { return m .ForMember(dest => dest.SupplierCode, opts => opts.MapFrom(src => src.PurchaseInfo.SupplierCode)) - //.ForMember(dest => dest.PoNumber, opts => opts.MapFrom(src => src.PurchaseInfo.PoNumber)) + .ForMember(dest => dest.PoNumber, opts => opts.MapFrom(src => src.PurchaseInfo.PoNumber)) .ForMember(dest => dest.RpNumber, opts => opts.MapFrom(src => src.PurchaseInfo.RpNumber)) - //.ForMember(dest => dest.AsnNumber, opts => opts.MapFrom(src => src.PurchaseInfo.AsnNumber)) + .ForMember(dest => dest.AsnNumber, opts => opts.MapFrom(src => src.PurchaseInfo.AsnNumber)) ; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/IHasPurchaseInfo.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/IHasPurchaseInfo.cs index 09828bad5..11123aeb6 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/IHasPurchaseInfo.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/IHasPurchaseInfo.cs @@ -125,8 +125,8 @@ public class PurchaseInfo : ValueObject /// /// 订单号 /// - //[MaxLength(SfsEfCorePropertyConst.CodeLength)] - //public string PoNumber { get; set; } + [MaxLength(SfsEfCorePropertyConst.CodeLength)] + public string PoNumber { get; set; } /// /// 要货计划号 @@ -137,23 +137,23 @@ public class PurchaseInfo : ValueObject /// /// 发货单号 /// - //[MaxLength(SfsEfCorePropertyConst.CodeLength)] - //public string AsnNumber { get; set; } + [MaxLength(SfsEfCorePropertyConst.CodeLength)] + public string AsnNumber { get; set; } protected override IEnumerable GetAtomicValues() { yield return SupplierCode; - //yield return PoNumber; + yield return PoNumber; yield return RpNumber; - //yield return AsnNumber; + yield return AsnNumber; } public PurchaseInfo(string supplierCode, string poNumber, string rpNumber, string asnNumber) { SupplierCode = supplierCode; - //PoNumber = poNumber; + PoNumber = poNumber; RpNumber = rpNumber; - //AsnNumber = asnNumber; + AsnNumber = asnNumber; } public PurchaseInfo() diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs index 39e27bc58..37bd73e5b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs @@ -225,8 +225,8 @@ public class InspectJobAppService newDetail.InspectQty = input.ToQty; newDetail.GoodQty = input.ToQty; //newDetail.CreationTime = CommonHelper.CurTime; - //decimal maxPoLine = job.Details.Max(itm => itm.PoLine.TryToDecimalZero()); - //newDetail.PoLine = (maxPoLine + 1).ToString(); //行号自增 + decimal maxPoLine = job.Details.Max(itm => itm.PoLine.TryToDecimalZero()); + newDetail.PoLine = (maxPoLine + 1).ToString(); //行号自增 job.Details.Add(newDetail); //修改源箱 detail.ReceiveQty = input.FromQty - input.ToQty; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/PurchaseReceiptJobs/PurchaseReceiptJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/PurchaseReceiptJobs/PurchaseReceiptJobAppService.cs index 506bdfe62..2cab78db8 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/PurchaseReceiptJobs/PurchaseReceiptJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/PurchaseReceiptJobs/PurchaseReceiptJobAppService.cs @@ -253,8 +253,8 @@ public class PurchaseReceiptJobAppService : newDetail.HandledQty = detail.HandledQty > 0 ? input.ToQty : 0; //newDetail.CreationTime = CommonHelper.CurTime; newDetail.PurchaseReceiptInspectStatus = EnumPurchaseReceiptInspect.INSP; //俊城沟通，改成 未扫描 - //decimal maxPoLine = job.Details.Max(itm => itm.PoLine.TryToDecimalZero()); - //newDetail.PoLine = (maxPoLine + 1).ToString(); //行号自增 + decimal maxPoLine = job.Details.Max(itm => itm.PoLine.TryToDecimalZero()); + newDetail.PoLine = (maxPoLine + 1).ToString(); //行号自增 job.Details.Add(newDetail); //修改源箱 detail.RecommendQty = input.FromQty - input.ToQty; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReceiptRequests/PurchaseReceiptRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReceiptRequests/PurchaseReceiptRequestAppService.cs index 7b1b84a1a..37ac275c1 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReceiptRequests/PurchaseReceiptRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReceiptRequests/PurchaseReceiptRequestAppService.cs @@ -227,8 +227,8 @@ public class PurchaseReceiptRequestAppService : newDetail.PackingCode = input.ToPackingCode; newDetail.Qty = input.ToQty; //newDetail.CreationTime = CommonHelper.CurTime; - //decimal maxPoLine = request.Details.Max(itm => itm.PoLine.TryToDecimalZero()); - //newDetail.PoLine = (maxPoLine + 1).ToString(); //行号自增 + decimal maxPoLine = request.Details.Max(itm => itm.PoLine.TryToDecimalZero()); + newDetail.PoLine = (maxPoLine + 1).ToString(); //行号自增 request.Details.Add(newDetail); //修改源箱 detail.Qty = input.FromQty - input.ToQty;