diff --git a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj index 47366b8f..c09813b6 100644 --- a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj +++ b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj @@ -54,7 +54,6 @@ - diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs index 823cb6d8..82305adc 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs @@ -150,7 +150,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS itm.TaskId, itm.Remark, itm.Qty, - tm1 == null ? 0 : tm1.Qty + tm1 == null ? 0 : tm1.Qty, + itm.IsSparePart ); @@ -221,6 +222,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS string.Empty, p.Qty, p.StockQty + ,p.IsSparePart )); _lst.AddRange(_lsAry.ToArray()); } @@ -403,6 +405,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS , string.Empty , itm.Qty , 0 + ,itm.IsSparePart ); _lsCopy.Add(_detail); } 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 7b4fb824..b32b5d09 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs @@ -711,7 +711,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public WmsHQCarOutPutDetial() { } - public WmsHQCarOutPutDetial(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) + public WmsHQCarOutPutDetial(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,string issparepart) { Id = id; WmsBillNum = wmsBillNum; @@ -731,11 +733,15 @@ namespace Win.Sfs.SettleAccount.Entities.WMS Remark = remark; Qty = qty; StockQty = stockQty; + IsSparePart = issparepart; } public void SetId(Guid id) { Id = id; } + + [ImporterHeader(Name = "是否备件")] + public string IsSparePart { set; get; } //交货单号 [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQCarSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQCarSettledDetailDapperRepository.cs index c9256a02..d0a9653d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQCarSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQCarSettledDetailDapperRepository.cs @@ -142,6 +142,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report [ExporterHeader(DisplayName = "寄销库数量")] public decimal 寄销库数量 { set; get; } + [ExporterHeader(DisplayName = "是否备件")] + public string 是否备件 { set; get; } + } public class HQCarSettleQtyDiff