From 9ecd95faa090fa0a48bf00f079059ec0c7122d14 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Fri, 23 Feb 2024 11:09:57 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=B4=A8=E9=87=8F=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84=E6=9D=83=E9=99=902.=E4=BF=AE=E5=A4=8Dagv?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quality/security/ir.model.access.csv | 6 +++++- sf_manufacturing/controllers/controllers.py | 12 ++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/quality/security/ir.model.access.csv b/quality/security/ir.model.access.csv index f13d0de5..ee2c26a9 100644 --- a/quality/security/ir.model.access.csv +++ b/quality/security/ir.model.access.csv @@ -9,8 +9,12 @@ access_quality_point_user,quality.point,quality.model_quality_point,quality.grou access_quality_point_test_type_user,quality.point.test_type,quality.model_quality_point_test_type,quality.group_quality_user,1,0,0,0 access_quality_check_stock_user,quality.check,quality.model_quality_check,stock.group_stock_user,1,1,1,0 access_stock_lot_user,stock.lot,stock.model_stock_lot,quality.group_quality_user,1,0,0,0 +access_stock_lot_group_quality_manager,stock_lot_group_quality_manager,stock.model_stock_lot,quality.group_quality_manager,1,0,0,0 + access_stock_pack_user,stock.move.line,stock.model_stock_move_line,quality.group_quality_user,1,0,0,0 -access_stock_picking,stock.move.line,stock.model_stock_picking,quality.group_quality_user,1,0,0,0 +access_stock_picking_group_quality_user,stock_picking_group_quality_user,stock.model_stock_picking,quality.group_quality_user,1,0,0,0 +access_stock_picking_group_quality_manager,stock_picking_group_quality_manager,stock.model_stock_picking,quality.group_quality_manager,1,0,0,0 + access_quality_alert_team_manager,quality.alert.team,quality.model_quality_alert_team,quality.group_quality_manager,1,1,1,1 access_quality_check_manager,quality.check,quality.model_quality_check,quality.group_quality_manager,1,1,1,1 access_quality_alert_manager,quality.alert,quality.model_quality_alert,quality.group_quality_manager,1,1,1,1 diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index bb0bd331..fe1a3776 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -337,8 +337,10 @@ class Manufacturing_Connect(http.Controller): workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search( [('feeder_station_destination', '=', ret['DeviceId'])]) if workpiece_delivery: - logging.info('workpiece_delivery.production_id:%s' % workpiece_delivery.production_id.id) - workpiece_delivery.production_id.write({'production_line_state': '已上产线'}) + for wd in workpiece_delivery: + if wd.production_id.production_line_state == '待上产线': + logging.info('wd.production_id:%s' % workpiece_delivery.production_id.id) + wd.production_id.write({'production_line_state': '已上产线'}) else: res = {'Succeed': False, 'ErrorCode': 203, 'Error': '该DeviceId没有对应的工件配送数据'} else: @@ -367,8 +369,10 @@ class Manufacturing_Connect(http.Controller): workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search( [('feeder_station_destination', '=', ret['DeviceId'])]) if workpiece_delivery: - logging.info('workpiece_delivery.production_id:%s' % workpiece_delivery.production_id.id) - workpiece_delivery.production_id.write({'production_line_state': '已下产线'}) + for wd in workpiece_delivery: + if wd.production_id.production_line_state == '已上产线': + logging.info('wd.production_id:%s' % workpiece_delivery.production_id.id) + wd.production_id.write({'production_line_state': '已下产线'}) else: res = {'Succeed': False, 'ErrorCode': 203, 'Error': '该DeviceId没有对应的工件配送数据'} else: