From 6ddef7614eb75a46c3691162d21f62613023e5c9 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Tue, 8 Feb 2022 17:01:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=B5=8B=E8=AF=95=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=B5=8B=E8=AF=95=E7=9A=84=E5=87=A0=E4=B8=AAbug=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E4=BB=B6=E5=92=8C=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/WMS/WMSSharePartAppService.cs | 8 ++++---- .../src/SettleAccount.Domain/Entities/WMS/TaskList.cs | 5 ++++- .../Report/SettleKBWithCodeDapperReportRepository.cs | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs index 67c2cde0..82bdc4fe 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -224,8 +224,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var _lsAry = _list.Select(p => new WmsSharePartOutPutDetial( GuidGenerator.Create(), - p.WmsBillNum, - p.OrderBillNum, + string.Empty, + string.Empty, p.MaterialCode, p.MaterialDesc, p.MaterialGroup, @@ -274,8 +274,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts _wmslst= _wmslst.Select(p => new WmsSharePartOutPutDetial( GuidGenerator.Create(), - p.WmsBillNum, - p.OrderBillNum, + string.Empty, + string.Empty, p.MaterialCode, p.MaterialDesc, p.MaterialGroup, diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs index 6ebb501e..28e932c9 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs @@ -1434,7 +1434,10 @@ namespace Win.Sfs.SettleAccount.Entities.WMS { } - public WmsSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, decimal outputQty, decimal price, decimal amt) + public WmsSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, + string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, + string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, + decimal outputQty, decimal price, decimal amt) { Id = id; WmsBillNum = wmsBillNum; diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs index 2c9c855d..c97e682a 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs @@ -98,8 +98,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " a.Qty,--用于计算\n" + " ( a.Qty- c.WMSDeliveryQty ) AS SettleWMSDiffQty,--结算与发货差异\n" + " 0 AS SettleInvoiceDiffQty,--结算与发货差异\n" + - " a.Qty AS InvoiceDiffQty,--开票数量，默认0，后续拿算法动态算\n" + - " d.InvoicePrice --开票单价\n" + + " ISNULL(a.Qty, 0 ) AS InvoiceDiffQty,--开票数量，默认0，后续拿算法动态算\n" + + " ISNULL(d.InvoicePrice, 0 ) InvoicePrice --开票单价\n" + " \n" + " FROM\n" + " Set_KanBanSettle AS a\n" +