diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs index 40b91e6a..fd58c5ee 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs @@ -237,14 +237,14 @@ namespace Win.Sfs.SettleAccount.Entities.WMS 0, !string.IsNullOrEmpty(p.Extend1) ? p.Extend1 : string.Empty, string.Empty, - p.Version, + p.Version, p.MaterialCode, _billNum, GuidGenerator.Create(), string.Empty, p.Qty, - p.StockQty, - p.Qty + p.StockQty, + p.Qty )); _lst.AddRange(_list.ToArray()); } 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 e157688a..f43361bd 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs @@ -1459,7 +1459,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ImporterHeader(Name = "开票数量")] public decimal Qty { set; get; } - [ImporterHeader(Name = "数量", IsIgnore = true)] + [ImporterHeader(Name = "单据", IsIgnore = true)] public string BillNum { set; get; } @@ -1495,6 +1495,146 @@ namespace Win.Sfs.SettleAccount.Entities.WMS } + + //public class WmsSharePart90OutPutDetial : FullAuditedAggregateRootBase + //{ + // public WmsSharePart90OutPutDetial() + // { + // } + + // public WmsSharePart90OutPutDetial(Guid id, DateTime spareDate, string orderGoodsData, string wmsBillNum, string orderBillNum, + // string materialCode, string materialDesc, string purchaseOrderNoText, string extend1, string extend2, string extend3, + // decimal billNum, decimal qty, decimal diffQty, decimal invoicePrice, decimal amountNoTax, decimal price, decimal diffPrice, decimal diffAmountNoTax,string billNO, + // Guid taskId, string remark, decimal stockQty, decimal outputQty, string outPut, string inPut, + // int state) + // { + // Id = id; + // SpareDate = spareDate; + // OrderGoodsData = orderGoodsData; + // WmsBillNum = wmsBillNum; + // OrderBillNum = orderBillNum; + // MaterialCode = materialCode; + // MaterialDesc = materialDesc; + // PurchaseOrderNoText = purchaseOrderNoText; + // Extend1 = extend1; + // Extend2 = extend2; + // Version = extend3; + // BillNum = billNum; + // Qty = qty; + // DiffQty = diffQty; + // InvoicePrice = invoicePrice; + // AmountNoTax = amountNoTax; + // Price = price; + // DiffPrice = diffPrice; + // DiffAmountNoTax = diffAmountNoTax; + // BillNO = billNO; + // TaskId = taskId; + // Remark = remark; + + // StockQty = stockQty; + // OutPutQty = outputQty; + // OutPut = outPut; + // InPut = inPut; + // State = state; + // } + + + // public void SetId(Guid id) + // { + // Id = id; + // } + + // // 期间 交货单号 发货日期 采购订单号 SAP编码 物料代码 物料描述 物料组 开票单价 数量差异 发货数量 开票数量 定价 单价差异 + + + // [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] + // public decimal StockQty { set; get; } + + // [ImporterHeader(Name = "出库数量", IsIgnore = true)] + // public decimal OutPutQty { set; get; } + + // [ImporterHeader(Name = "交货日期", Format ="yyyy-MM-dd")] + // public DateTime SpareDate { get; set; } + + // [ImporterHeader(Name = "交货单号")] + // public string WmsBillNum { set; get; } + + // [ImporterHeader(Name = "订单日期")] + // public string OrderGoodsData { set; get; } + + // [ImporterHeader(Name = "采购订单号")] + // //KENN号 + // public string OrderBillNum { set; get; } + // [ImporterHeader(Name = "SAP编码")] + // public string MaterialCode { set; get; } + // [ImporterHeader(Name = "物料代码")] + // public string Extend1 { set; get; } + + // [ImporterHeader(Name = "物料描述")] + // public string MaterialDesc { set; get; } + + // [ImporterHeader(Name = "采购订单文本")] + // public string PurchaseOrderNoText { get; set; } + + // [ImporterHeader(Name = "发货数量", IsIgnore = true)] + // public decimal BillNum { set; get; } + + // [ImporterHeader(Name = "开票数量")] + // public decimal Qty { set; get; } + + // [ImporterHeader(Name = "发货与开票差异")] + // public decimal DiffQty { set; get; } + + // [ImporterHeader(Name = "开票单价")] + // public decimal InvoicePrice { get; set; } + + // [ImporterHeader(Name = "开票金额")] + // public decimal AmountNoTax { get; set; } + + // [ImporterHeader(Name = "定价")] + // public decimal Price { get; set; } + + // [ImporterHeader(Name = "单价差异")] + // public decimal DiffPrice { get; set; } + + // [ImporterHeader(Name = "差异总金额")] + // public decimal DiffAmountNoTax { get; set; } + + // [ImporterHeader(Name = "单据", IsIgnore = true)] + // public string BillNO { set; get; } + + + // [ImporterHeader(Name = "出库库位", IsIgnore = true)] + // //出库库位 + // public string OutPut { set; get; } + // [ImporterHeader(Name = "入库库位", IsIgnore = true)] + // //入库库位 + // public string InPut { set; get; } + // [ImporterHeader(Name = "状态", IsIgnore = true)] + // public int State { get; set; } + + // /// + // /// 扩展字段2 + // /// + // [ImporterHeader(Name = "扩展字段2", IsIgnore = true)] + // public string Extend2 { set; get; } + // /// + // /// 扩展字段3 + // /// + // [ImporterHeader(Name = "版本号", IsIgnore = true)] + // public string Version { set; get; } + + + + + + // [ImporterHeader(Name = "任务代码", IsIgnore = true)] + // public Guid TaskId { set; get; } + + + //} + + public class WmsSharePart90OutPutDetial : FullAuditedAggregateRootBase { public WmsSharePart90OutPutDetial() @@ -1553,7 +1693,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ImporterHeader(Name = "物料描述")] //物料描述 public string MaterialDesc { set; get; } - [ImporterHeader(Name = "物料组(车型)")] + [ImporterHeader(Name = "物料组(车型)", IsIgnore = true)] //物料组(车型) public string MaterialGroup { set; get; } [ImporterHeader(Name = "出库库位", IsIgnore = true)] @@ -1579,10 +1719,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// [ImporterHeader(Name = "版本号", IsIgnore = true)] public string Version { set; get; } + [ImporterHeader(Name = "开票数量")] public decimal Qty { set; get; } - [ImporterHeader(Name = "数量", IsIgnore = true)] + [ImporterHeader(Name = "单据", IsIgnore = true)] public string BillNum { set; get; } @@ -1602,4 +1743,5 @@ namespace Win.Sfs.SettleAccount.Entities.WMS + } diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs index df4abb47..0a0b5588 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs @@ -304,91 +304,44 @@ public class SparePartSumQtyDiff //[ExcelExporter(Name = "未结明细", AutoFitAllColumn = true, MaxRowNumberOnASheet = 500000)] public class SettleSparePartExport { - - [ExporterHeader(DisplayName = "期间 ")] - public string 期间 {set;get;} + [ExporterHeader(DisplayName = "交货日期 ")] + public string 交货日期 { set; get; } [ExporterHeader(DisplayName = "交货单号")] - public string 交货单号 {set;get;} - [ExporterHeader(DisplayName = "发货日期")] - public string 发货日期 {set;get;} + public string 交货单号 { set; get; } + + [ExporterHeader(DisplayName = "订单日期")] + public string 订单日期 { set; get; } + [ExporterHeader(DisplayName = "采购订单号")] - public string 采购订单号 {set;get;} + public string 采购订单号 { set; get; } [ExporterHeader(DisplayName = "SAP编码")] - public string SAP编码 {set;get;} + public string SAP编码 { set; get; } [ExporterHeader(DisplayName = "物料代码")] - public string 物料代码 {set;get;} + public string 物料代码 { set; get; } [ExporterHeader(DisplayName = "物料描述")] - public string 物料描述 {set;get;} - [ExporterHeader(DisplayName = "物料组")] - public string 物料组 {set;get;} - [ExporterHeader(DisplayName = "开票单价")] - public decimal 开票单价 {set;get;} - [ExporterHeader(DisplayName = "数量差异")] - public decimal 数量差异 {set;get;} + public string 物料描述 { set; get; } + + [ExporterHeader(DisplayName = "采购订单文本")] + public string 采购订单文本 { set; get; } + [ExporterHeader(DisplayName = "发货数量")] - public decimal 发货数量 {set;get;} + public decimal 发货数量 { set; get; } [ExporterHeader(DisplayName = "开票数量")] - public decimal 开票数量 {set;get;} + public decimal 开票数量 { set; get; } + [ExporterHeader(DisplayName = "发货与开票差异")] + public decimal 发货与开票差异 { set; get; } + [ExporterHeader(DisplayName = "开票单价")] + public decimal 开票单价 { set; get; } + + [ExporterHeader(DisplayName = "开票金额")] + public decimal 开票金额 { set; get; } [ExporterHeader(DisplayName = "定价")] - public decimal 定价 {set;get;} + public decimal 定价 { set; get; } [ExporterHeader(DisplayName = "单价差异")] - public decimal 单价差异 { set; get;} - - - - - - - - //[ExporterHeader(DisplayName = "行号")] - //public string LineNumber { set; get; } - - //[ExporterHeader(DisplayName = "交货日期")] - //public string WMSDeliveryDate { set; get; } - - //[ExporterHeader(DisplayName = "交货单号")] - //public string DeliveryOrderNo { set; get; } - - //[ExporterHeader(DisplayName = "订单日期")] - //public DateTime OrderDate{ set; get; } - - //[ExporterHeader(DisplayName = "采购订单号")] - //public string PurchaseOrderNo { set; get; } - - //[ExporterHeader(DisplayName = "SAP编码")] - //public string SAPCode { set; get; } - - //[ExporterHeader(DisplayName = "物料代码")] - //public string MaterialCode { set; get; } - - //[ExporterHeader(DisplayName = "物料描述")] - //public string MaterialDesc { set; get; } - - //[ExporterHeader(DisplayName = "采购订单文本")] - //public string PurchaseOrderNoText { set; get; } - - //[ExporterHeader(DisplayName = "发货数量")] - //public decimal ReceiptQty { set; get; } - - //[ExporterHeader(DisplayName = "开票数量")] - //public decimal InvoicedQty { set; get; } - - //[ExporterHeader(DisplayName = "发货与开票差异")] - //public decimal SettleInvoiceDiffQty { set; get; } - - //[ExporterHeader(DisplayName = "开票单价")] - //public decimal InvoicePrice { set; get; } - - //[ExporterHeader(DisplayName = "开票金额")] - //public decimal InvoiceMoney { set; get; } - //[ExporterHeader(DisplayName = "定价")] - //public decimal Price { set; get; } - - //[ExporterHeader(DisplayName = "单价差异")] - //public decimal InvoiceDiffPrice { set; get; } + public decimal 单价差异 { set; get; } - //[ExporterHeader(DisplayName = "总金额差异")] - //public decimal SumDiffMoney { set; get; } + [ExporterHeader(DisplayName = "差异总金额")] + public decimal 差异总金额 { set; get; } } }