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

Accept Merge Request #333: (feature/页面布局 -> develop)

Browse Source 
Merge Request: 去掉厂家型号字段

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/333?initial=true
This commit is contained in:
杨金灵
2023-08-21 15:37:03 +08:00
committed by Coding
parent dfc5c206fd fb8ca5f145
commit 1b3c929fa7
3 changed files with 66 additions and 48 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("热处理后密度") mf_materia_post = fields.Char("热处理后密度")
density = fields.Float("密度(kg/m³)") density = fields.Float("密度(kg/m³)")
materials_id = fields.Many2one('sf.production.materials', "材料名") 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("备注") remark = fields.Text("备注")
gain_way = fields.Selection( gain_way = fields.Selection(
[("自加工", "自加工"), ("外协", "外协"), ("采购", "采购")], [("自加工", "自加工"), ("外协", "外协"), ("采购", "采购")],

14
sf_base/views/common_view.xml
View File

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

44
sf_mrs_connect/models/sync_common.py
View File

@@ -99,25 +99,33 @@ class sfMaterialModel(models.Model):
if result['status'] == 1: if result['status'] == 1:
for item in result['materials_model_yesterday_list']: for item in result['materials_model_yesterday_list']:
if item: if item:
brand = self.env['sf.materials.model'].search( materials_model = self.env['sf.materials.model'].search(
[("materials_no", '=', item['materials_no'])]) [("materials_no", '=', item['materials_no'])])
if brand: if materials_model:
brand.id = item['id'], materials_model.id = item['id'],
brand.name = item['name'], materials_model.name = item['name'],
brand.materials_no = item['materials_no'], materials_model.materials_no = item['materials_no'],
brand.remark = item['remark'], materials_model.remark = item['remark'],
brand.active = item['active'], materials_model.tensile_strength = item['tensile_strength'],
brand.mf_materia_post = item['mf_materia_post'], materials_model.hardness = item['hardness'],
brand.materials_id = self.env['sf.production.materials'].search( 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, [("materials_no", '=', item['materials_id.materials_no'])]).id,
brand.need_h = item['need_h'], materials_model.need_h = item['need_h'],
brand.density = item['density'] materials_model.density = item['density']
else: else:
self.env['sf.materials.model'].create({ self.env['sf.materials.model'].create({
"id": item['id'], "id": item['id'],
"name": item['name'], "name": item['name'],
"materials_no": item['materials_no'], "materials_no": item['materials_no'],
"remark": item['remark'], "remark": item['remark'],
"tensile_strength": item['tensile_strength'],
"hardness": item['hardness'],
"rough_machining": item['rough_machining'],
"finish_machining": item['finish_machining'],
"active": item['active'], "active": item['active'],
"materials_id": self.env['sf.production.materials'].search( "materials_id": self.env['sf.production.materials'].search(
[("materials_no", '=', item['materials_id.materials_no'])]).id, [("materials_no", '=', item['materials_id.materials_no'])]).id,
@@ -143,14 +151,18 @@ class sfMaterialModel(models.Model):
if result['status'] == 1: if result['status'] == 1:
for item in result['materials_model_all_list']: for item in result['materials_model_all_list']:
if item: if item:
brand = self.env['sf.materials.model'].search( materials_model = self.env['sf.materials.model'].search(
[("materials_no", '=', item['materials_no'])]) [("materials_no", '=', item['materials_no'])])
if not brand: if not materials_model:
self.env['sf.materials.model'].create({ self.env['sf.materials.model'].create({
"name": item['name'], "name": item['name'],
"materials_no": item['materials_no'], "materials_no": item['materials_no'],
"remark": item['remark'], "remark": item['remark'],
"active": item['active'], "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_id": self.env['sf.production.materials'].search(
[("materials_no", '=', item['materials_id.materials_no'])]).id, [("materials_no", '=', item['materials_id.materials_no'])]).id,
"need_h": item['need_h'], "need_h": item['need_h'],
@@ -573,7 +585,6 @@ class MachineBrand(models.Model):
raise ValidationError("认证未通过") raise ValidationError("认证未通过")
class MachineToolType(models.Model): class MachineToolType(models.Model):
_inherit = 'sf.machine_tool.type' _inherit = 'sf.machine_tool.type'
_description = '机床型号' _description = '机床型号'
@@ -1492,7 +1503,6 @@ class SyncFixtureModel(models.Model):
"multi_mounting_type_id": self.env['sf.multi_mounting.type'].search( "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
[('code', '=', item['multi_mounting_type_code'])]).id, [('code', '=', item['multi_mounting_type_code'])]).id,
"brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id, "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
"manufacturer_model_number": item['manufacturer_model_number'],
"clamping_way": item['clamping_way'], "clamping_way": item['clamping_way'],
"port_type": item['port_type'], "port_type": item['port_type'],
"model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']), "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
@@ -1522,7 +1532,6 @@ class SyncFixtureModel(models.Model):
"multi_mounting_type_id": self.env['sf.multi_mounting.type'].search( "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
[('code', '=', item['multi_mounting_type_code'])]).id, [('code', '=', item['multi_mounting_type_code'])]).id,
"brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id, "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
"manufacturer_model_number": item['manufacturer_model_number'],
"clamping_way": item['clamping_way'], "clamping_way": item['clamping_way'],
"port_type": item['port_type'], "port_type": item['port_type'],
"model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']), "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
@@ -1574,7 +1583,6 @@ class SyncFixtureModel(models.Model):
"multi_mounting_type_id": self.env['sf.multi_mounting.type'].search( "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
[('code', '=', item['multi_mounting_type_code'])]).id, [('code', '=', item['multi_mounting_type_code'])]).id,
"brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id, "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
"manufacturer_model_number": item['manufacturer_model_number'],
"clamping_way": item['clamping_way'], "clamping_way": item['clamping_way'],
"port_type": item['port_type'], "port_type": item['port_type'],
"model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']), "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
@@ -1604,7 +1612,6 @@ class SyncFixtureModel(models.Model):
"multi_mounting_type_id": self.env['sf.multi_mounting.type'].search( "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
[('code', '=', item['multi_mounting_type_code'])]).id, [('code', '=', item['multi_mounting_type_code'])]).id,
"brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id, "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
"manufacturer_model_number": item['manufacturer_model_number'],
"clamping_way": item['clamping_way'], "clamping_way": item['clamping_way'],
"port_type": item['port_type'], "port_type": item['port_type'],
"model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']), "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
@@ -2031,7 +2038,6 @@ class SfToolModel(models.Model):
else: else:
raise ValidationError("认证未通过") raise ValidationError("认证未通过")
# 同步所有刀具型号列表 # 同步所有刀具型号列表
def sync_all_tool_model(self): def sync_all_tool_model(self):
sf_sync_config = self.env['res.config.settings'].get_values() sf_sync_config = self.env['res.config.settings'].get_values()