diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 108486e0..8470530c 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -90,7 +90,7 @@ class ResMrpWorkOrder(models.Model): ('state', '!=', 'cancel') ]) finish_move = next((move for move in moves if move.location_dest_id.name == '制造后'), None) - if not finish_move and not cur_workorder.is_subcontract and not cur_workorder.name == '解除装夹': + if not finish_move and not cur_workorder.is_subcontract and not cur_workorder.routing_type == '解除装夹': record.back_button_display = True else: record.back_button_display = any( @@ -104,8 +104,11 @@ class ResMrpWorkOrder(models.Model): else: record.back_button_display = False # tag_type - if cur_workorder.is_subcontract or cur_workorder.name == '解除装夹' or any( - detection_result.processing_panel == cur_workorder.processing_panel and detection_result.routing_type == cur_workorder.routing_type and cur_workorder.tag_type !='重新加工' + if cur_workorder.is_subcontract or cur_workorder.routing_type == '解除装夹' or cur_workorder.routing_type == '切割' or any( + detection_result.processing_panel == cur_workorder.processing_panel and + detection_result.routing_type == cur_workorder.routing_type and + cur_workorder.tag_type !='重新加工' and + detection_result.test_results != '合格' for detection_result in cur_workorder.production_id.detection_result_ids ): record.back_button_display = False @@ -117,8 +120,11 @@ class ResMrpWorkOrder(models.Model): record.back_button_display = True else: record.back_button_display = False - if cur_workorder.is_subcontract or cur_workorder.name == '解除装夹' or any( - detection_result.processing_panel == cur_workorder.processing_panel and detection_result.routing_type == cur_workorder.routing_type and cur_workorder.tag_type !='重新加工' + if cur_workorder.is_subcontract or cur_workorder.routing_type == '解除装夹' or cur_workorder.routing_type == '切割' or any( + detection_result.processing_panel == cur_workorder.processing_panel and + detection_result.routing_type == cur_workorder.routing_type and + cur_workorder.tag_type !='重新加工' and + detection_result.test_results != '合格' for detection_result in cur_workorder.production_id.detection_result_ids ): record.back_button_display = False diff --git a/sf_manufacturing/models/purchase_order.py b/sf_manufacturing/models/purchase_order.py index a16eb120..398db85b 100644 --- a/sf_manufacturing/models/purchase_order.py +++ b/sf_manufacturing/models/purchase_order.py @@ -110,7 +110,7 @@ class PurchaseOrderLine(models.Model): _inherit = 'purchase.order.line' part_number = fields.Char('零件图号', store=True, compute='_compute_related_product') - part_name = fields.Char('零件图号', store=True, + part_name = fields.Char('零件名称', store=True, compute='_compute_related_product') related_product = fields.Many2one('product.product', string='关联产品', help='经此产品工艺加工成的成品') diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index d7444afb..b4a05353 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -2305,8 +2305,6 @@ class Cutting_tool_standard_library(models.Model): result = json.loads(r['result']) if result['status'] == 1: for item in result['cutting_tool_standard_library_all_list']: - if item['code'] == 'JKM-T-DJWL-ZTDJ-20250225001': - print('qwfhuiuiohfqwuio') cutting_tool_standard_library = self.search( [("code", '=', item['code']), ("active", 'in', [True, False])])