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

View File

@@ -821,6 +821,8 @@ namespace Tnb.ProductionMgr
}; };
insertMaterial.Add(basMaterial); insertMaterial.Add(basMaterial);
if (unitId != auxiliaryUnitId)
{
insertMaterialUnits.Add(new BasMaterialUnit() insertMaterialUnits.Add(new BasMaterialUnit()
{ {
id = SnowflakeIdHelper.NextId(), id = SnowflakeIdHelper.NextId(),
@@ -830,6 +832,7 @@ namespace Tnb.ProductionMgr
auxiliary_unit_id = auxiliaryUnitId auxiliary_unit_id = auxiliaryUnitId
}); });
} }
}
else else
{ {
ErpExtendField extendField = erpExtendFields.Find(x => x.cmaterialoid == erpBdMaterial.ID); ErpExtendField extendField = erpExtendFields.Find(x => x.cmaterialoid == erpBdMaterial.ID);
@@ -857,6 +860,8 @@ namespace Tnb.ProductionMgr
.Where(x => x.material_id == materialId && x.auxiliary_unit_id == auxiliaryUnitId) .Where(x => x.material_id == materialId && x.auxiliary_unit_id == auxiliaryUnitId)
.FirstAsync(); .FirstAsync();
if (basMaterialUnit == null) if (basMaterialUnit == null)
{
if (unitId != auxiliaryUnitId)
{ {
insertMaterialUnits.Add(new BasMaterialUnit() insertMaterialUnits.Add(new BasMaterialUnit()
{ {
@@ -867,7 +872,11 @@ namespace Tnb.ProductionMgr
auxiliary_unit_id = auxiliaryUnitId auxiliary_unit_id = auxiliaryUnitId
}); });
} }
}
else else
{
if (unitId != auxiliaryUnitId)
{ {
await _db.Updateable<BasMaterialUnit>() await _db.Updateable<BasMaterialUnit>()
.SetColumns(x => x.number_of_primary_unit == unitArr[0]) .SetColumns(x => x.number_of_primary_unit == unitArr[0])
@@ -875,6 +884,8 @@ namespace Tnb.ProductionMgr
.Where(x => x.id == basMaterialUnit.id) .Where(x => x.id == basMaterialUnit.id)
.ExecuteCommandAsync(); .ExecuteCommandAsync();
} }
}
} }
} }
} }