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

1.刀具基本参数新增适配夹头尺寸字段，2.优化采购订单确认订单方法

Browse Source
This commit is contained in:
jinling.yang
2023-12-29 09:31:41 +08:00
parent 8be6373b77
commit 1cf5cd41b4
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_base/models/tool_other_features.py
View File

@@ -90,6 +90,7 @@ class ToolMaterialsBasicParameters(models.Model):
# 刀柄参数 # 刀柄参数
flange_shank_length = fields.Float('法兰柄长(mm)') flange_shank_length = fields.Float('法兰柄长(mm)')
flange_diameter = fields.Float('法兰直径(mm)') flange_diameter = fields.Float('法兰直径(mm)')
fit_chuck_size = fields.Char('适配夹头尺寸')
handle_external_diameter = fields.Float('柄部外径(mm)') handle_external_diameter = fields.Float('柄部外径(mm)')
handle_inside_diameter = fields.Float('柄部内径(mm)') handle_inside_diameter = fields.Float('柄部内径(mm)')
dynamic_balance_class = fields.Char('动平衡等级') dynamic_balance_class = fields.Char('动平衡等级')
@@ -245,7 +246,6 @@ class ToolMaterialsBasicParameters(models.Model):
'cutting_tool_type': obj['cutting_tool_type'], 'cutting_tool_type': obj['cutting_tool_type'],
'total_length': obj['total_length'], 'total_length': obj['total_length'],
'flange_shank_length': obj['flange_shank_length'], 'flange_shank_length': obj['flange_shank_length'],
'handle_external_diameter': obj['handle_external_diameter'],
'handle_inside_diameter': obj['handle_inside_diameter'], 'handle_inside_diameter': obj['handle_inside_diameter'],
'min_clamping_diameter': obj['min_clamping_diameter'], 'min_clamping_diameter': obj['min_clamping_diameter'],
'max_clamping_diameter': obj['max_clamping_diameter'], 'max_clamping_diameter': obj['max_clamping_diameter'],

1
sf_base/views/tool_views.xml
View File

@@ -316,7 +316,6 @@
<field name="name"/> <field name="name"/>
<field name="total_length"/> <field name="total_length"/>
<field name="flange_shank_length"/> <field name="flange_shank_length"/>
<field name="handle_external_diameter" class="diameter"/>
<field name="handle_inside_diameter" class="diameter"/> <field name="handle_inside_diameter" class="diameter"/>
<field name="min_clamping_diameter" class="diameter"/> <field name="min_clamping_diameter" class="diameter"/>
<field name="max_clamping_diameter" class="diameter"/> <field name="max_clamping_diameter" class="diameter"/>

6
sf_dlm_management/views/product_template_management_view.xml
View File

@@ -28,13 +28,13 @@
options="{'no_create': True}" options="{'no_create': True}"
attrs="{'invisible': ['|',('categ_type', '!=', '表面工艺'),('categ_type', '=', False)]}"/> attrs="{'invisible': ['|',('categ_type', '!=', '表面工艺'),('categ_type', '=', False)]}"/>
<field name="cutting_tool_material_id" <field name="cutting_tool_material_id"
attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('create_uid', '!=', False)]}" attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('categ_type', '!=', False)]}"
placeholder="请选择"/> placeholder="请选择"/>
<field name="cutting_tool_model_id" placeholder="请选择" <field name="cutting_tool_model_id" placeholder="请选择"
attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('create_uid', '!=', False)]}" attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('categ_type', '!=', False)]}"
domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/> domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/>
<field name="specification_id" placeholder="请选择" <field name="specification_id" placeholder="请选择"
attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('create_uid', '!=', False)]}" attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('categ_type', '!=', False)]}"
domain="[('standard_library_id','=',cutting_tool_model_id)]"/> domain="[('standard_library_id','=',cutting_tool_model_id)]"/>
<field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}" <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
placeholder="请选择"/> placeholder="请选择"/>

3
sf_sale/models/sale_order.py
View File

@@ -103,7 +103,8 @@ class RePurchaseOrder(models.Model):
def button_confirm(self): def button_confirm(self):
self.check_status = 'pending' self.check_status = 'pending'
return super().button_confirm() res = super().button_confirm()
return res
class ResPartnerToSale(models.Model): class ResPartnerToSale(models.Model):