feat(库存报表): 新增出入库报表功能及变动箱数字段

添加成品库出入库报表功能,包括入库报表和出库报表的查询接口
在WmGoodsRecord模型中新增ChangePackage字段记录变动箱数
修复Job_Blank.cs中多余的return null语句
This commit is contained in:
2025-08-15 14:58:32 +08:00
parent 1be5945f2f
commit 20c7855995
14 changed files with 608 additions and 3 deletions

View File

@@ -0,0 +1,40 @@
using System;
using ZR.Model;
namespace ZR.Model.MES.mm.Dto
{
/// <summary>
/// 成品库记录查询参数
/// </summary>
public class WmGoodsRecordReportQueryDto : PagerInfo
{
/// <summary>
/// 数据来源
/// </summary>
public string Source { get; set; }
/// <summary>
/// 开始时间
/// </summary>
public DateTime? StartTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
public DateTime? EndTime { get; set; }
/// <summary>
/// 物料号(零件号)
/// </summary>
public string PartNumber { get; set; }
/// <summary>
/// 物料名称(暂无对应字段,可考虑用零件号替代或添加新字段)
/// </summary>
public string MaterialName { get; set; }
/// <summary>
/// 操作人(创建人)
/// </summary>
public string Operator { get; set; }
}
}

View File

@@ -0,0 +1,124 @@
namespace ZR.Model.MES.mm
{
/// <summary>
/// 成品库出入库报表清单
/// </summary>
public class WmGoodsRecordReport
{
#region
/// <summary>
/// 主键
/// </summary>
public string Id { get; set; }
/// <summary>
/// 库存主键
/// </summary>
public string FkInventoryId { get; set; }
/// <summary>
/// 关联记录字段识别记录字段如PDA
/// </summary>
public string Code { get; set; }
/// <summary>
/// 零件号
/// </summary>
public string Partnumber { get; set; }
/// <summary>
/// 毛坯号
/// </summary>
public string BlankNum { get; set; }
#endregion
#region
/// <summary>
/// 变动类别 1-入库 2-出库 3-盘点
/// </summary>
public int? ChangeType { get; set; }
/// <summary>
/// 变动箱数
/// </summary>
public int? ChangePackage { get; set; }
/// <summary>
/// 变动零件数量
/// </summary>
public int? ChangeQuantity { get; set; }
/// <summary>
/// 时间(操作时间)
/// </summary>
public DateTime? ActionTime { get; set; }
/// <summary>
/// 状态(暂定)
/// </summary>
public int? Status { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
#endregion
#region
/// <summary>
/// 产品描述(产品名称)
/// </summary>
public string ProductName { get; set; }
/// <summary>
/// 产品颜色
/// </summary>
public string Color { get; set; }
/// <summary>
/// 规格(左右脚)
/// </summary>
public string Specification { get; set; }
/// <summary>
/// 显示描述(产品描述+颜色+规格)
/// </summary>
public string Description { get; set; }
/// <summary>
/// 单位
/// </summary>
public string Unit { get; set; }
#endregion
#region
/// <summary>
/// 创建人
/// </summary>
public string CreatedBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? CreatedTime { get; set; }
/// <summary>
/// 更新人
/// </summary>
public string UpdatedBy { get; set; }
/// <summary>
/// 更新时间
/// </summary>
public DateTime? UpdatedTime { get; set; }
#endregion
}
}

View File

@@ -40,6 +40,12 @@ namespace ZR.Model.MES.wms
[SugarColumn(ColumnName = "change_type")]
public int? ChangeType { get; set; }
/// <summary>
/// 变动箱数
/// </summary>
[SugarColumn(ColumnName = "change_package")]
public int? ChangePackage { get; set; }
/// <summary>
/// 变动数量
/// </summary>