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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-14 14:59:50 +08:00
parent f808b32b08 97c83b9aa3
commit 403c2df59b
27 changed files with 1372 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WMS.Web.Core/Dto/BoxResponse.cs
View File

@@ -10,7 +10,7 @@ namespace WMS.Web.Core.Dto
public class BoxResponse
{
/// <summary>
/// 单据头ID
/// 箱ID
/// </summary>
public int Id { get; set; }
/// <summary>

11
src/WMS.Web.Core/Dto/EnumStatusResponse.cs
View File

@@ -46,8 +46,15 @@ namespace WMS.Web.Core.Dto
/// 非采购上架方式
/// </summary>
public Dictionary<int, string> ShelfMethod { get; set; } = new Dictionary<int, string>();
/// <summary>
/// 下载导出订单类型
/// </summary>
public Dictionary<int, string> FileDownLoadOrderType { get; set; } = new Dictionary<int, string>();
/// <summary>
/// 下载导出状态
/// </summary>
public Dictionary<int, string> ExportStatus { get; set; } = new Dictionary<int, string>();
}
}

37
src/WMS.Web.Core/Dto/FileDownManagerRequest.cs Normal file
View File

@@ -0,0 +1,37 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto
{
/// <summary>
/// 上传下载列表
/// </summary>
public class FileDownManagerRequest: PaginationBaseRequestDto
{
/// <summary>
/// 单据类型(任务类型)
/// </summary>
public int? Type { get; set; }
/// <summary>
/// 状态
/// </summary>
public int? Status { get; set; }
/// <summary>
/// 下单时间 开始
/// </summary>
public DateTime? BeginDate { get; set; }
/// <summary>
/// 下单时间 结束
/// </summary>
public DateTime? EndDate { get; set; }
/// <summary>
/// 操作人
/// </summary>
public string User { get; set; }
/// <summary>
/// 供应商用户Id
/// </summary>
public int? SupplierId { get; set; } = null;
}
}

73
src/WMS.Web.Core/Dto/FileDownManagerResponse.cs Normal file
View File

@@ -0,0 +1,73 @@

using System;
using System.Collections.Generic;
using System.Text;
using WMS.Web.Core.Help;
namespace WMS.Web.Core.Dto
{
/// <summary>
/// 上传下载列表
/// </summary>
public class FileDownManagerResponse
{
public FileDownManagerResponse(List<FileDownInfoManagerResponse> list, int? total)
{
this.List = list;
this.Total = total;
}
/// <summary>
/// 查询列表内容
/// </summary>
public List<FileDownInfoManagerResponse> List { get; set; } = new List<FileDownInfoManagerResponse>();
/// <summary>
/// 总条数
/// </summary>
public int? Total { get; set; }
}
/// <summary>
/// 上传下载列表
/// </summary>
public class FileDownInfoManagerResponse
{
public FileDownInfoManagerResponse() { }
public FileDownInfoManagerResponse(FileDownInfoManagerResponse response)
{
response.CopyPropertiesToD(this);
}
/// <summary>
/// 主键 订单编号
/// </summary>
public int Id { get; set; }
/// <summary>
/// 日期
/// </summary>
public string Date { get; set; }
/// <summary>
/// 单据类型(任务类型)
/// </summary>
public int Type { get; set; }
/// <summary>
/// 状态(Key）
/// </summary>
public int StatusKey { get; set; }
/// <summary>
/// 状态
/// </summary>
public string Status { get; set; }
/// <summary>
/// 文件地址
/// </summary>
public string FilePath { get; set; }
/// <summary>
/// 操作人
/// </summary>
public string UserName { get; set; }
/// <summary>
/// 失败原因
/// </summary>
public string Reason { get; set; }
}
}

19
src/WMS.Web.Core/Dto/FileDownManagerStatusResponse.cs Normal file
View File

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto
{
public class FileDownManagerStatusResponse
{
public FileDownManagerStatusResponse() { }
/// <summary>
/// 任务类型
/// </summary>
public Dictionary<int, string> Type { get; set; } = new Dictionary<int, string>();
/// <summary>
/// 状态
/// </summary>
public Dictionary<int, string> Status { get; set; } = new Dictionary<int, string>();
}
}

31
src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
View File

@@ -1,4 +1,5 @@
using System;
using Npoi.Mapper.Attributes;
using System;
using System.Collections.Generic;
using System.Text;
@@ -12,90 +13,112 @@ namespace WMS.Web.Core.Dto.OutStockTask
/// <summary>
/// 单据Id
/// </summary>
[Ignore]
public int Id { get; set; }
/// <summary>
/// 明细Id
/// </summary>
[Ignore]
public int DetailId { get; set; }
/// <summary>
/// 单据编号
/// 出库任务单号
/// </summary>
[Column("出库任务单号")]
public string BillNo { get; set; }
/// <summary>
/// 单据状态
/// 出库状态
/// </summary>
[Column("出库状态")]
public string Status { get; set; }
/// <summary>
/// 单据类型
/// </summary>
[Column("出库类型")]
public string Type { get; set; }
/// <summary>
/// 操作人（出库人）
/// </summary>
[Column("出库人")]
public string Operator { get; set; }
/// <summary>
/// 操作时间（出库时间）
/// </summary>
[Column("出库时间")]
public string OperateTime { 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>
/// 仓库ID
/// 仓库
///</summary>
[Column("发货仓库")]
public string Stock { get; set; }
/// <summary>
/// 应出库数量
///</summary>
[Column("应出库数量")]
public decimal AccruedQty { get; set; }
/// <summary>
/// 已出库数量
///</summary>
[Column("已出库数量")]
public decimal RealityQty { get; set; }
/// <summary>
/// 订单明细备注
///</summary>
[Column("订单明细备注")]
public string Remark { get; set; }
/// <summary>
/// 创建时间（erp那边的创建时间）
///</summary>
[Column("创建时间")]
public string CreateTime { get; set; }
/// <summary>
/// 单位
/// </summary>
[Column("单位")]
public string Unit { get; set; }
/// <summary>
/// 出库开始时间
///</summary>
[Column("出库开始时间")]
public string OutStockBeginTime { get; set; }
/// <summary>
/// 出库结束时间
///</summary>
[Column("出库结束时间")]
public string OutStockEndTime { get; set; }
}
}