本次提交为库位、入库、出库、出入库类别等业务表的查询DTO新增了多个查询字段,并在对应Service层的QueryExp方法中实现了这些字段的动态拼接查询。调整后支持按编码、名称、操作员等多条件模糊筛选,提升了查询灵活性和前端多条件检索能力。同时优化了部分using引用顺序。
104 lines
3.2 KiB
C#
104 lines
3.2 KiB
C#
|
|
namespace DOAN.Model.BZFM.Dto
|
|
{
|
|
/// <summary>
|
|
/// 入库记录表查询对象
|
|
/// </summary>
|
|
public class MmRecordInboundQueryDto : PagerInfo
|
|
{
|
|
public string SupplierCode { get; set; }
|
|
|
|
public string Operator { get; set; }
|
|
|
|
public DateTime? CreatedTime { get; set; }
|
|
}
|
|
|
|
/// <summary>
|
|
/// 入库记录表输入输出对象
|
|
/// </summary>
|
|
public class MmRecordInboundDto
|
|
{
|
|
public string Unit { get; set; }
|
|
|
|
public DateTime? CreatedTime { get; set; }
|
|
|
|
public string Remarks { get; set; }
|
|
|
|
public string Operator { get; set; }
|
|
|
|
public string SupplierName { get; set; }
|
|
|
|
public string SupplierCode { get; set; }
|
|
|
|
public DateTime? ExpiryDate { get; set; }
|
|
|
|
public DateTime? ProductionDate { get; set; }
|
|
|
|
public string BatchNo { get; set; }
|
|
|
|
[Required(ErrorMessage = "入库类型不能为空")]
|
|
public string TransactionType { get; set; }
|
|
|
|
[Required(ErrorMessage = "主键ID不能为空")]
|
|
public int Id { get; set; }
|
|
|
|
[Required(ErrorMessage = "入库数量不能为空")]
|
|
public decimal Quantity { get; set; }
|
|
|
|
public string LocationName { get; set; }
|
|
|
|
public string LocationCode { get; set; }
|
|
|
|
public string WarehouseName { get; set; }
|
|
|
|
[Required(ErrorMessage = "仓库编码不能为空")]
|
|
public string WarehouseCode { get; set; }
|
|
|
|
public string MaterialName { get; set; }
|
|
|
|
[Required(ErrorMessage = "物料编码不能为空")]
|
|
public string MaterialCode { get; set; }
|
|
|
|
[Required(ErrorMessage = "入库单号不能为空")]
|
|
public string InboundNo { get; set; }
|
|
|
|
|
|
|
|
[ExcelColumn(Name = "入库类型")]
|
|
public string TransactionTypeLabel { get; set; }
|
|
}
|
|
|
|
/// <summary>
|
|
/// 入库单
|
|
/// </summary>
|
|
public class InboundReceiptDto
|
|
{
|
|
public string Unit { get; set; }
|
|
public DateTime? CreatedTime { get; set; }
|
|
public string Remarks { get; set; }
|
|
public string Operator { get; set; }
|
|
public string SupplierName { get; set; }
|
|
public string SupplierCode { get; set; }
|
|
public DateTime? ExpiryDate { get; set; }
|
|
public DateTime? ProductionDate { get; set; }
|
|
public string BatchNo { get; set; }
|
|
[Required(ErrorMessage = "入库类型不能为空")]
|
|
public string TransactionType { get; set; }
|
|
[Required(ErrorMessage = "入库数量不能为空")]
|
|
public decimal Quantity { get; set; }
|
|
public string LocationName { get; set; }
|
|
public string LocationCode { get; set; }
|
|
public string WarehouseName { get; set; }
|
|
[Required(ErrorMessage = "仓库编码不能为空")]
|
|
public string WarehouseCode { get; set; }
|
|
public string MaterialName { get; set; }
|
|
[Required(ErrorMessage = "物料编码不能为空")]
|
|
public string MaterialCode { get; set; }
|
|
[Required(ErrorMessage = "入库单号不能为空")]
|
|
public string InboundNo { get; set; }
|
|
[ExcelColumn(Name = "入库类型")]
|
|
public string TransactionTypeLabel { get; set; }
|
|
// 1-蓝单正向 2-红单逆向
|
|
public int ReceiptType { get; set; } = 1;
|
|
}
|
|
} |