Merge branch 'feature/从ftp获取cnc程序文件' into develop

# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py

sf_mrs_connect/controllers/controllers.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import json
 import logging
+import os
 from datetime import date, timedelta
 from odoo import http
 from odoo.http import request
@@ -22,6 +23,12 @@ class Sf_Mrs_Connect(http.Controller):
             ret = json.loads(datas)
             ret = json.loads(ret['result'])
             for obj in ret:
-                request.env['sf.cnc.processing'].with_user(request.env.ref("base.user_admin")).CNCprocessing_create(obj)
+                cnc = request.env['sf.cnc.processing'].with_user(request.env.ref("base.user_admin")).CNCprocessing_create(obj)
+                # 从ftp拉取对应的文件
+                model_code = cnc.workorder_id.product_id.barcode
+                processing_panel = cnc.workorder_id.processing_panel
+                server_dir = cnc.with_user(request.env.ref("base.user_admin")).download_file_tmp(model_code, processing_panel)
+                cnc_file_path = os.path.join(server_dir, cnc.program_name + '.NC')
+                cnc.with_user(request.env.ref("base.user_admin")).write_file(cnc_file_path, cnc)
         except Exception as e:
             logging.info('get_cnc_processing_create error:%s' % e)