Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化下发编程单的同时拉取CMM程序

sf_mrs_connect/controllers/controllers.py

@@ -44,12 +44,18 @@ class Sf_Mrs_Connect(http.Controller):
                         return json.JSONEncoder().encode(res)
                 logging.info('创建cnc工单')
                 program_path_tmp = os.path.join('/tmp', ret['folder_name'], 'return', r)
+                # program_path_tmp = "C://Users//43484//Desktop//机企猫工作文档//其他//model_analysis"
                 files = os.listdir(program_path_tmp)
                 for f in files:
                     program_path = os.path.join(program_path_tmp, f)
                     logging.info('cnc程序路径 :%s' % program_path)
+                    if f.endswith(".doc"):
+                        # 插入cmm程序数据
+                        request.env['sf.cmm.program'].with_user(
+                            request.env.ref("base.user_admin")).cmm_program_create(ret, program_path, program_path_tmp)
                     request.env['sf.cnc.processing'].with_user(
-                        request.env.ref("base.user_admin")).cnc_processing_create(cnc_production, ret, program_path,program_path_tmp)
+                        request.env.ref("base.user_admin")).cnc_processing_create(cnc_production, ret, program_path,
+                                                                                  program_path_tmp)
                 return json.JSONEncoder().encode(res)
             else:
                 res = {'status': 0, 'message': '该制造订单暂未开始'}