This commit is contained in:
2024-07-22 10:56:50 +08:00
parent a239258646
commit 922a3bc391

View File

@@ -821,14 +821,17 @@ namespace Tnb.ProductionMgr
}; };
insertMaterial.Add(basMaterial); insertMaterial.Add(basMaterial);
insertMaterialUnits.Add(new BasMaterialUnit() if (unitId != auxiliaryUnitId)
{ {
id = SnowflakeIdHelper.NextId(), insertMaterialUnits.Add(new BasMaterialUnit()
material_id = basMaterial.id, {
number_of_primary_unit = unitArr[0], id = SnowflakeIdHelper.NextId(),
number_of_auxiliary_unit = unitArr[1], material_id = basMaterial.id,
auxiliary_unit_id = auxiliaryUnitId number_of_primary_unit = unitArr[0],
}); number_of_auxiliary_unit = unitArr[1],
auxiliary_unit_id = auxiliaryUnitId
});
}
} }
else else
{ {
@@ -858,22 +861,30 @@ namespace Tnb.ProductionMgr
.FirstAsync(); .FirstAsync();
if (basMaterialUnit == null) if (basMaterialUnit == null)
{ {
insertMaterialUnits.Add(new BasMaterialUnit() if (unitId != auxiliaryUnitId)
{ {
id = SnowflakeIdHelper.NextId(), insertMaterialUnits.Add(new BasMaterialUnit()
material_id = materialId, {
number_of_primary_unit = unitArr[0], id = SnowflakeIdHelper.NextId(),
number_of_auxiliary_unit = unitArr[1], material_id = materialId,
auxiliary_unit_id = auxiliaryUnitId number_of_primary_unit = unitArr[0],
}); number_of_auxiliary_unit = unitArr[1],
auxiliary_unit_id = auxiliaryUnitId
});
}
} }
else else
{ {
await _db.Updateable<BasMaterialUnit>() if (unitId != auxiliaryUnitId)
.SetColumns(x => x.number_of_primary_unit == unitArr[0]) {
.SetColumns(x => x.number_of_auxiliary_unit == unitArr[1]) await _db.Updateable<BasMaterialUnit>()
.Where(x => x.id == basMaterialUnit.id) .SetColumns(x => x.number_of_primary_unit == unitArr[0])
.ExecuteCommandAsync(); .SetColumns(x => x.number_of_auxiliary_unit == unitArr[1])
.Where(x => x.id == basMaterialUnit.id)
.ExecuteCommandAsync();
}
} }
} }
} }