Accept Merge Request #1900: (feature/制造工单优化 -> develop)

Merge Request: 1、处理调拨单二次验证时其他提示信息窗口直接关闭问题;2、处理特殊途径-制造订单内外协调拨单质量检查不通过,点击跳转质量检查页面报错 问题

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1900
This commit is contained in:
禹翔辉
2025-03-13 13:05:44 +08:00
committed by Coding
3 changed files with 5 additions and 4 deletions

View File

@@ -190,6 +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")
# For components registration
move_id = fields.Many2one(

View File

@@ -122,8 +122,8 @@ class PickingCheckCancelWizard(models.TransientModel):
picking_id = fields.Many2one('stock.picking', 'stock picking')
def confirm_picking_check(self):
self.picking_id.action_cancel()
return {'type': 'ir.actions.act_window_close'}
res = self.picking_id.action_cancel()
return res
def cancel_picking_check(self):
# 这里是取消后的逻辑

View File

@@ -9,8 +9,8 @@ class PickingValidateCheckWizard(models.TransientModel):
fail_check_text = fields.Text('提示信息')
def confirm_picking_validate_check(self):
self.picking_id.button_validate()
return {'type': 'ir.actions.act_window_close'}
res = self.picking_id.button_validate()
return res
def cancel_picking_validate_check(self):
# 这里是取消后的逻辑