jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步材料型号及优化材料型号页面及新增拉伸强度，硬度，粗加工，精加工

Browse Source
This commit is contained in:
jinling.yang
2023-08-21 11:49:24 +08:00
parent 78ddf4e52f
commit f6841e5e9f
3 changed files with 66 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_base/models/common.py
View File

@@ -67,6 +67,10 @@ class MrsMaterialModel(models.Model):
mf_materia_post = fields.Char("热处理后密度")
density = fields.Float("密度(kg/m³)")
materials_id = fields.Many2one('sf.production.materials', "材料名")
tensile_strength = fields.Float("拉伸强度(n/mm²)")
hardness = fields.Float("硬度(hrc)")
rough_machining = fields.Float("粗加工Vc(m/min)")
finish_machining = fields.Float("精加工Vc(m/min)")
remark = fields.Text("备注")
gain_way = fields.Selection(
[("自加工", "自加工"), ("外协", "外协"), ("采购", "采购")],

14
sf_base/views/common_view.xml
View File

@@ -206,10 +206,13 @@
<group>
<field name="name" readonly="1"/>
<field name="gain_way" required="1"/>
<field name="tensile_strength" required="1"/>
<field name="hardness" required="1"/>
<field name="density" readonly="1"/>
</group>
<group>
<field name="rough_machining" required="1"/>
<field name="finish_machining" required="1"/>
<field name="need_h" default="false" readonly="1"/>
<field name="mf_materia_post" attrs="{'invisible':[('need_h','=',False)]} "
readonly="1"/>
@@ -242,8 +245,13 @@
<field name="materials_no" readonly="1"/>
<field name="name" readonly="1"/>
<field name="gain_way"/>
<field name="need_h" readonly="1"/>
<field name="density" readonly="1"/>
<field name="tensile_strength"/>
<field name="hardness"/>
<field name="need_h"/>
<field name="density"/>
<field name="rough_machining"/>
<field name="finish_machining"/>
<field name="remark"/>
<field name='materials_id' invisible="1"/>
</tree>
</field>

40
sf_mrs_connect/models/sync_common.py
View File

@@ -99,25 +99,33 @@ class sfMaterialModel(models.Model):
if result['status'] == 1:
for item in result['materials_model_yesterday_list']:
if item:
brand = self.env['sf.materials.model'].search(
materials_model = self.env['sf.materials.model'].search(
[("materials_no", '=', item['materials_no'])])
if brand:
brand.id = item['id'],
brand.name = item['name'],
brand.materials_no = item['materials_no'],
brand.remark = item['remark'],
brand.active = item['active'],
brand.mf_materia_post = item['mf_materia_post'],
brand.materials_id = self.env['sf.production.materials'].search(
if materials_model:
materials_model.id = item['id'],
materials_model.name = item['name'],
materials_model.materials_no = item['materials_no'],
materials_model.remark = item['remark'],
materials_model.tensile_strength = item['tensile_strength'],
materials_model.hardness = item['hardness'],
materials_model.materials_no = item['materials_no'],
materials_model.rough_machining = item['rough_machining'],
materials_model.finish_machining = item['finish_machining'],
materials_model.mf_materia_post = item['mf_materia_post'],
materials_model.materials_id = self.env['sf.production.materials'].search(
[("materials_no", '=', item['materials_id.materials_no'])]).id,
brand.need_h = item['need_h'],
brand.density = item['density']
materials_model.need_h = item['need_h'],
materials_model.density = item['density']
else:
self.env['sf.materials.model'].create({
"id": item['id'],
"name": item['name'],
"materials_no": item['materials_no'],
"remark": item['remark'],
"tensile_strength": item['tensile_strength'],
"hardness": item['hardness'],
"rough_machining": item['rough_machining'],
"finish_machining": item['finish_machining'],
"active": item['active'],
"materials_id": self.env['sf.production.materials'].search(
[("materials_no", '=', item['materials_id.materials_no'])]).id,
@@ -143,14 +151,18 @@ class sfMaterialModel(models.Model):
if result['status'] == 1:
for item in result['materials_model_all_list']:
if item:
brand = self.env['sf.materials.model'].search(
materials_model = self.env['sf.materials.model'].search(
[("materials_no", '=', item['materials_no'])])
if not brand:
if not materials_model:
self.env['sf.materials.model'].create({
"name": item['name'],
"materials_no": item['materials_no'],
"remark": item['remark'],
"active": item['active'],
"tensile_strength": item['tensile_strength'],
"hardness": item['hardness'],
"rough_machining": item['rough_machining'],
"finish_machining": item['finish_machining'],
"materials_id": self.env['sf.production.materials'].search(
[("materials_no", '=', item['materials_id.materials_no'])]).id,
"need_h": item['need_h'],
@@ -576,7 +588,6 @@ class MachineBrand(models.Model):
raise ValidationError("认证未通过")
class MachineToolType(models.Model):
_inherit = 'sf.machine_tool.type'
_description = '机床型号'
@@ -2034,7 +2045,6 @@ class SfToolModel(models.Model):
else:
raise ValidationError("认证未通过")
# 同步所有刀具型号列表
def sync_all_tool_model(self):
sf_sync_config = self.env['res.config.settings'].get_values()