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

Accept Merge Request #1902: (feature/工单Rfid优化 -> develop)

Browse Source 
Merge Request: Merge branch 'feature/制造工单优化' into feature/工单Rfid优化

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1902
This commit is contained in:
禹翔辉
2025-03-13 14:42:06 +08:00
committed by Coding
parent 326dcc8b87 2568e63712
commit b94adc9704
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mrp_workorder/models/quality.py
View File

@@ -190,7 +190,7 @@ class QualityCheck(models.Model):
# doubly linked chain for tablet view navigation
next_check_id = fields.Many2one('quality.check')
previous_check_id = fields.Many2one('quality.check')
is_produced = fields.Boolean(string="Has Been Produced")
# is_produced = fields.Boolean(string="Has Been Produced")
# For components registration
move_id = fields.Many2one(

3
quality_control/models/stock_picking.py
View File

@@ -109,6 +109,9 @@ class StockPicking(models.Model):
def action_open_quality_check_picking(self):
action = self.env["ir.actions.actions"]._for_xml_id("quality_control.quality_check_action_picking")
action['context'] = self.env.context.copy()
keys_to_remove = [key for key in action['context'] if key.startswith('default_')]
for key in keys_to_remove:
del action['context'][key]
action['context'].update({
'search_default_picking_id': [self.id],
'default_picking_id': self.id,

8
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1519,8 +1519,12 @@ class ResMrpWorkOrder(models.Model):
for workorder in record.production_id.workorder_ids:
if workorder.processing_panel == record.processing_panel:
rfid_code = workorder.rfid_code
workorder.filtered(lambda wo: wo.state != 'rework' or wo.rfid_code is not False).write(
{'rfid_code_old': rfid_code, 'rfid_code': False})
if record.is_rework is not True:
workorder.write({'rfid_code_old': rfid_code, 'rfid_code': False})
elif workorder.routing_type != '装夹预调' and workorder.state != 'rework':
workorder.write({'rfid_code_old': False, 'rfid_code': False})
elif workorder.routing_type == '装夹预调' and workorder.state != 'rework':
workorder.write({'rfid_code_old': rfid_code, 'rfid_code': False})
self.env['stock.lot'].sudo().search([('rfid', '=', rfid_code)]).write(
{'tool_material_status': '可用'})
if workorder.rfid_code:

3
sf_manufacturing/wizard/production_wizard.py
View File

@@ -48,7 +48,8 @@ class ProductionWizard(models.TransientModel):
rfid_code = workorder.rfid_code
workorder.filtered(lambda wo: wo.routing_type == '装夹预调' and wo.rfid_code is not False).write(
{'rfid_code_old': rfid_code, 'rfid_code': False})
workorder.filtered(lambda wo: wo.routing_type != '装夹预调' and wo.rfid_code is not False).write(
workorder.filtered(lambda wo: (wo.routing_type != '装夹预调' and
(wo.rfid_code_old is not False or wo.rfid_code is not False))).write(
{'rfid_code_old': False, 'rfid_code': False})
if self.is_remanufacture is True: