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

合并代码

Browse Source
This commit is contained in:
gqh
2022-11-08 11:44:37 +08:00
parent dc24df19c2
commit edd6c30176
6 changed files with 141 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sf_route_workcenter/models/workcenter.py
View File

@@ -129,6 +129,9 @@ class MrpWorkOrder(models.Model):
# 扫码绑定托盘方法
def gettray(self):
return ""
#解除托盘绑定
def unbindtray(self):
return ""
# 计算配料中心点和与x轴倾斜度方法
def getcenter(self):

26
sf_route_workcenter/views/sf_workorder.xml
View File

@@ -7,19 +7,19 @@
<field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
<field name="arch" type="xml">
<xpath expr="//page[last()]" position="after">
<page string="获取CNC加工程序">
<page string="获取CNC加工程序" attrs='{"invisible": [("routing_type","!=","获取CNC加工程序")]}'>
<group>
<field name="cnc_id" widget="many2many_binary"/>
</group>
</page>
</xpath>
<xpath expr="//page[last()]" position="after">
<page string="装夹托盘">
<group>
<xpath expr="//page[last()]" position="after" >
<page string="装夹托盘" attrs='{"invisible": [("routing_type","!=","装夹")]}'>
<group >
<field name="processing_panel" readonly = "1"/>
<field name="routing_type" invisible="1"/>
<field name="processing_panel" readonly = "1" />
<div class="col-12 col-lg-6 o_setting_box">
<button type="object" class="oe_highlight" name="gettray" string="扫描托盘"
attrs='{"invisible": [("production_id","=",False)]}'
@@ -32,7 +32,7 @@
</xpath>
<xpath expr="//page[last()]" position="after">
<page string="三元前置检测定位参数">
<page string="三元前置检测定位参数" attrs='{"invisible": [("routing_type","!=","前置三元定位检测")]}'>
<group>
<group>
<field name="processing_panel" readonly = "1"/>
@@ -151,7 +151,7 @@
</xpath>
<xpath expr="//page[last()]" position="after">
<page string="CNC加工">
<page string="CNC加工" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
<group>
<field name="cnc_ids" widget="one2many"/>
@@ -161,7 +161,7 @@
</xpath>
<xpath expr="//page[last()]" position="after">
<page string="后置三元检测">
<page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","后置三元质量检测")]}'>
<group>
<field name="test_results" widget="radio"/>
<div class="col-12 col-lg-6 o_setting_box">
@@ -180,8 +180,12 @@
</xpath>
<xpath expr="//page[last()]" position="after">
<page string="解除装夹">
<field name="test_results" widget="radio"/>
<page string="解除装夹" attrs='{"invisible": [("routing_type","!=","解除装夹")]}' >
<div class="col-12 col-lg-6 o_setting_box">
<button type="object" class="oe_highlight" name="unbindtray" string="解除装夹"
/>
</div>
</page>
</xpath>