From e0da25288f7ec11ea897fbe4a3d9e51cabb9f074 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Thu, 17 Feb 2022 18:21:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/WMS/WMSHQHKanbanAppService.cs | 2 +- .../Entities/WMS/WMSHQHSharePartAppService.cs | 2 +- .../Entities/WMS/WMSKanbanExtendAppService.cs | 2 +- .../Entities/WMS/WMSSharePart90AppService.cs | 37 +++ .../Entities/WMS/WMSSharePartAppService.cs | 4 +- .../Entities/WMS/WmsHQCarAppService.cs | 2 +- .../Entities/WMS/WmsHQKBOutputAppService.cs | 2 +- .../SettleAccount.Application.xml | 7 + .../Entities/WMS/TaskList.cs | 260 +++++++++++++++++- 9 files changed, 308 insertions(+), 10 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs index 33c7a068..b98d7efd 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs @@ -535,7 +535,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts IExporter _excel = new ExcelExporter(); byte[] result = null; - var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString()); + var _fileName = string.Format("红旗H平台出库单_{0}.xlsx", Guid.NewGuid().ToString()); result = await _excel.ExportAsByteArray(entities); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs index 2f2482d0..a2510079 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs @@ -568,7 +568,7 @@ into temp1 IExporter _excel = new ExcelExporter(); byte[] result = null; - var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString()); + var _fileName = string.Format("H平台备件出库单_{0}.xlsx", Guid.NewGuid().ToString()); result = await _excel.ExportAsByteArray(entities); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs index d87b5a7b..ba736562 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs @@ -442,7 +442,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS IExporter _excel = new ExcelExporter(); byte[] result = null; - var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString()); + var _fileName = string.Format("大众无条码看板出库单_{0}.xlsx", Guid.NewGuid().ToString()); result = await _excel.ExportAsByteArray(entities); 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 fe93d079..237cc2a7 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs @@ -104,6 +104,43 @@ namespace Win.Sfs.SettleAccount.Entities.WMS } return true; + } + + /// + /// 出库单导出 + /// + /// + /// + [HttpPost] + [Route("Export")] + //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + virtual public async Task ExportAsync(WmsSharePartOutPutRequestDto input) + { + input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); + var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, + 0, true); + + IExporter _excel = new ExcelExporter(); + byte[] result = null; + + var _fileName = string.Format("大众备件调整数据出库单_{0}.xlsx", Guid.NewGuid().ToString()); + result = await _excel.ExportAsByteArray(entities); + + + result.ShouldNotBeNull(); + + //保存导出文件到服务器存成二进制 + await _excelImportService.SaveBlobAsync( + new SaveExcelImportInputDto + { + Name = _fileName, + Content = result + } + ); + return _fileName; + + + } private async Task GetCountAsync(WmsSharePartOutPutRequestDto input) { 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 f3a4a7a8..8e672e40 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -219,7 +219,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts /// - /// 导出 + /// 出库单导出 /// /// /// @@ -236,7 +236,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts byte[] result = null; var _fileName = string.Format("大众备件出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _excel.ExportAsByteArray(entities); + result = await _excel.ExportAsByteArray(entities); result.ShouldNotBeNull(); 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 4a6856b0..a674317a 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs @@ -505,7 +505,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS IExporter _excel = new ExcelExporter(); byte[] result = null; - var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString()); + var _fileName = string.Format("一汽轿车平台出库单_{0}.xlsx", Guid.NewGuid().ToString()); result = await _excel.ExportAsByteArray(entities); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs index 1ee03dad..78d4c2dc 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs @@ -424,7 +424,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS IExporter _excel = new ExcelExporter(); byte[] result = null; - var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString()); + var _fileName = string.Format("红旗数据调整出库单_{0}.xlsx", Guid.NewGuid().ToString()); result = await _excel.ExportAsByteArray(entities); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml index 84a683ce..292081e2 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml @@ -2331,6 +2331,13 @@ 上传的文件(前端已经限制只能上传一个附件) + + + 导出 + + + + 选择任务，生成出库单，只包含已确认的单据 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 ba6acaff..13c7e2d6 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs @@ -430,35 +430,49 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ImporterHeader(Name = "单据类型")] + [ExporterHeader(DisplayName = "单据类型")] public string Type { set; get; } [ImporterHeader(Name = "物料号")] + [ExporterHeader(DisplayName = "物料号")] public string SapMaterialCode { set; get; } [ImporterHeader(Name = "物料描述")] + [ExporterHeader(DisplayName = "物料描述")] public string MaterialDesc { set; get; } [ImporterHeader(Name = "版本号")] + [ExporterHeader(DisplayName = "版本号")] public string Version { set; get; } [ImporterHeader(Name = "是否备件")] + [ExporterHeader(DisplayName = "是否备件")] public string IsBack { set; get; } [ImporterHeader(Name = "结算数量")] + [ExporterHeader(DisplayName = "结算数量")] public decimal Qty { set; get; } [ImporterHeader(Name = "寄售库存数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "寄售库存数量", IsIgnore = true)] public decimal SockQty { set; get; } [ImporterHeader(Name = "真实数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "真实数量", IsIgnore = true)] public decimal RealityNumber { set; get; } [ImporterHeader(Name = "出库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] public decimal OutputQty { set; get; } [ImporterHeader(Name = "Extend", IsIgnore = true)] + [ExporterHeader(DisplayName = "Extend", IsIgnore = true)] public string Extend { set; get; } [ImporterHeader(Name = "BillNum", IsIgnore = true)] + [ExporterHeader(DisplayName = "BillNum", IsIgnore = true)] public string BillNum { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] + [ExporterHeader(DisplayName = "状态", IsIgnore = true)] public int State { set; get; } [ImporterHeader(Name = "开票单价")] + [ExporterHeader(DisplayName = "开票单价")] public decimal Price { set; get; } [ImporterHeader(Name = "开票金额")] + [ExporterHeader(DisplayName = "开票金额")] public decimal Amt { set; get; } } @@ -522,35 +536,49 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ImporterHeader(Name = "单据类型", IsIgnore = true)] + [ExporterHeader(DisplayName = "单据类型", IsIgnore = true)] public string Type { set; get; } [ImporterHeader(Name = "物料号")] + [ExporterHeader(DisplayName = "物料号")] public string SapMaterialCode { set; get; } [ImporterHeader(Name = "物料描述")] + [ExporterHeader(DisplayName = "物料描述")] public string MaterialDesc { set; get; } [ImporterHeader(Name = "版本号")] + [ExporterHeader(DisplayName = "版本号")] public string Version { set; get; } [ImporterHeader(Name = "是否备件", IsIgnore = true)] + [ExporterHeader(DisplayName = "是否备件", IsIgnore = true)] public string IsBack { set; get; } [ImporterHeader(Name = "结算数量")] + [ExporterHeader(DisplayName = "结算数量")] public decimal Qty { set; get; } [ImporterHeader(Name = "寄售库存数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "寄售库存数量", IsIgnore = true)] public decimal SockQty { set; get; } [ImporterHeader(Name = "真实数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "真实数量", IsIgnore = true)] public decimal RealityNumber { set; get; } [ImporterHeader(Name = "出库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] public decimal OutputQty { set; get; } [ImporterHeader(Name = "Extend", IsIgnore = true)] + [ExporterHeader(DisplayName = "Extend", IsIgnore = true)] public string Extend { set; get; } [ImporterHeader(Name = "BillNum", IsIgnore = true)] + [ExporterHeader(DisplayName = "BillNum", IsIgnore = true)] public string BillNum { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] + [ExporterHeader(DisplayName = "状态", IsIgnore = true)] public int State { set; get; } [ImporterHeader(Name = "开票单价")] + [ExporterHeader(DisplayName = "开票单价")] public decimal Price { set; get; } [ImporterHeader(Name = "开票金额")] + [ExporterHeader(DisplayName = "开票金额")] public decimal Amt { set; get; } } @@ -606,37 +634,48 @@ namespace Win.Sfs.SettleAccount.Entities.WMS } // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 [ImporterHeader(Name = "行号")] + [ExporterHeader(DisplayName = "行号")] public string PoLine { set; get; } [ImporterHeader(Name = "订货看板编号")] + [ExporterHeader(DisplayName = "订货看板编号")] //KENN号 public string Kanban { set; get; } [ImporterHeader(Name = "组件组物料", IsIgnore = true)] + [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号")] + [ExporterHeader(DisplayName = "交货单号")] public string WmsBillNum { set; get; } //[ImporterHeader(Name = "订货看板编号")] ////KENN号 //public string OrderBillNum { set; get; } [ImporterHeader(Name = "Sap编码")] + [ExporterHeader(DisplayName = "Sap编码")] //物料号 public string MaterialCode { set; get; } [ImporterHeader(Name = "零件中文名称")] + [ExporterHeader(DisplayName = "零件中文名称")] //物料描述 public string MaterialDesc { set; get; } [ImporterHeader(Name = "物料组(车型)")] + [ExporterHeader(DisplayName = "物料组(车型)")] //物料组(车型) public string MaterialGroup { set; get; } [ImporterHeader(Name = "出库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] //出库库位 public string OutPut { set; get; } [ImporterHeader(Name = "入库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] //入库库位 public string InPut { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] + [ExporterHeader(DisplayName = "状态", IsIgnore = true)] public int State { get; set; } [ImporterHeader(Name = "发货零件号")] + [ExporterHeader(DisplayName = "发货零件号")] /// /// 扩展字段1 /// @@ -645,17 +684,22 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// 扩展字段2 /// [ImporterHeader(Name = "收货仓库")] + [ExporterHeader(DisplayName = "收货仓库")] public string Extend2 { set; get; } /// /// 扩展字段3 /// [ImporterHeader(Name = "版本号", IsIgnore = true)] + [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] public string Version { set; get; } [ImporterHeader(Name = "结算数量")] + [ExporterHeader(DisplayName = "结算数量")] public decimal Qty { set; get; } [ImporterHeader(Name = "数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "数量", IsIgnore = true)] public string BillNum { set; get; } [ImporterHeader(Name = "任务描述", IsIgnore = true)] + [ExporterHeader(DisplayName = "任务描述", IsIgnore = true)] public Guid TaskId { set; get; } } @@ -740,33 +784,44 @@ namespace Win.Sfs.SettleAccount.Entities.WMS //交货单号 [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] public decimal StockQty { set; get; } [ImporterHeader(Name = "组件组物料", IsIgnore = true)] + [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号", IsIgnore = true)] + [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)] public string WmsBillNum { set; get; } [ImporterHeader(Name = "看板号", IsIgnore = true)] + [ExporterHeader(DisplayName = "看板号", IsIgnore = true)] //KENN号 public string OrderBillNum { set; get; } [ImporterHeader(Name = "Sap编码")] + [ExporterHeader(DisplayName = "Sap编码")] //物料号 public string MaterialCode { set; get; } [ImporterHeader(Name = "结算物料描述")] + [ExporterHeader(DisplayName = "结算物料描述")] //物料描述 public string MaterialDesc { set; get; } [ImporterHeader(Name = "物料组(车型)")] + [ExporterHeader(DisplayName = "物料组(车型)")] //物料组(车型) public string MaterialGroup { set; get; } [ImporterHeader(Name = "出库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] //出库库位 public string OutPut { set; get; } [ImporterHeader(Name = "入库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] //入库库位 public string InPut { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] + [ExporterHeader(DisplayName = "状态", IsIgnore = true)] public int State { get; set; } [ImporterHeader(Name = "结算物料号")] + [ExporterHeader(DisplayName = "结算物料号")] /// /// 扩展字段1 /// @@ -775,19 +830,25 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// 扩展字段2 /// [ImporterHeader(Name = "收货仓库")] + [ExporterHeader(DisplayName = "收货仓库")] public string Extend2 { set; get; } /// /// 扩展字段3 /// [ImporterHeader(Name = "版本号", IsIgnore = true)] + [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] public string Version { set; get; } [ImporterHeader(Name = "结算数量")] + [ExporterHeader(DisplayName = "结算数量")] public decimal Qty { set; get; } [ImporterHeader(Name = "单据号", IsIgnore = true)] + [ExporterHeader(DisplayName = "单据号", IsIgnore = true)] public string BillNum { set; get; } [ImporterHeader(Name = "任务ID", IsIgnore = true)] + [ExporterHeader(DisplayName = "任务ID", IsIgnore = true)] public Guid TaskId { set; get; } [ImporterHeader(Name = "出库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] public decimal OutPutQty { set; get; } } @@ -858,40 +919,53 @@ namespace Win.Sfs.SettleAccount.Entities.WMS } [ImporterHeader(Name = "是否备件", IsIgnore = true)] + [ExporterHeader(DisplayName = "是否备件", IsIgnore = true)] public string IsSparePart { set; get; } //交货单号 [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] public decimal StockQty { set; get; } [ImporterHeader(Name = "出库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] public decimal OutPutQty { set; get; } [ImporterHeader(Name = "组件组物料", IsIgnore = true)] + [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号", IsIgnore = true)] + [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)] public string WmsBillNum { set; get; } [ImporterHeader(Name = "看板号", IsIgnore = true)] + [ExporterHeader(DisplayName = "看板号", IsIgnore = true)] //KENN号 public string OrderBillNum { set; get; } [ImporterHeader(Name = "SAP编码")] + [ExporterHeader(DisplayName = "SAP编码")] //物料号 public string MaterialCode { set; get; } [ImporterHeader(Name = "物料描述")] + [ExporterHeader(DisplayName = "物料描述")] //物料描述 public string MaterialDesc { set; get; } [ImporterHeader(Name = "物料组")] + [ExporterHeader(DisplayName = "物料组")] //物料组(车型) public string MaterialGroup { set; get; } [ImporterHeader(Name = "出库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] //出库库位 public string OutPut { set; get; } [ImporterHeader(Name = "入库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] //入库库位 public string InPut { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] + [ExporterHeader(DisplayName = "状态", IsIgnore = true)] public int State { get; set; } [ImporterHeader(Name = "结算物料号")] + [ExporterHeader(DisplayName = "结算物料号")] /// /// 扩展字段1 /// @@ -900,26 +974,33 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// 扩展字段2 /// [ImporterHeader(Name = "收货仓库")] + [ExporterHeader(DisplayName = "收货仓库")] public string Extend2 { set; get; } /// /// 扩展字段3 /// [ImporterHeader(Name = "版本号", IsIgnore = true)] + [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] public string Version { set; get; } [ImporterHeader(Name = "结算数量")] + [ExporterHeader(DisplayName = "结算数量")] public decimal Qty { set; get; } [ImporterHeader(Name = "结算单价")] + [ExporterHeader(DisplayName = "结算单价")] public decimal Price { set; get; } [ImporterHeader(Name = "结算金额")] + [ExporterHeader(DisplayName = "结算金额")] public decimal Amt { set; get; } [ImporterHeader(Name = "单据号", IsIgnore = true)] + [ExporterHeader(DisplayName = "单据号", IsIgnore = true)] public string BillNum { set; get; } [ImporterHeader(Name = "任务ID", IsIgnore = true)] + [ExporterHeader(DisplayName = "任务ID", IsIgnore = true)] public Guid TaskId { set; get; } } #endregion @@ -989,37 +1070,48 @@ namespace Win.Sfs.SettleAccount.Entities.WMS } // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 [ImporterHeader(Name = "行号")] + [ExporterHeader(DisplayName = "行号")] public string PoLine { set; get; } [ImporterHeader(Name = "订货看板编号")] + [ExporterHeader(DisplayName = "订货看板编号")] //KENN号 public string Kanban { set; get; } [ImporterHeader(Name = "组件组物料", IsIgnore = true)] + [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号")] + [ExporterHeader(DisplayName = "交货单号")] public string WmsBillNum { set; get; } //[ImporterHeader(Name = "订货看板编号")] ////KENN号 //public string OrderBillNum { set; get; } [ImporterHeader(Name = "Sap编码")] + [ExporterHeader(DisplayName = "Sap编码")] //物料号 public string MaterialCode { set; get; } [ImporterHeader(Name = "零件中文名称")] + [ExporterHeader(DisplayName = "零件中文名称")] //物料描述 public string MaterialDesc { set; get; } [ImporterHeader(Name = "物料组(车型)")] + [ExporterHeader(DisplayName = "物料组(车型)")] //物料组(车型) public string MaterialGroup { set; get; } [ImporterHeader(Name = "出库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] //出库库位 public string OutPut { set; get; } [ImporterHeader(Name = "入库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] //入库库位 public string InPut { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] + [ExporterHeader(DisplayName = "状态", IsIgnore = true)] public int State { get; set; } [ImporterHeader(Name = "发货零件号")] + [ExporterHeader(DisplayName = "发货零件号")] /// /// 扩展字段1 /// @@ -1028,17 +1120,22 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// 扩展字段2 /// [ImporterHeader(Name = "收货仓库")] + [ExporterHeader(DisplayName = "收货仓库")] public string Extend2 { set; get; } /// /// 扩展字段3 /// [ImporterHeader(Name = "版本号", IsIgnore = true)] + [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] public string Version { set; get; } [ImporterHeader(Name = "结算数量")] + [ExporterHeader(DisplayName = "结算数量")] public decimal Qty { set; get; } [ImporterHeader(Name = "数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "数量", IsIgnore = true)] public string BillNum { set; get; } [ImporterHeader(Name = "任务描述", IsIgnore = true)] + [ExporterHeader(DisplayName = "任务描述", IsIgnore = true)] public Guid TaskId { set; get; } @@ -1120,33 +1217,44 @@ namespace Win.Sfs.SettleAccount.Entities.WMS //交货单号 [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] public decimal StockQty { set; get; } [ImporterHeader(Name = "组件组物料", IsIgnore = true)] + [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号", IsIgnore = true)] + [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)] public string WmsBillNum { set; get; } [ImporterHeader(Name = "看板号", IsIgnore = true)] + [ExporterHeader(DisplayName = "看板号", IsIgnore = true)] //KENN号 public string OrderBillNum { set; get; } [ImporterHeader(Name = "Sap编码")] + [ExporterHeader(DisplayName = "Sap编码")] //物料号 public string MaterialCode { set; get; } [ImporterHeader(Name = "结算物料描述")] + [ExporterHeader(DisplayName = "结算物料描述")] //物料描述 public string MaterialDesc { set; get; } [ImporterHeader(Name = "物料组(车型)")] + [ExporterHeader(DisplayName = "物料组(车型)")] //物料组(车型) public string MaterialGroup { set; get; } [ImporterHeader(Name = "出库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] //出库库位 public string OutPut { set; get; } [ImporterHeader(Name = "入库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] //入库库位 public string InPut { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] + [ExporterHeader(DisplayName = "状态", IsIgnore = true)] public int State { get; set; } [ImporterHeader(Name = "结算物料号")] + [ExporterHeader(DisplayName = "结算物料号")] /// /// 扩展字段1 /// @@ -1155,20 +1263,26 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// 扩展字段2 /// [ImporterHeader(Name = "收货仓库")] + [ExporterHeader(DisplayName = "收货仓库")] public string Extend2 { set; get; } /// /// 扩展字段3 /// [ImporterHeader(Name = "版本号", IsIgnore = true)] + [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] public string Version { set; get; } [ImporterHeader(Name = "结算数量")] + [ExporterHeader(DisplayName = "结算数量")] public decimal Qty { set; get; } [ImporterHeader(Name = "单据号", IsIgnore = true)] + [ExporterHeader(DisplayName = "单据号", IsIgnore = true)] public string BillNum { set; get; } [ImporterHeader(Name = "任务ID", IsIgnore = true)] + [ExporterHeader(DisplayName = "任务ID", IsIgnore = true)] public Guid TaskId { set; get; } [ImporterHeader(Name = "出库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] public decimal OutPutQty { set; get; } } @@ -1195,7 +1309,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// - /// 看板明细 + /// H平台出库单 /// public class WmsHQHKanbanOutPutDetial : FullAuditedAggregateRootBase { @@ -1239,37 +1353,48 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ImporterHeader(Name = "行号")] + [ExporterHeader(DisplayName = "行号")] public string PoLine { set; get; } [ImporterHeader(Name = "订货看板编号")] + [ExporterHeader(DisplayName = "订货看板编号")] //KENN号 public string Kanban { set; get; } [ImporterHeader(Name = "组件组物料", IsIgnore = true)] + [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号")] + [ExporterHeader(DisplayName = "交货单号")] public string WmsBillNum { set; get; } //[ImporterHeader(Name = "订货看板编号")] ////KENN号 //public string OrderBillNum { set; get; } [ImporterHeader(Name = "Sap编码")] + [ExporterHeader(DisplayName = "Sap编码")] //物料号 public string MaterialCode { set; get; } [ImporterHeader(Name = "零件中文名称")] + [ExporterHeader(DisplayName = "零件中文名称")] //物料描述 public string MaterialDesc { set; get; } [ImporterHeader(Name = "物料组(车型)")] + [ExporterHeader(DisplayName = "物料组(车型)")] //物料组(车型) public string MaterialGroup { set; get; } [ImporterHeader(Name = "出库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] //出库库位 public string OutPut { set; get; } [ImporterHeader(Name = "入库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] //入库库位 public string InPut { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] + [ExporterHeader(DisplayName = "状态", IsIgnore = true)] public int State { get; set; } [ImporterHeader(Name = "发货零件号")] + [ExporterHeader(DisplayName = "发货零件号")] /// /// 扩展字段1 /// @@ -1278,21 +1403,28 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// 扩展字段2 /// [ImporterHeader(Name = "收货仓库")] + [ExporterHeader(DisplayName = "收货仓库")] public string Extend2 { set; get; } /// /// 扩展字段3 /// [ImporterHeader(Name = "版本号", IsIgnore = true)] + [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] public string Version { set; get; } [ImporterHeader(Name = "结算数量")] + [ExporterHeader(DisplayName = "结算数量")] public decimal Qty { set; get; } [ImporterHeader(Name = "结算单价")] + [ExporterHeader(DisplayName = "结算单价")] public decimal Price { set; get; } [ImporterHeader(Name = "结算金额")] + [ExporterHeader(DisplayName = "结算金额")] public decimal Amt { set; get; } [ImporterHeader(Name = "数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "数量", IsIgnore = true)] public string BillNum { set; get; } [ImporterHeader(Name = "任务描述", IsIgnore = true)] + [ExporterHeader(DisplayName = "任务描述", IsIgnore = true)] public Guid TaskId { set; get; } @@ -1367,33 +1499,44 @@ namespace Win.Sfs.SettleAccount.Entities.WMS //交货单号 [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] public decimal StockQty { set; get; } [ImporterHeader(Name = "组件组物料", IsIgnore = true)] + [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号", IsIgnore = true)] + [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)] public string WmsBillNum { set; get; } [ImporterHeader(Name = "看板号", IsIgnore = true)] + [ExporterHeader(DisplayName = "看板号", IsIgnore = true)] //KENN号 public string OrderBillNum { set; get; } [ImporterHeader(Name = "Sap编码")] + [ExporterHeader(DisplayName = "Sap编码")] //物料号 public string MaterialCode { set; get; } [ImporterHeader(Name = "结算物料描述")] + [ExporterHeader(DisplayName = "结算物料描述")] //物料描述 public string MaterialDesc { set; get; } [ImporterHeader(Name = "物料组(车型)")] + [ExporterHeader(DisplayName = "物料组(车型)")] //物料组(车型) public string MaterialGroup { set; get; } [ImporterHeader(Name = "出库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] //出库库位 public string OutPut { set; get; } [ImporterHeader(Name = "入库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] //入库库位 public string InPut { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] + [ExporterHeader(DisplayName = "状态", IsIgnore = true)] public int State { get; set; } [ImporterHeader(Name = "结算物料号")] + [ExporterHeader(DisplayName = "结算物料号")] /// /// 扩展字段1 /// @@ -1402,19 +1545,25 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// 扩展字段2 /// [ImporterHeader(Name = "收货仓库")] + [ExporterHeader(DisplayName = "收货仓库")] public string Extend2 { set; get; } /// /// 扩展字段3 /// [ImporterHeader(Name = "版本号", IsIgnore = true)] + [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] public string Version { set; get; } [ImporterHeader(Name = "结算数量")] + [ExporterHeader(DisplayName = "结算数量")] public decimal Qty { set; get; } [ImporterHeader(Name = "单据号", IsIgnore = true)] + [ExporterHeader(DisplayName = "单据号", IsIgnore = true)] public string BillNum { set; get; } [ImporterHeader(Name = "任务ID", IsIgnore = true)] + [ExporterHeader(DisplayName = "任务ID", IsIgnore = true)] public Guid TaskId { set; get; } [ImporterHeader(Name = "出库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] public decimal OutPutQty { set; get; } } @@ -1552,7 +1701,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// /// 备件出库明细 /// - [ExcelImporter(SheetName = "大众备件数据输出")] + //[ExcelImporter(SheetName = "大众备件数据输出")] public class WmsSharePartOutPutDetial : FullAuditedAggregateRootBase { public WmsSharePartOutPutDetial() @@ -1598,31 +1747,41 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ImporterHeader(Name = "组件组物料",IsIgnore =true)] + [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号")] + [ExporterHeader(DisplayName = "交货单号")] public string WmsBillNum { set; get; } [ImporterHeader(Name = "采购订单号")] + [ExporterHeader(DisplayName = "采购订单号")] //KENN号 public string OrderBillNum { set; get; } [ImporterHeader(Name = "SAP编码")] + [ExporterHeader(DisplayName = "SAP编码")] //物料号 public string MaterialCode { set; get; } [ImporterHeader(Name = "物料描述")] + [ExporterHeader(DisplayName = "物料描述")] //物料描述 public string MaterialDesc { set; get; } [ImporterHeader(Name = "物料组(车型)")] + [ExporterHeader(DisplayName = "物料组(车型)")] //物料组(车型) public string MaterialGroup { set; get; } [ImporterHeader(Name = "出库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] //出库库位 public string OutPut { set; get; } [ImporterHeader(Name = "入库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] //入库库位 public string InPut { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] + [ExporterHeader(DisplayName = "状态", IsIgnore = true)] public int State { get; set; } [ImporterHeader(Name = "物料代码")] + [ExporterHeader(DisplayName = "物料代码")] /// /// 扩展字段1 /// @@ -1631,31 +1790,108 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// 扩展字段2 /// [ImporterHeader(Name = "扩展字段2", IsIgnore = true)] + [ExporterHeader(DisplayName = "扩展字段2", IsIgnore = true)] public string Extend2 { set; get; } /// /// 扩展字段3 /// [ImporterHeader(Name = "版本号", IsIgnore = true)] + [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] public string Version { set; get; } [ImporterHeader(Name = "开票数量")] + [ExporterHeader(DisplayName = "开票数量")] public decimal Qty { set; get; } [ImporterHeader(Name = "单据", IsIgnore = true)] + [ExporterHeader(DisplayName = "单据", IsIgnore = true)] public string BillNum { set; get; } [ImporterHeader(Name = "任务代码", IsIgnore = true)] + [ExporterHeader(DisplayName = "任务代码", IsIgnore = true)] public Guid TaskId { set; get; } [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] public decimal StockQty { set; get; } [ImporterHeader(Name = "出库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] public decimal OutPutQty { set; get; } [ImporterHeader(Name = "开票单价")] + [ExporterHeader(DisplayName = "开票单价")] public decimal Price { set; get; } [ImporterHeader(Name = "开票金额")] + [ExporterHeader(DisplayName = "开票金额")] + public decimal Amt { set; get; } + + + } + + + public class ExportWmsSharePartOutPutDetial + { + + [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] + public string ParentMaterialCode { set; get; } + [ExporterHeader(DisplayName = "交货单号")] + public string WmsBillNum { set; get; } + [ExporterHeader(DisplayName = "采购订单号")] + //KENN号 + public string OrderBillNum { set; get; } + + [ExporterHeader(DisplayName = "SAP编码")] + //物料号 + public string MaterialCode { set; get; } + [ExporterHeader(DisplayName = "物料描述")] + //物料描述 + public string MaterialDesc { set; get; } + [ExporterHeader(DisplayName = "物料组(车型)")] + //物料组(车型) + public string MaterialGroup { set; get; } + [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] + //出库库位 + public string OutPut { set; get; } + [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] + //入库库位 + public string InPut { set; get; } + [ExporterHeader(DisplayName = "状态", IsIgnore = true)] + public int State { get; set; } + [ExporterHeader(DisplayName = "物料代码")] + /// + /// 扩展字段1 + /// + public string Extend1 { set; get; } + /// + /// 扩展字段2 + /// + [ExporterHeader(DisplayName = "扩展字段2", IsIgnore = true)] + public string Extend2 { set; get; } + /// + /// 扩展字段3 + /// + [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] + public string Version { set; get; } + [ExporterHeader(DisplayName = "开票数量")] + public decimal Qty { set; get; } + + [ExporterHeader(DisplayName = "单据", IsIgnore = true)] + public string BillNum { set; get; } + + + [ExporterHeader(DisplayName = "任务代码", IsIgnore = true)] + public Guid TaskId { set; get; } + + [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] + public decimal StockQty { set; get; } + + [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] + public decimal OutPutQty { set; get; } + [ExporterHeader(DisplayName = "开票单价")] + + public decimal Price { set; get; } + [ExporterHeader(DisplayName = "开票金额")] public decimal Amt { set; get; } @@ -1870,37 +2106,49 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)] public decimal StockQty { set; get; } [ImporterHeader(Name = "出库数量", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] public decimal OutPutQty { set; get; } [ImporterHeader(Name = "组件组物料", IsIgnore = true)] + [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号")] + [ExporterHeader(DisplayName = "交货单号")] public string WmsBillNum { set; get; } [ImporterHeader(Name = "采购订单号")] + [ExporterHeader(DisplayName = "采购订单号")] //KENN号 public string OrderBillNum { set; get; } [ImporterHeader(Name = "SAP编码")] + [ExporterHeader(DisplayName = "SAP编码")] //物料号 public string MaterialCode { set; get; } [ImporterHeader(Name = "物料描述")] + [ExporterHeader(DisplayName = "物料描述")] //物料描述 public string MaterialDesc { set; get; } [ImporterHeader(Name = "物料组(车型)", IsIgnore = true)] + [ExporterHeader(DisplayName = "物料组(车型)", IsIgnore = true)] //物料组(车型) public string MaterialGroup { set; get; } [ImporterHeader(Name = "出库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)] //出库库位 public string OutPut { set; get; } [ImporterHeader(Name = "入库库位", IsIgnore = true)] + [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)] //入库库位 public string InPut { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] + [ExporterHeader(DisplayName = "状态", IsIgnore = true)] public int State { get; set; } [ImporterHeader(Name = "物料代码")] + [ExporterHeader(DisplayName = "物料代码")] /// /// 扩展字段1 /// @@ -1909,26 +2157,32 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// 扩展字段2 /// [ImporterHeader(Name = "扩展字段2", IsIgnore = true)] + [ExporterHeader(DisplayName = "扩展字段2", IsIgnore = true)] public string Extend2 { set; get; } /// /// 扩展字段3 /// [ImporterHeader(Name = "版本号", IsIgnore = true)] + [ExporterHeader(DisplayName = "版本号", IsIgnore = true)] public string Version { set; get; } [ImporterHeader(Name = "开票数量")] + [ExporterHeader(DisplayName = "开票数量")] public decimal Qty { set; get; } [ImporterHeader(Name = "单据", IsIgnore = true)] + [ExporterHeader(DisplayName = "单据", IsIgnore = true)] public string BillNum { set; get; } [ImporterHeader(Name = "任务代码", IsIgnore = true)] + [ExporterHeader(DisplayName = "任务代码", IsIgnore = true)] public Guid TaskId { set; get; } [ImporterHeader(Name = "开票单价")] - + [ExporterHeader(DisplayName = "开票单价")] public decimal Price { set; get; } [ImporterHeader(Name = "开票金额")] + [ExporterHeader(DisplayName = "开票金额")] public decimal Amt { set; get; }