From db7a2062fc272668fa34e20eb70a61b5f778ef23 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 17 Nov 2023 09:39:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 231119 -> 231119 bytes src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 7 ++++- .../ChangeBoxRecordQueryResponse.cs | 14 ++++++++- .../MoveBoxRecordQueryInfoResponse.cs | 11 ++++++- .../Dto/OutStock/OutStockQueryInfoResponse.cs | 27 ++++++++++++++++-- .../TakeStock/TakeStockQueryInfoResponse.cs | 20 +++++++++++-- .../OutStockRepositories.cs | 3 +- .../TakeStockRepositories.cs | 4 +-- 8 files changed, 74 insertions(+), 12 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index d5fefd8299fd5a147ebfd5b0aa2fa26b9c78f096..9f72895cab5a58af7e8d55a44b8b8087e6f70fd9 100644 GIT binary patch delta 4969 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 delta 4949 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 + + + 单位 + + 仓库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();