Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

物料分类功能完善

Browse Source
This commit is contained in:
git_rabbit
2025-12-29 15:48:03 +08:00
parent 29bb07532f
commit d52c235ab2
5 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
View File

@@ -21,6 +21,8 @@ namespace DOAN.Model.BZFM.Dto
[Required(ErrorMessage = "物料编码不能为空")]
public string MaterialCode { get; set; }
public string MaterialName { get; set; }
[Required(ErrorMessage = "仓库编码不能为空")]
public string WarehouseCode { get; set; }

5
DOAN.Model/MES/Material/Dto/MmMaterialCategoryDto.cs
View File

@@ -6,6 +6,9 @@ namespace DOAN.Model.BZFM.Dto
/// </summary>
public class MmMaterialCategoryQueryDto : PagerInfo
{
public string CategoryCode { get; set; }
public string CategoryName { get; set; }
public string Status { get; set; }
}
/// <summary>
@@ -28,8 +31,6 @@ namespace DOAN.Model.BZFM.Dto
public DateTime? CreatedTime { get; set; }
public DateTime? UpdatedTime { get; set; }
[ExcelColumn(Name = "状态(0/1)")]
public string StatusLabel { get; set; }
}
/// <summary>

6
DOAN.Model/MES/Material/MmInventory.cs
View File

@@ -19,6 +19,12 @@ namespace DOAN.Model.BZFM
[SugarColumn(ColumnName = "material_code")]
public string MaterialCode { get; set; }
/// <summary>
/// 物料名称
/// </summary>
[SugarColumn(ColumnName = "material_name")]
public string MaterialName { get; set; }
/// <summary>
/// 仓库编码
/// </summary>

2
DOAN.Service/MES/Material/MmInventoryService.cs
View File

@@ -182,6 +182,7 @@ namespace DOAN.Service.BZFM
var newInventory = new MmInventory()
{
MaterialCode = mmMaterial.MaterialCode,
MaterialName = mmMaterial.MaterialName,
LocationCode = mmLocation.LocationCode,
LocationName = mmLocation.LocationName,
WarehouseCode = mmLocation.WarehouseCode,
@@ -271,6 +272,7 @@ namespace DOAN.Service.BZFM
var newInventory = new MmInventory()
{
MaterialCode = mmMaterial.MaterialCode,
MaterialName = mmMaterial.MaterialName,
LocationCode = mmLocation.LocationCode,
LocationName = mmLocation.LocationName,
WarehouseCode = mmLocation.WarehouseCode,

23
DOAN.Service/MES/Material/MmMaterialCategoryService.cs
View File

@@ -51,6 +51,14 @@ namespace DOAN.Service.BZFM
/// <returns></returns>
public MmMaterialCategory AddMmMaterialCategory(MmMaterialCategory model)
{
// 检查是否有重复
bool hasAny = Context.Queryable<MmMaterialCategory>()
.Where(it => it.CategoryCode == model.CategoryCode)
.Any();
if (hasAny)
{
throw new Exception("分类编码不可重复!");
}
return Insertable(model).ExecuteReturnEntity();
}
@@ -61,6 +69,15 @@ namespace DOAN.Service.BZFM
/// <returns></returns>
public int UpdateMmMaterialCategory(MmMaterialCategory model)
{
// 检查是否有重复
bool hasAny = Context.Queryable<MmMaterialCategory>()
.Where(it => it.CategoryCode == model.CategoryCode)
.Where(it => it.Id != model.Id)
.Any();
if (hasAny)
{
throw new Exception("分类编码不可重复!");
}
return Update(model, true);
}
@@ -71,7 +88,11 @@ namespace DOAN.Service.BZFM
/// <returns></returns>
private static Expressionable<MmMaterialCategory> QueryExp(MmMaterialCategoryQueryDto parm)
{
var predicate = Expressionable.Create<MmMaterialCategory>();
var predicate = Expressionable.Create<MmMaterialCategory>()
.AndIF(!string.IsNullOrEmpty(parm.CategoryCode),it=>it.CategoryCode.Contains(parm.CategoryCode))
.AndIF(!string.IsNullOrEmpty(parm.CategoryName), it => it.CategoryName.Contains(parm.CategoryName))
//检查数据:(启用/停用)
.AndIF(!string.IsNullOrEmpty(parm.Status), it => it.Status == parm.Status);
return predicate;
}