feat(包装标签): 新增产线产品托盘配置功能并优化标签打印逻辑

实现产线产品托盘配置管理功能,包括接口、模型和服务层
优化包装标签打印逻辑,支持根据托盘配置自动分段打印满箱和零头箱标签
新增多个辅助方法创建不同类型的标签DTO
修复当没有托盘配置时使用默认单个标签打印的逻辑
This commit is contained in:
2025-10-27 22:21:21 +08:00
parent b4c3af0e75
commit 8737002eef
6 changed files with 652 additions and 69 deletions

View File

@@ -0,0 +1,47 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>
/// 查询对象
/// </summary>
public class WmMaterialPackageQueryDto : PagerInfo
{
}
/// <summary>
/// 输入输出对象
/// </summary>
public class WmMaterialPackageDto
{
[Required(ErrorMessage = "主键不能为空")]
public int Id { get; set; }
public string PartNumber { get; set; }
public string BlankNumber { get; set; }
public string RecordType { get; set; }
public string Color { get; set; }
public string Specification { get; set; }
public string Description { get; set; }
public int? PackageProductionQualifiedPalletNum { get; set; }
public int? PackageProductionPolishPalletNum { get; set; }
public DateTime? CreateTime { get; set; }
public string CreateBy { get; set; }
public DateTime? UpdateTime { get; set; }
public string UpdateBy { get; set; }
}
}

View File

@@ -0,0 +1,86 @@
namespace ZR.Model.MES.wms
{
/// <summary>
///
/// </summary>
[SugarTable("wm_material_package")]
public class WmMaterialPackage
{
/// <summary>
/// 主键
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public int Id { get; set; }
/// <summary>
/// 零件号
/// </summary>
[SugarColumn(ColumnName = "part_number")]
public string PartNumber { get; set; }
/// <summary>
/// 毛坯号
/// </summary>
[SugarColumn(ColumnName = "blank_number")]
public string BlankNumber { get; set; }
/// <summary>
/// (零件,毛坯)
/// </summary>
[SugarColumn(ColumnName = "record_type")]
public string RecordType { 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>
[SugarColumn(ColumnName = "package_production_qualified_pallet_num")]
public int? PackageProductionQualifiedPalletNum { get; set; }
/// <summary>
/// 产线包装抛光品托盘产品数
/// </summary>
[SugarColumn(ColumnName = "package_production_polish_pallet_num")]
public int? PackageProductionPolishPalletNum { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[SugarColumn(ColumnName = "create_time")]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
[SugarColumn(ColumnName = "create_by")]
public string CreateBy { get; set; }
/// <summary>
/// 修改时间
/// </summary>
[SugarColumn(ColumnName = "update_time")]
public DateTime? UpdateTime { get; set; }
/// <summary>
/// 修改人
/// </summary>
[SugarColumn(ColumnName = "update_by")]
public string UpdateBy { get; set; }
}
}