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

Accept Merge Request #840: (feature/修复agv接口 -> develop)

Browse Source 
Merge Request: 修复agv接口

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/840?initial=true
This commit is contained in:
杨金灵
2024-02-23 11:12:05 +08:00
committed by Coding
parent 85a4fa49a4 9ecd95faa0
commit 2b9c088d1d
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
quality/security/ir.model.access.csv
View File

@@ -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
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
9 access_quality_point_test_type_user quality.point.test_type quality.model_quality_point_test_type quality.group_quality_user 1 0 0 0
10 access_quality_check_stock_user quality.check quality.model_quality_check stock.group_stock_user 1 1 1 0
11 access_stock_lot_user stock.lot stock.model_stock_lot quality.group_quality_user 1 0 0 0
12 access_stock_lot_group_quality_manager stock_lot_group_quality_manager stock.model_stock_lot quality.group_quality_manager 1 0 0 0
13 access_stock_pack_user stock.move.line stock.model_stock_move_line quality.group_quality_user 1 0 0 0
14 access_stock_pack_user access_stock_picking_group_quality_user stock.move.line stock_picking_group_quality_user stock.model_stock_move_line stock.model_stock_picking quality.group_quality_user 1 0 0 0
15 access_stock_picking access_stock_picking_group_quality_manager stock.move.line stock_picking_group_quality_manager stock.model_stock_picking quality.group_quality_user quality.group_quality_manager 1 0 0 0
16 access_quality_alert_team_manager quality.alert.team quality.model_quality_alert_team quality.group_quality_manager 1 1 1 1
17 access_quality_check_manager quality.check quality.model_quality_check quality.group_quality_manager 1 1 1 1
18 access_quality_alert_team_manager access_quality_alert_manager quality.alert.team quality.alert quality.model_quality_alert_team quality.model_quality_alert quality.group_quality_manager 1 1 1 1
19 access_quality_check_manager access_quality_reason_manager quality.check quality.reason quality.model_quality_check quality.model_quality_reason quality.group_quality_manager 1 1 1 1
20 access_quality_alert_manager access_quality_tag_manager quality.alert quality.tag quality.model_quality_alert quality.model_quality_tag quality.group_quality_manager 1 1 1 1

12
sf_manufacturing/controllers/controllers.py
View File

@@ -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: