From 3434e6676cbd40818b3628a844b36587a05d7c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Mon, 11 Sep 2023 15:22:06 +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/INVOICE_SERVICE.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) 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 5f8e2709..0a83ba5e 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 @@ -454,19 +454,16 @@ namespace Win.Sfs.SettleAccount.Entities.BQ ls.Add(invnot); } var entity= nolist.FirstOrDefault(); - var disList = lsC.Select(p => p.SettleGroupNum).Distinct().ToList(); + var disList = mgroup.Select(p => p.SettleGroupNum).Distinct().ToList(); - for (int i = 0; i < disList.Count; i++) - { - ls[i].SettleGroupNum = disList[i]; - } + for (int i = 0; i < lineC; i++) { ls[i].RealInvBillNum = entity.RealInvBillNum; ls[i].InvDate = entity.InvDate; ls[i].InvBillNum = entity.InvBillNum; ls[i].InvGroupNum = entity.InvGroupNum; - ls[i].SettleGroupNum = entity.SettleGroupNum; + // ls[i].SettleGroupNum = entity.SettleGroupNum; ls[i].SettleLU = lsC[i].LU; ls[i].SettleQty = lsC[i].Qty == null ? string.Empty : lsC[i].Qty.ToString(); } @@ -476,11 +473,17 @@ namespace Win.Sfs.SettleAccount.Entities.BQ ls[i].InvDate = entity.InvDate; ls[i].InvBillNum = entity.InvBillNum; ls[i].InvGroupNum = entity.InvGroupNum; - ls[i].SettleGroupNum = entity.SettleGroupNum; + // ls[i].SettleGroupNum = entity.SettleGroupNum; ls[i].NotSettleLU = lsN[i].LU; ls[i].Qty = lsN[i].Qty == null ? string.Empty : lsN[i].Qty.ToString(); } + for (int i = 0; i < disList.Count; i++) + { + ls[i].SettleGroupNum = disList[i]; + } + + //if (lineC > lineN)//可结大于不可结行数时