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