diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index d5fefd82..9f72895c 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 4abbd048..5b3b8f99 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -3526,6 +3526,11 @@ 物料规格型号 + + + 单位 + + 仓库ID @@ -3906,7 +3911,7 @@ 仓位 - + 子仓库 diff --git a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs index 7ac7eb4b..41c205ec 100644 --- a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs @@ -1,4 +1,5 @@ -using System; +using Npoi.Mapper.Attributes; +using System; using System.Collections.Generic; using System.Text; @@ -12,46 +13,57 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord /// /// 单据编号 /// + [Column("单据号")] public string BillNo { get; set; } /// /// 物料名称 /// + [Column("物料名称")] public string MaterialName { get; set; } /// /// 物料编码 /// + [Column("物料编码")] public string MaterialNumber { get; set; } /// /// 物料规格型号 /// + [Column("规格型号")] public string Specifications { get; set; } /// /// 序列号 /// + [Column("序列号")] public string SerialNumbers { get; set; } /// /// 原箱子 /// + [Column("原箱号")] public string SrcBox { get; set; } /// /// 目标箱子 /// + [Column("目标箱号")] public string DestBox { get; set; } /// /// 原仓位 /// + [Column("原仓位")] public string SrcSubStock { get; set; } /// /// 目标仓位 /// + [Column("现仓位")] public string DestSubStock { get; set; } /// /// 操作人 /// + [Column("操作人")] public string Creator { get; set; } /// /// 操作时间 /// + [Column("操作时间")] public string CreateTime { get; set; } } } diff --git a/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryInfoResponse.cs index adb8cad5..32cec738 100644 --- a/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryInfoResponse.cs +++ b/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryInfoResponse.cs @@ -1,4 +1,5 @@ -using System; +using Npoi.Mapper.Attributes; +using System; using System.Collections.Generic; using System.Text; @@ -9,34 +10,42 @@ namespace WMS.Web.Core.Dto.MoveBoxRecord /// /// 单据编号 /// + [Column("单据号")] public string BillNo { get; set; } /// /// 箱号 /// + [Column("箱号")] public string Box { get; set; } /// /// 原仓位 /// + [Column("原仓位")] public string SrcSubStock { get; set; } /// /// 目标仓位 /// + [Column("新仓位")] public string DestSubStock { get; set; } /// /// 数量 /// + [Column("数量")] public decimal Qty { get; set; } /// /// 类型:整箱移货上级,整箱移货下级 /// + [Column("操作类型")] public string Type { get; set; } /// /// 操作人 /// + [Column("操作人")] public string Creator { get; set; } /// /// 操作时间 /// + [Column("操作时间")] public string CreateTime { get; set; } } } diff --git a/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs index db89a365..0e81650f 100644 --- a/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs +++ b/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs @@ -1,4 +1,5 @@ -using System; +using Npoi.Mapper.Attributes; +using System; using System.Collections.Generic; using System.Text; @@ -12,67 +13,87 @@ namespace WMS.Web.Core.Dto.OutStock /// /// 主键 订单编号 /// + [Ignore] public int Id { get; set; } /// /// 单据编号 /// + [Column("出库单号")] public string BillNo { get; set; } /// /// 单据类型 /// + [Column("出库类型")] public string Type { get; set; } - /// /// 创建人 /// + [Column("创建人")] public string Creator { get; set; } /// /// 创建时间(出库时间) /// + [Column("出库时间")] public string CreateTime { get; set; } /// /// 同步成功或者失败 null 就是未同步 /// - public bool? SuccessSync { get; set; } + [Column("金蝶同步状态")] + public string SuccessSync { get; set; } /// /// 来源单号 /// + [Column("来源单号")] public string SourceBillNo { get; set; } /// /// 销售订单号 /// + [Column("销售订单号")] public string SaleBillNo { get; set; } /// /// 发货组织 /// + [Column("发货组织")] public string DeliveryOrg { get; set; } /// /// 收货客户 /// + [Column("收货客户")] public string ReceiptCustomer { get; set; } /// /// 物料名称 /// + [Column("物料名称")] public string MaterialName { get; set; } /// /// 物料编码 /// + [Column("物料编码")] public string MaterialNumber { get; set; } /// /// 物料规格型号 /// + [Column("规格型号")] public string Specifications { get; set; } /// + /// 单位 + /// + [Column("单位")] + public string Unit { get; set; } + /// /// 仓库ID /// + [Column("仓库")] public string Stock { get; set; } /// /// 出库数量 /// + [Column("出库数量")] public decimal Qty { get; set; } /// /// 备注 /// + [Column("备注")] public string Remark { get; set; } } } diff --git a/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs index dee0857a..8c98879f 100644 --- a/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs +++ b/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs @@ -1,4 +1,5 @@ -using System; +using Npoi.Mapper.Attributes; +using System; using System.Collections.Generic; using System.Text; @@ -16,54 +17,67 @@ namespace WMS.Web.Core.Dto.TakeStock /// /// 单据编号 /// + [Column("盘盈亏单号")] public string BillNo { get; set; } /// /// 盘点日期 /// + [Column("盘点日期")] public string Date { get; set; } /// /// 盘点人员 /// + [Column("盘点人")] public string Creator { get; set; } /// /// 金蝶同步成功或者失败 null 就是未同步 /// - public bool? SuccessSync { get; set; } + [Column("金蝶同步状态")] + public string SuccessSync { get; set; } /// /// 单位 /// + [Column("单位")] public string Unit { get; set; } /// /// 仓库 /// + [Column("仓库")] public string Stock { get; set; } /// /// 仓位 /// + [Column("仓位")] public string SubStock { get; set; } /// /// 子仓库 /// - public string Erp_SubStockCode { get; set; } + [Column("子仓库")] + public string Erp_SubStock { get; set; } /// /// 盘点前数量(wms系统数量) /// + [Column("WMS系统数量")] public decimal BeforeQty { get; set; } /// /// 盘点实际数量(实际仓库数量) /// + [Column("实际仓库数量")] public decimal AfterQty { get; set; } /// /// 盘点后数量 /// + [Column("此次盘点数量")] public decimal FinalQty { get; set; } /// /// 盘点结果类型:1为盘盈,2位盘亏 /// + [Column("盘点结果")] public string ResultType { get; set; } /// /// 备注 /// + [Column("备注")] public string Remark { get; set; } } } diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs index 1c9f301b..fb34e55b 100644 --- a/src/WMS.Web.Repositories/OutStockRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockRepositories.cs @@ -158,7 +158,7 @@ namespace WMS.Web.Repositories Type = s.order.Type.GetRemark(), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), CreateTime = s.order.CreateTime.DateToStringSeconds(), - SuccessSync = s.order.SuccessSync, + SuccessSync = s.order.SuccessSync == true ? "成功" : "失败", Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode), SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo)), SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo)), @@ -170,6 +170,7 @@ namespace WMS.Web.Repositories MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), Qty = s.detail.Qty, + Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId), Remark = s.order.Remark #endregion diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs index 58383a4e..bd4c0247 100644 --- a/src/WMS.Web.Repositories/TakeStockRepositories.cs +++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs @@ -198,7 +198,7 @@ namespace WMS.Web.Repositories Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId), Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode), SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId), - Erp_SubStockCode= _erpBasicDataExtendService.GetStockName(subStocks, s.Erp_SubStockId), + Erp_SubStock= _erpBasicDataExtendService.GetStockName(subStocks, s.Erp_SubStockId), BeforeQty = s.BeforeQty, AfterQty = s.AfterQty, FinalQty = s.FinalQty, @@ -206,7 +206,7 @@ namespace WMS.Web.Repositories Remark = s.Remark, Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.CreatorId), Date = s.Date.DateToStringSeconds(), - SuccessSync = s.SuccessSync + SuccessSync = s.SuccessSync==true?"成功":"失败", #endregion }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();