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
2022-11-22 11:08:07 +08:00
parent 3cbd1140bb
commit 12615b3dba
8 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sf_manufacturing/models/mrp_production.py
View File

@@ -2,6 +2,7 @@
from odoo import api, fields, models
class MrpProduction(models.Model):
_inherit = 'mrp.production'
_description = "制造订单"
@@ -69,7 +70,7 @@ class MrpProduction(models.Model):
# 则根据设备找到工作中心；否则采用前面描述的工作中心分配机制；
# 其他规则限制： 默认只分配给工作中心状态为非故障的工作中心；
def _create_workorder(self):
def _create_workorder3(self):
for production in self:
if not production.bom_id or not production.product_id:
continue
@@ -214,6 +215,6 @@ class MrpProduction(models.Model):
current_sequence += 1
def _create_workorder(self):
res = super()._create_workorder()
res = self._create_workorder3()
self._reset_work_order_sequence()
return res

60
sf_manufacturing/models/mrp_workorder.py
View File

@@ -17,36 +17,36 @@ class ResMrpWorkOrder(models.Model):
('解除装夹', '解除装夹'),
], string="工序类型")
material_center_point = fields.Char(string='配料中心点')
X1_axis = fields.Float(string='Lx1', default=0)
Y1_axis = fields.Float(string='Ly1', default=0)
Z1_axis = fields.Float(string='Lz1', default=0)
X2_axis = fields.Float(string='Lx2', default=0)
Y2_axis = fields.Float(string='Ly2', default=0)
Z2_axis = fields.Float(string='Lz2', default=0)
X3_axis = fields.Float(string='Fx3', default=0)
Y3_axis = fields.Float(string='Fy3', default=0)
Z3_axis = fields.Float(string='Fz3', default=0)
X4_axis = fields.Float(string='Fx4', default=0)
Y4_axis = fields.Float(string='Fy4', default=0)
Z4_axis = fields.Float(string='Fz4', default=0)
X5_axis = fields.Float(string='Rx5', default=0)
Y5_axis = fields.Float(string='Ry5', default=0)
Z5_axis = fields.Float(string='Rz5', default=0)
X6_axis = fields.Float(string='Rx6', default=0)
Y6_axis = fields.Float(string='Ry6', default=0)
Z6_axis = fields.Float(string='Rz6', default=0)
X7_axis = fields.Float(string='Bx7', default=0)
Y7_axis = fields.Float(string='By7', default=0)
Z7_axis = fields.Float(string='Bz7', default=0)
X8_axis = fields.Float(string='Bx8', default=0)
Y8_axis = fields.Float(string='By8', default=0)
Z8_axis = fields.Float(string='Bz8', default=0)
X9_axis = fields.Float(string='Uz9', default=0)
Y9_axis = fields.Float(string='Uz9', default=0)
Z9_axis = fields.Float(string='Uz9', default=0)
X10_axis = fields.Float(string='Uz10', default=0)
Y10_axis = fields.Float(string='Uz10', default=0)
Z10_axis = fields.Float(string='Uz10', default=0)
X1_axis = fields.Float(default=0)
Y1_axis = fields.Float(default=0)
Z1_axis = fields.Float(default=0)
X2_axis = fields.Float(default=0)
Y2_axis = fields.Float(default=0)
Z2_axis = fields.Float(default=0)
X3_axis = fields.Float(default=0)
Y3_axis = fields.Float(default=0)
Z3_axis = fields.Float(default=0)
X4_axis = fields.Float(default=0)
Y4_axis = fields.Float(default=0)
Z4_axis = fields.Float(default=0)
X5_axis = fields.Float(default=0)
Y5_axis = fields.Float(default=0)
Z5_axis = fields.Float(default=0)
X6_axis = fields.Float(default=0)
Y6_axis = fields.Float(default=0)
Z6_axis = fields.Float(default=0)
X7_axis = fields.Float(default=0)
Y7_axis = fields.Float(default=0)
Z7_axis = fields.Float(default=0)
X8_axis = fields.Float(default=0)
Y8_axis = fields.Float(default=0)
Z8_axis = fields.Float(default=0)
X9_axis = fields.Float(default=0)
Y9_axis = fields.Float(default=0)
Z9_axis = fields.Float(default=0)
X10_axis = fields.Float(default=0)
Y10_axis = fields.Float(default=0)
Z10_axis = fields.Float(default=0)
X_deviation_angle = fields.Integer(string="X轴偏差度", default=0)
test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], string="检测结果")
cnc_ids = fields.One2many("sf.cnc.processing", 'workorder_id', string="CNC加工")