From 69544106cb08b432c5ff5c5e6342aa5fef82f1d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Fri, 15 Sep 2023 10:59:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs | 3 ++ .../Entities/BQ/INVOICE_SERVICE.cs | 4 ++- .../Entities/BQ/PUB_CAN_SA_SERVICE.cs | 4 +++ .../Entities/BQ/Managers/INV_MNG.cs | 29 ++----------------- .../Entities/BQ/Managers/PUB_NOT_SA_MNG.cs | 1 + .../Entities/BQ/Temp/TempClass.cs | 8 +++++ 6 files changed, 22 insertions(+), 27 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs index 3b2e3310..8804488f 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs @@ -113,6 +113,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos [Display(Name = "订单号")] public string Extend4 { get; set; } + [Display(Name = "行号")] + public int IndexNum { get; set; } + } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index 04f8f839..90be4282 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -199,6 +199,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ else if (invs.FirstOrDefault().BusinessType == EnumBusinessType.BeiJian) { var B = await _wRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount); + + B.OrderBy(p => p.LineCode); var BMap = ObjectMapper.Map, List>(B); var wquery = from itm in BMap @@ -224,7 +226,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ BeginDate = itm.BeginDate, EndDate = itm.EndDate, }; - entity.INVOICE_WAIT_DETAIL_BJ = wquery.OrderBy(p => p.LU).ToList(); + entity.INVOICE_WAIT_DETAIL_BJ = wquery.ToList(); } else { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs index b9624d59..0784a176 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs @@ -106,6 +106,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ if (await _pubMng.SetForwardState(main, SettleBillState.已开票)) { var groupNumList = entitys.Select(p => p.GroupNum).Distinct().ToList(); + entitys= entitys.OrderBy(p => p.IndexNum).ToList(); + var dto1s = ObjectMapper.Map, List>(entitys); var q = from d in dto1s join p in priceList on d.LU equals p.LU @@ -130,6 +132,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ BeginDate = p.BeginTime, EndDate = p.EndTime, PartCode = d.PartCode,//客户零件号 + LineCode=d.IndexNum + }; var dtos = q.ToList(); if (dtos != null && dtos.Count > 0) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs index 9fcef7aa..ac088bc2 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs @@ -2212,6 +2212,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers Qty = dto1.Qty, BeginDate = dto1.BeginDate, EndDate = dto1.EndDate, + LineCode=dto1.LineCode, DeliveryNumber = inv1.GetProperty("DeliveryNumber", ""),//交货号 InvoiceNumber = inv1.GetProperty("InvoiceNumber", ""),//发票号 VendorCode = inv1.GetProperty("VendorCode", ""),//供应商代码 @@ -2268,6 +2269,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers beginDate: detail.BeginDate, endDate: detail.EndDate, partcode: detail.PartCode); + entity.LineCode = detail.LineCode; entity.SetProperty("DeliveryNumber", detail.DeliveryIndexNumber);//交货号 entity.SetProperty("VendorCode", detail.VendorCode);//供应商代码 entity.SetProperty("VendorName", detail.VendorName);//供应商名称 @@ -2275,37 +2277,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers entity.SetProperty("DeliveryIndexNumber", "");//交付索引号 entity.SetProperty("PartName", "");//零件名称 - _entityDetailList.Add( entity - - ); + _entityDetailList.Add(entity); } if (_entityDetailList.Count > 0) { detailList.AddRange(_entityDetailList); } - //var innotls = new List(); - //if (p_notlist != null && p_notlist.Count > 0) - //{ - // var notls = p_notlist.GroupBy(p => new { p.GroupNum, p.LU }).Select(p => new { GroupNum = p.Key.GroupNum, LU = p.Key.LU, Qty = p.Sum(itm => itm.Qty) }); - // foreach (var nitm in notls) - // { - // innotls.Add(new INVOICE_NOT_SETTLE( - // guid: GuidGenerator.Create(), - // version: p_version, - // invGroupNum: p_InvGroupNum, - // settleGroupNum: nitm.GroupNum, - // lU: string.Empty, - // lU1: nitm.LU, - // extend1: string.Empty, - // extend2: string.Empty, - // qty: nitm.Qty - // )); - // } - // if (innotls.Count > 0) - // { - // notDetialList.AddRange(innotls); - // } - //} var invbill = new INVOICE_GRP (guid: GuidGenerator.Create(), realnvBillNum: string.Empty, diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs index b4186471..3ba16169 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs @@ -126,6 +126,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers partcode: itm.PartCode, pobillnum:string.Empty ); + _detailEntity.IndexNum = itm.IndexNum; _detailEntity.RealPartCode = itm.RealPartCode; _entityList.Add(_detailEntity); } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Temp/TempClass.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Temp/TempClass.cs index 078896e3..07b60472 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Temp/TempClass.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Temp/TempClass.cs @@ -138,6 +138,14 @@ public class TEMP_CAN_SA_DETAIL + /// + /// 行號 + /// + public int LineCode { get; set; } + + + + } public class TEMP_NOT_SA_DETAIL : SA_NOT_BASE