18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整导出

Browse Source
This commit is contained in:
18942506660
2023-11-17 09:39:16 +08:00
parent ee94e117a9
commit db7a2062fc
8 changed files with 74 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

7
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -3526,6 +3526,11 @@
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockQueryInfoResponse.Unit">
<summary>
单位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockQueryInfoResponse.Stock">
<summary>
仓库ID
@@ -3906,7 +3911,7 @@
仓位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryInfoResponse.Erp_SubStockCode">
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryInfoResponse.Erp_SubStock">
<summary>
子仓库
</summary>

14
src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs
View File

@@ -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
/// <summary>
/// 单据编号
/// </summary>
[Column("单据号")]
public string BillNo { get; set; }
/// <summary>
/// 物料名称
/// </summary>
[Column("物料名称")]
public string MaterialName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
[Column("物料编码")]
public string MaterialNumber { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
[Column("规格型号")]
public string Specifications { get; set; }
/// <summary>
/// 序列号
/// </summary>
[Column("序列号")]
public string SerialNumbers { get; set; }
/// <summary>
/// 原箱子
/// </summary>
[Column("原箱号")]
public string SrcBox { get; set; }
/// <summary>
/// 目标箱子
/// </summary>
[Column("目标箱号")]
public string DestBox { get; set; }
/// <summary>
/// 原仓位
/// </summary>
[Column("原仓位")]
public string SrcSubStock { get; set; }
/// <summary>
/// 目标仓位
/// </summary>
[Column("现仓位")]
public string DestSubStock { get; set; }
/// <summary>
/// 操作人
/// </summary>
[Column("操作人")]
public string Creator { get; set; }
/// <summary>
/// 操作时间
/// </summary>
[Column("操作时间")]
public string CreateTime { get; set; }
}
}

11
src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryInfoResponse.cs
View File

@@ -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
/// <summary>
/// 单据编号
/// </summary>
[Column("单据号")]
public string BillNo { get; set; }
/// <summary>
/// 箱号
/// </summary>
[Column("箱号")]
public string Box { get; set; }
/// <summary>
/// 原仓位
/// </summary>
[Column("原仓位")]
public string SrcSubStock { get; set; }
/// <summary>
/// 目标仓位
/// </summary>
[Column("新仓位")]
public string DestSubStock { get; set; }
/// <summary>
/// 数量
/// </summary>
[Column("数量")]
public decimal Qty { get; set; }
/// <summary>
/// 类型：整箱移货上级，整箱移货下级
/// </summary>
[Column("操作类型")]
public string Type { get; set; }
/// <summary>
/// 操作人
/// </summary>
[Column("操作人")]
public string Creator { get; set; }
/// <summary>
/// 操作时间
/// </summary>
[Column("操作时间")]
public string CreateTime { get; set; }
}
}

27
src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs
View File

@@ -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
/// <summary>
/// 主键 订单编号
/// </summary>
[Ignore]
public int Id { get; set; }
/// <summary>
/// 单据编号
/// </summary>
[Column("出库单号")]
public string BillNo { get; set; }
/// <summary>
/// 单据类型
/// </summary>
[Column("出库类型")]
public string Type { get; set; }
/// <summary>
/// 创建人
/// </summary>
[Column("创建人")]
public string Creator { get; set; }
/// <summary>
/// 创建时间（出库时间）
/// </summary>
[Column("出库时间")]
public string CreateTime { get; set; }
/// <summary>
/// 同步成功或者失败 null 就是未同步
/// </summary>
public bool? SuccessSync { get; set; }
[Column("金蝶同步状态")]
public string SuccessSync { get; set; }
/// <summary>
/// 来源单号
///</summary>
[Column("来源单号")]
public string SourceBillNo { get; set; }
/// <summary>
/// 销售订单号
///</summary>
[Column("销售订单号")]
public string SaleBillNo { get; set; }
/// <summary>
/// 发货组织
///</summary>
[Column("发货组织")]
public string DeliveryOrg { get; set; }
/// <summary>
/// 收货客户
///</summary>
[Column("收货客户")]
public string ReceiptCustomer { get; set; }
/// <summary>
/// 物料名称
/// </summary>
[Column("物料名称")]
public string MaterialName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
[Column("物料编码")]
public string MaterialNumber { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
[Column("规格型号")]
public string Specifications { get; set; }
/// <summary>
/// 单位
/// </summary>
[Column("单位")]
public string Unit { get; set; }
/// <summary>
/// 仓库ID
///</summary>
[Column("仓库")]
public string Stock { get; set; }
/// <summary>
/// 出库数量
///</summary>
[Column("出库数量")]
public decimal Qty { get; set; }
/// <summary>
/// 备注
/// </summary>
[Column("备注")]
public string Remark { get; set; }
}
}

20
src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs
View File

@@ -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
/// <summary>
/// 单据编号
/// </summary>
[Column("盘盈亏单号")]
public string BillNo { get; set; }
/// <summary>
/// 盘点日期
/// </summary>
[Column("盘点日期")]
public string Date { get; set; }
/// <summary>
/// 盘点人员
/// </summary>
[Column("盘点人")]
public string Creator { get; set; }
/// <summary>
/// 金蝶同步成功或者失败 null 就是未同步
/// </summary>
public bool? SuccessSync { get; set; }
[Column("金蝶同步状态")]
public string SuccessSync { get; set; }
/// <summary>
/// 单位
/// </summary>
[Column("单位")]
public string Unit { get; set; }
/// <summary>
/// 仓库
/// </summary>
[Column("仓库")]
public string Stock { get; set; }
/// <summary>
/// 仓位
/// </summary>
[Column("仓位")]
public string SubStock { get; set; }
/// <summary>
/// 子仓库
/// </summary>
public string Erp_SubStockCode { get; set; }
[Column("子仓库")]
public string Erp_SubStock { get; set; }
/// <summary>
/// 盘点前数量（wms系统数量）
/// </summary>
[Column("WMS系统数量")]
public decimal BeforeQty { get; set; }
/// <summary>
/// 盘点实际数量（实际仓库数量）
/// </summary>
[Column("实际仓库数量")]
public decimal AfterQty { get; set; }
/// <summary>
/// 盘点后数量
/// </summary>
[Column("此次盘点数量")]
public decimal FinalQty { get; set; }
/// <summary>
/// 盘点结果类型：1为盘盈，2位盘亏
/// </summary>
[Column("盘点结果")]
public string ResultType { get; set; }
/// <summary>
/// 备注
/// </summary>
[Column("备注")]
public string Remark { get; set; }
}
}

3
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -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

4
src/WMS.Web.Repositories/TakeStockRepositories.cs
View File

@@ -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();