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

bug

Browse Source
This commit is contained in:
周科达
2024-08-29 11:41:57 +08:00
parent 3415354990
commit 7ace98d49e
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
View File

@@ -194,7 +194,7 @@ namespace Tnb.EquipMgr
string id = dic["id"]; string id = dic["id"];
EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x => x.id == id); EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x => x.id == id);
if (eqpRepairApply.status == RepairApplyStatus.TOBERECEIVED) if (eqpRepairApply.status == RepairApplyStatus.TOBEEXECUTED)
{ {
if (await _repository.AsSugarClient().Queryable<UserRelationEntity>().AnyAsync(x => x.UserId == _userManager.UserId && x.ObjectId == "26586914497557")) if (await _repository.AsSugarClient().Queryable<UserRelationEntity>().AnyAsync(x => x.UserId == _userManager.UserId && x.ObjectId == "26586914497557"))
{ {

10
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoListOuput.cs
View File

@@ -19,5 +19,15 @@ namespace Tnb.ProductionMgr.Entities.Dto
public string combine_mo_code { get; set; } public string combine_mo_code { get; set; }
public string material_id_id { get; set; } public string material_id_id { get; set; }
public List<PrdMoListOuput> children { get; set; } = new List<PrdMoListOuput>(); public List<PrdMoListOuput> children { get; set; } = new List<PrdMoListOuput>();
/// <summary>
/// 物料规格
/// </summary>
public string? f_flowtaskid { get; set; }
/// <summary>
/// 物料型号
/// </summary>
public string? f_flowid { get; set; }
} }
} }

2
ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
View File

@@ -166,6 +166,8 @@ namespace Tnb.ProductionMgr
mo_status = e.FullName, mo_status = e.FullName,
ebom_version = a.ebom_version, ebom_version = a.ebom_version,
remark = a.remark, remark = a.remark,
f_flowtaskid = b.material_specification,
f_flowid = b.material_standard,
children = SqlFunc.Subqueryable<PrdMo>() children = SqlFunc.Subqueryable<PrdMo>()
.LeftJoin<BasMaterial>((aa, bb) => aa.material_id == bb.id) .LeftJoin<BasMaterial>((aa, bb) => aa.material_id == bb.id)
.LeftJoin<DictionaryTypeEntity>((aa, bb, cc) => cc.EnCode == DictConst.MeasurementUnit) .LeftJoin<DictionaryTypeEntity>((aa, bb, cc) => cc.EnCode == DictConst.MeasurementUnit)