feat(包装标签): 新增产线产品托盘配置功能并优化标签打印逻辑
实现产线产品托盘配置管理功能,包括接口、模型和服务层 优化包装标签打印逻辑,支持根据托盘配置自动分段打印满箱和零头箱标签 新增多个辅助方法创建不同类型的标签DTO 修复当没有托盘配置时使用默认单个标签打印的逻辑
This commit is contained in:
83
ZR.Service/mes/wms/WmMaterialPackageService.cs
Normal file
83
ZR.Service/mes/wms/WmMaterialPackageService.cs
Normal file
@@ -0,0 +1,83 @@
|
||||
using Infrastructure.Attribute;
|
||||
using SqlSugar;
|
||||
using ZR.Model;
|
||||
using ZR.Model.MES.wms;
|
||||
using ZR.Model.MES.wms.Dto;
|
||||
using ZR.Repository;
|
||||
using ZR.Service.mes.wms.IService;
|
||||
|
||||
namespace ZR.Service.mes.wms
|
||||
{
|
||||
/// <summary>
|
||||
/// Service业务层处理
|
||||
/// </summary>
|
||||
[AppService(ServiceType = typeof(IWmMaterialPackageService), ServiceLifetime = LifeTime.Transient)]
|
||||
public class WmMaterialPackageService : BaseService<WmMaterialPackage>, IWmMaterialPackageService
|
||||
{
|
||||
/// <summary>
|
||||
/// 查询列表
|
||||
/// </summary>
|
||||
/// <param name="parm"></param>
|
||||
/// <returns></returns>
|
||||
public PagedInfo<WmMaterialPackageDto> GetList(WmMaterialPackageQueryDto parm)
|
||||
{
|
||||
var predicate = Expressionable.Create<WmMaterialPackage>();
|
||||
|
||||
var response = Queryable()
|
||||
.Where(predicate.ToExpression())
|
||||
.ToPage<WmMaterialPackage, WmMaterialPackageDto>(parm);
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取详情
|
||||
/// </summary>
|
||||
/// <param name="Id"></param>
|
||||
/// <returns></returns>
|
||||
public WmMaterialPackage GetInfo(int Id)
|
||||
{
|
||||
var response = Queryable()
|
||||
.Where(x => x.Id == Id)
|
||||
.First();
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public WmMaterialPackage AddWmMaterialPackage(WmMaterialPackage model)
|
||||
{
|
||||
return Context.Insertable(model).ExecuteReturnEntity();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public int UpdateWmMaterialPackage(WmMaterialPackage model)
|
||||
{
|
||||
//var response = Update(w => w.Id == model.Id, it => new WmMaterialPackage()
|
||||
//{
|
||||
// PartNumber = model.PartNumber,
|
||||
// BlankNumber = model.BlankNumber,
|
||||
// RecordType = model.RecordType,
|
||||
// Color = model.Color,
|
||||
// Specification = model.Specification,
|
||||
// Description = model.Description,
|
||||
// PackageProductionQualifiedPalletNum = model.PackageProductionQualifiedPalletNum,
|
||||
// PackageProductionPolishPalletNum = model.PackageProductionPolishPalletNum,
|
||||
// UpdateTime = model.UpdateTime,
|
||||
// UpdateBy = model.UpdateBy,
|
||||
//});
|
||||
//return response;
|
||||
return Update(model, true);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user