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-07 10:59:22 +08:00
parent 671901cb8d
commit a49a24e9e6
18 changed files with 336 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sf_route_workcenter/models/workcenter.py
View File

@@ -8,8 +8,7 @@ import qrcode
from io import BytesIO
from odoo import api, fields, models
import barcode
from barcode.writer import ImageWriter
from pystrich.code128 import Code128Encoder
from odoo.exceptions import UserError
@@ -20,7 +19,7 @@ class CNCprocessing(models.Model):
_inherit = 'cnc.processing'
_description = "CNC加工"
workorder_id = fields.Many2one('mrp.workorder' ,string="工单")
workorder_id = fields.Many2one('mrp.workorder', string="工单")
class Tray(models.Model):
@@ -86,21 +85,15 @@ class MrpWorkOrder(models.Model):
_inherit = 'mrp.workorder'
_description = '工单'
tray_id = fields.Many2one('sf.tray', string="托盘")
tray_code = fields.Char(
string='托盘编码',
related='tray_id.code')
tray_state = fields.Selection(
string='托盘状态',
related='tray_id.state')
tray_ids = fields.One2many('sf.tray', 'workorder_id', string='托盘')
# def get_tray_info(self):
# @api.onchange('X_axis', 'Y_axis', 'Z_axis')
# def get_center_point(self):
# return 'X:%s,Y:%s,Z:%s' % (self.X_axis, self.Y_axis, self.Z_axis)
# 加工面
surface = fields.Selection([("前面", "前面"), ("后面", "后面"), ("左面", "左面"), ("右面", "右面"),
("上面", "上面")], required=True, default="顶面", string="加工面")
("上面", "上面")], string="加工面1")
material_center_point = fields.Char(string='配料中心点')
X1_axis = fields.Float(string='Lx1', default=0)
Y1_axis = fields.Float(string='Ly1', default=0)
@@ -178,7 +171,8 @@ class MrpWorkOrder(models.Model):
test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], string="检测结果")
cnc_ids = fields.One2many("cnc.processing",'workorder_id', string="CNC加工")
cnc_ids = fields.One2many("cnc.processing", 'workorder_id', string="CNC加工")
# @api.depends('tray_id')
# def updateTrayState(self):
#
@@ -193,6 +187,11 @@ class MrpWorkOrder(models.Model):
# 'state': "占用",
# }
# )
def recreateManufacturing(self):
return ""
def recreateWorkerOrder(self):
return ""
'''

3
sf_route_workcenter/views/sf_tray_view.xml
View File

@@ -14,7 +14,8 @@
attrs='{"invisible": [("production_id","=",False)]}'/>
<field name="workorder_id"/>
</group>
<div class="col-12 col-lg-6 o_setting_box">
<div class="col
-12 col-lg-6 o_setting_box">
<button type="object" class="oe_highlight" name="unclamp" string="解除装夹"
attrs='{"invisible": [("state","=","空闲")]}'/>
</div>

80
sf_route_workcenter/views/sf_workorder.xml
View File

@@ -12,8 +12,10 @@
<field name="surface" widget="radio"/>
<div class="col-12 col-lg-6 o_setting_box">
<button type="object" class="oe_highlight" name="gettray" string="扫描托盘"
attrs='{"invisible": [("production_id","=",False)]}'
/>
</div>
</group>
</page>
@@ -29,6 +31,8 @@
</group>
<group>
<div>左面:</div>
<div></div>
<div class="o_address_city">
<label for="X1_axis" string="Lx1"/>
<field name='X1_axis' class="o_address_city"/>
@@ -45,72 +49,76 @@
<label for="Z2_axis" string="Lz2"/>
<field name='Z2_axis' class="o_address_city"/>
</div>
<div>前面:</div>
<div></div>
<div class="o_address_city">
<label for="X3_axis" string="Fx3"/>
<label for="X3_axis" string="Fx1"/>
<field name='X3_axis' class="o_address_city"/>
<label for="Y3_axis" string="Fy3"/>
<label for="Y3_axis" string="Fy1"/>
<field name='Y3_axis' class="o_address_city"/>
<label for="Z3_axis" string="Fz3"/>
<label for="Z3_axis" string="Fz1"/>
<field name='Z3_axis' class="o_address_city"/>
</div>
<div class="o_address_city">
<label for="X4_axis" string="Fx4"/>
<label for="X4_axis" string="Fx2"/>
<field name='X4_axis' class="o_address_city"/>
<label for="Y4_axis" string="Fy4"/>
<label for="Y4_axis" string="Fy2"/>
<field name='Y4_axis' class="o_address_city"/>
<label for="Z4_axis" string="Fz4"/>
<label for="Z4_axis" string="Fz2"/>
<field name='Z4_axis' class="o_address_city"/>
</div>
<div>右面:</div>
<div></div>
<div class="o_address_city">
<label for="X5_axis" string="Rx5"/>
<label for="X5_axis" string="Rx1"/>
<field name='X5_axis' class="o_address_city"/>
<label for="Y5_axis" string="Ry5"/>
<label for="Y5_axis" string="Ry1"/>
<field name='Y5_axis' class="o_address_city"/>
<label for="Z5_axis" string="Rz5"/>
<label for="Z5_axis" string="Rz1"/>
<field name='Z5_axis' class="o_address_city"/>
</div>
<div class="o_address_city">
<label for="X6_axis" string="Rx6"/>
<label for="X6_axis" string="Rx2"/>
<field name='X6_axis' class="o_address_city"/>
<label for="Y6_axis" string="Ry6"/>
<label for="Y6_axis" string="Ry2"/>
<field name='Y6_axis' class="o_address_city"/>
<label for="Z6_axis" string="Rz6"/>
<label for="Z6_axis" string="Rz2"/>
<field name='Z6_axis' class="o_address_city"/>
</div>
<div>下面:</div>
<div></div>
<div class="o_address_city">
<label for="X7_axis" string="Bx7"/>
<label for="X7_axis" string="Bx1"/>
<field name='X7_axis' class="o_address_city"/>
<label for="Y7_axis" string="By7"/>
<label for="Y7_axis" string="By1"/>
<field name='Y7_axis' class="o_address_city"/>
<label for="Z7_axis" string="Bz7"/>
<label for="Z7_axis" string="Bz1"/>
<field name='Z7_axis' class="o_address_city"/>
</div>
<div class="o_address_city">
<label for="X8_axis" string="Bx8"/>
<label for="X8_axis" string="Bx2"/>
<field name='X8_axis' class="o_address_city"/>
<label for="Y8_axis" string="By8"/>
<label for="Y8_axis" string="By2"/>
<field name='Y8_axis' class="o_address_city"/>
<label for="Z8_axis" string="Bz8"/>
<label for="Z8_axis" string="Bz2"/>
<field name='Z8_axis' class="o_address_city"/>
</div>
<div>上面:</div>
<div></div>
<div class="o_address_city">
<label for="X9_axis" string="Ux9"/>
<label for="X9_axis" string="Ux1"/>
<field name='X9_axis' class="o_address_city"/>
<label for="Y9_axis" string="Uy9"/>
<label for="Y9_axis" string="Uy1"/>
<field name='Y9_axis' class="o_address_city"/>
<label for="Z9_axis" string="Uz9"/>
<label for="Z9_axis" string="Uz1"/>
<field name='Z9_axis' class="o_address_city"/>
</div>
<div class="o_address_city">
<label for="X10_axis" string="Ux10"/>
<label for="X10_axis" string="Ux2"/>
<field name='X10_axis' class="o_address_city"/>
<label for="Y10_axis" string="Uy10"/>
<label for="Y10_axis" string="Uy2"/>
<field name='Y10_axis' class="o_address_city"/>
<label for="Z10_axis" string="Uz10"/>
<label for="Z10_axis" string="Uz2"/>
<field name='Z10_axis' class="o_address_city"/>
</div>
@@ -146,11 +154,27 @@
<page string="后置三元检测">
<group>
<field name="test_results" widget="radio"/>
<div class="col-12 col-lg-6 o_setting_box">
<button type="object" class="oe_highlight" name="recreateWorkerOrder" string="重新生成工单"
attrs='{"invisible": [("test_results","!=","返工")]}'
/>
</div>
<div class="col-12 col-lg-6 o_setting_box">
<button type="object" class="oe_highlight" name="recreateManufacturing" string="重新生成制造订单"
attrs='{"invisible": [("test_results","!=","报废")]}'
/>
</div>
</group>
</page>
</xpath>
<xpath expr="//page[last()]" position="after">
<page string="解除装夹">
<field name="test_results" widget="radio"/>
</page>
</xpath>
</field>
</record>