Accept Merge Request #2293: (feature/7254_new -> develop)
Merge Request: 材料型号增加是否磁吸 Created By: @刘磊 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @刘磊 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2293
This commit is contained in:
@@ -179,6 +179,7 @@ class sfMaterialModel(models.Model):
|
||||
materials_model.mf_materia_post = item['mf_materia_post']
|
||||
materials_model.materials_id = materials.id
|
||||
materials_model.need_h = item['need_h']
|
||||
materials_model.need_m = item['need_m']
|
||||
materials_model.density = item['density']
|
||||
materials_model.active = item['active']
|
||||
else:
|
||||
@@ -193,6 +194,7 @@ class sfMaterialModel(models.Model):
|
||||
"active": item['active'],
|
||||
"materials_id": materials.id,
|
||||
"need_h": item['need_h'],
|
||||
"need_m": item['need_m'],
|
||||
"mf_materia_post": item['mf_materia_post'],
|
||||
"density": item['density'],
|
||||
})
|
||||
@@ -229,6 +231,7 @@ class sfMaterialModel(models.Model):
|
||||
"standards_id": self.env['sf.international.standards'].search(
|
||||
[("name", '=', item['standards_id'])]).id,
|
||||
"need_h": item['need_h'],
|
||||
"need_m": item['need_m'],
|
||||
"alloy_code": item['alloy_code'],
|
||||
"mf_materia_post": item['mf_materia_post'],
|
||||
"density": item['density'],
|
||||
@@ -249,6 +252,7 @@ class sfMaterialModel(models.Model):
|
||||
materials_model.mf_materia_post = item['mf_materia_post']
|
||||
materials_model.materials_id = materials.id
|
||||
materials_model.need_h = item['need_h']
|
||||
materials_model.need_m = item['need_m']
|
||||
materials_model.density = item['density']
|
||||
materials_model.active = item['active']
|
||||
materials_model.materials_code= item['materials_code']
|
||||
|
||||
Reference in New Issue
Block a user