wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、载具主表新增check_conclusion检验结论字段

Browse Source
This commit is contained in:
alex
2023-08-23 16:13:18 +08:00
parent a9ff9053a6
commit 6857cc9c75
8 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryQueryOutput.cs
View File

@@ -76,6 +76,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Outputs
/// </summary>
public string check_conclusion { get; set; }
/// <summary>
/// 质检状态
/// </summary>
public string qc_status { get; set; }
/// <summary>
/// 载具条码明细输出
/// </summary>
public List<CarryCodeQueryOutput>? wmsCarryCodes { get; set; }

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs
View File

@@ -39,6 +39,6 @@ public partial class WmsCarryCode
/// 检验结论
/// </summary>
[SugarColumn(IsIgnore = true)]
public string check_conclusion { get; set; }
public int check_conclusion { get; set; }
}

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs
View File

@@ -131,5 +131,9 @@ public partial class WmsCarryH : BaseEntity<string>
/// 齐套搭配方案编号
/// </summary>
public string? collocation_scheme_code { get; set; }
/// <summary>
/// 检验结论
/// </summary>
public int check_conclusion { get; set; } = 1;
}

27
WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumCheckConclusion.cs Normal file
View File

@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Enums
{
/// <summary>
/// 检验结论
/// </summary>
public enum EnumCheckConclusion
{
[Description("合格")]
合格 = 1,
[Description("让步合格")]
让步合格 = 2,
[Description("不合格")]
不合格 = 4,
[Description("待检")]
待检 = 8,
[Description("暂控")]
暂控 = 16,
}
}

8
WarehouseMgr/Tnb.WarehouseMgr.Entities/Mapper/Mapper.cs
View File

@@ -2,6 +2,10 @@
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Dto.Inputs;
using Tnb.WarehouseMgr.Entities.Dto.Outputs;
using Tnb.Common;
using JNPF.Common.Extension;
using Tnb.WarehouseMgr.Entities.Enums;
namespace Tnb.WarehouseMgr.Entities.Mapper
{
@@ -16,6 +20,10 @@ namespace Tnb.WarehouseMgr.Entities.Mapper
config.ForType<MESCarrySignInput, SignForDeliveryInput>()
.Map(dest => dest.carryId, src => src.carry_code)
;
config.ForType<WmsCarryH, CarryQueryOutput>()
.Map(dest => dest.qc_status, src => src.is_check == 0 ? "不合格" : "合格");
config.ForType<WmsCarryCode, CarryCodeQueryOutput>()
.Map(dest => dest.check_conclusion, src => src.check_conclusion.ToEnum<EnumCheckConclusion>().GetDescription());
}
}
}