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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
马健
2024-08-22 14:53:29 +08:00
parent 20043b879d 27e67dadf3
commit 431b2cc4fa
29 changed files with 758 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,9 +72,9 @@ public partial class WmsCarryH : BaseEntity<string>
public string out_status { get; set; }
/// <summary>
/// 检验状态 0 未检验 1 检验中 2 合格 3 不合格
/// 检验状态 同质量结果
/// </summary>
public int is_check { get; set; }
public string is_check { get; set; }
/// <summary>
/// 来源单据ID

6
WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumCheckConclusion.cs
View File

@@ -10,13 +10,15 @@ namespace Tnb.WarehouseMgr.Entities.Enums
{
[Description("合格")]
合格 = 1,
[Description("让步合格")]
让步合格 = 2,
[Description("让步接收")]
让步接收 = 2,
[Description("不合格")]
不合格 = 4,
[Description("待检")]
待检 = 8,
[Description("暂控")]
暂控 = 16,
[Description("检验中")]
检验中 = 32,
}
}

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

@@ -18,8 +18,8 @@ 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<WmsCarryH, CarryQueryOutput>()
// .Map(dest => dest.qc_status, src => src.is_check == 0 ? "不合格" : "合格");
config.ForType<WmsCarryCode, CarryCodeQueryOutput>()
.Map(dest => dest.check_conclusion, src => GenericEnumDicionary<EnumCheckConclusion>.GetEnumDesc(src.check_conclusion));
config.ForType<WmsPurchaseD, WmsInstockD>()

4
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Extension;
using JNPF.Common.Security;
using JNPF.FriendlyException;
using JNPF.VisualDev;
@@ -8,6 +9,7 @@ using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.BasicData.Entities;
using Tnb.ProductionMgr.Entities.Enums;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto.Inputs;
using Tnb.WarehouseMgr.Entities.Enums;
@@ -86,7 +88,7 @@ namespace Tnb.WarehouseMgr
}
x.out_status = ((int)EnumOutStatus.正常).ToString();
x.is_check = 1;
x.is_check = EnumCheckConclusion.待检.ParseToInt().ToString();
x.create_id = _userManager.UserId;
x.modify_id = null;
x.modify_time = null;

5
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
View File

@@ -20,6 +20,7 @@ using Npgsql;
using SqlSugar;
using Tnb.BasicData.Entities;
using Tnb.Common.Utils;
using Tnb.ProductionMgr.Entities.Enums;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.WarehouseMgr.Entities.Dto;
@@ -185,7 +186,7 @@ namespace Tnb.WarehouseMgr
carryObj.location_id = null;
carryObj.location_code = null;
carryObj.out_status = "0";
carryObj.is_check = 1;
carryObj.is_check = EnumCheckConclusion.待检.ParseToInt().ToString();
carryObj.status = 1;
carryObj.bale_num = null;
carryObj.collocation_scheme_id = null;
@@ -282,7 +283,7 @@ namespace Tnb.WarehouseMgr
carry.id = SnowflakeIdHelper.NextId();
carry.carry_name = carryCode;
carry.carry_code = carryCode;
carry.is_check = 1;
carry.is_check = EnumCheckConclusion.待检.ParseToInt().ToString();
carry.status = 1;
carry.create_id = "25398501929509";
carry.create_time = DateTime.Now;

3
WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs
View File

@@ -21,6 +21,7 @@ using Tnb.WarehouseMgr.Entities.Dto.Inputs;
using Tnb.WarehouseMgr.Entities.Entity.Constraints;
using Tnb.WarehouseMgr.Entities.Enums;
using Tnb.WarehouseMgr.Interfaces;
using Tnb.ProductionMgr.Entities.Enums;
namespace Tnb.WarehouseMgr
{
@@ -149,7 +150,7 @@ namespace Tnb.WarehouseMgr
if (carry != null)
{
carry.check_conclusion = input.check_conclusion;
carry.is_check = 1;
carry.is_check = EnumCheckConclusion.待检.ParseToInt().ToString();
isOk = await _db.Updateable(carry).UpdateColumns(it => new { it.check_conclusion, it.is_check }).ExecuteCommandHasChangeAsync();
}
}