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

1

Browse Source
This commit is contained in:
yuxianghui
2024-04-23 14:19:55 +08:00
parent f1dad7701f
commit 1fa5ebd80a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/controllers/controllers.py
View File

@@ -467,7 +467,7 @@ class Manufacturing_Connect(http.Controller):
logging.info('DeviceId:%s' % ret['DeviceId']) logging.info('DeviceId:%s' % ret['DeviceId'])
workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search( workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
[('feeder_station_start_id.name', '=', ret['DeviceId']), [('feeder_station_start_id.name', '=', ret['DeviceId']),
('status', '=', '已配送'), ('type', '=', '上产线')], order='id asc') ('status', '=', '已配送'), ('type', '=', '下产线')], order='id asc')
if workpiece_delivery: if workpiece_delivery:
for wd in workpiece_delivery: for wd in workpiece_delivery:
logging.info('wd.production_id:%s' % wd.production_id.name) logging.info('wd.production_id:%s' % wd.production_id.name)

4
sf_mrs_connect/controllers/controllers.py
View File

@@ -29,8 +29,8 @@ class Sf_Mrs_Connect(http.Controller):
request.env.ref("base.user_admin")).search([('name', '=', ret['production_order_no'])]) request.env.ref("base.user_admin")).search([('name', '=', ret['production_order_no'])])
logging.info('制造订单号:%s' % cnc_production.name) logging.info('制造订单号:%s' % cnc_production.name)
if cnc_production: if cnc_production:
if ret['glb_file']: # if ret['glb_file']:
cnc_production.glb_file = base64.b64encode(ret['glb_file']) # cnc_production.glb_file = base64.b64encode(ret['glb_file'])
# 拉取所有加工面的程序文件 # 拉取所有加工面的程序文件
# i = 1 # i = 1