1.cnc工单新增程序文件字段2.优化获取编程单接口3.修复与中控对接的接口
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import logging
|
||||
import os
|
||||
import json
|
||||
import base64
|
||||
from odoo import http
|
||||
@@ -42,8 +43,10 @@ class Sf_Mrs_Connect(http.Controller):
|
||||
res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name)
|
||||
return json.JSONEncoder().encode(res)
|
||||
logging.info('创建cnc工单')
|
||||
program_path_ftp = os.path.join('/', ret['folder_name'], 'return', r)
|
||||
logging.info('cnc程序路径 :%s' % program_path_ftp)
|
||||
request.env['sf.cnc.processing'].with_user(
|
||||
request.env.ref("base.user_admin")).cnc_processing_create(cnc_production, ret)
|
||||
request.env.ref("base.user_admin")).cnc_processing_create(cnc_production, ret, program_path_ftp)
|
||||
return json.JSONEncoder().encode(res)
|
||||
else:
|
||||
res = {'status': 0, 'message': '该制造订单暂未开始'}
|
||||
|
||||
Reference in New Issue
Block a user