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

Accept Merge Request #1729: (feature/零件图号名称优化需求 -> develop)

Browse Source 
Merge Request: 制造订单、工单页面导航优化

Created By: @管欢
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1729
This commit is contained in:
管欢
2025-01-13 10:56:28 +08:00
committed by Coding
parent 0eaafbf11b 5aca6d0685
commit a78b1c7eaf
8 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/models/mrp_production.py
View File

@@ -20,7 +20,7 @@ class MrpProduction(models.Model):
_description = "制造订单"
_order = 'create_date desc'
sale_order_id = fields.Many2one('sale.order', string='销售订单', compute='_compute_sale_order_id', store=True)
deadline_of_delivery = fields.Date('订单交期', tracking=True, compute='_compute_deadline_of_delivery')
deadline_of_delivery = fields.Date('订单交期', tracking=True, compute='_compute_deadline_of_delivery', store=True)
# tray_ids = fields.One2many('sf.tray', 'production_id', string="托盘")
maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Number of maintenance requests")
request_ids = fields.One2many('maintenance.request', 'production_id')

15
sf_manufacturing/models/mrp_workorder.py
View File

@@ -40,6 +40,11 @@ class ResMrpWorkOrder(models.Model):
# workcenter_id = fields.Many2one('mrp.workcenter', string='工作中心', required=False)
users_ids = fields.Many2many("res.users", 'users_workorder', related="workcenter_id.users_ids")
processing_panel = fields.Char('加工面')
processing_panel_selection = fields.Selection([
('ZM', 'ZM'),
('FM', 'FM'),
('YC', 'YC'),
('QC', 'QC')], string="加工面", compute='_compute_processing_panel_selection', store=True)
sequence = fields.Integer(string='工序')
routing_type = fields.Selection([
('装夹预调', '装夹预调'),
@@ -63,6 +68,14 @@ class ResMrpWorkOrder(models.Model):
delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
tracking=True)
@api.depends('processing_panel')
def _compute_processing_panel_selection(self):
for record in self:
if record.processing_panel in ['ZM', 'FM', 'YC', 'QC']:
record.processing_panel_selection = record.processing_panel
else:
record.processing_panel_selection = False
@api.depends('production_id.manual_quotation')
def _compute_manual_quotation(self):
for item in self:
@@ -130,7 +143,7 @@ class ResMrpWorkOrder(models.Model):
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([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], default='合格',
test_results = fields.Selection([("合格", "合格"), ("返工", "返工")], default='合格',
string="检测结果", tracking=True)
cnc_ids = fields.One2many("sf.cnc.processing", 'workorder_id', string="CNC加工程序")
cmm_ids = fields.One2many("sf.cmm.program", 'workorder_id', string="CMM程序")