优化制造订单的获取cnc程序

sf_mrs_connect/controllers/controllers.py

@@ -48,7 +48,7 @@ class Sf_Mrs_Connect(http.Controller):
                 # 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)
-                cnc_processing_arr = None
+                cnc_processing_arr = []
                 for f in files:
                     program_path = os.path.join(program_path_tmp, f)
                     logging.info('cnc程序路径 :%s' % program_path)
@@ -60,15 +60,11 @@ class Sf_Mrs_Connect(http.Controller):
                         request.env.ref("base.user_admin")).cnc_processing_create(cnc_production, ret, program_path,
                                                                                   program_path_tmp)
                     if cnc_processing:
-                        if cnc_processing_arr is None:
-                            cnc_processing_arr = cnc_processing
-                        else:
-                            cnc_processing_arr |= cnc_processing
-
+                        cnc_processing_arr.append(cnc_processing._json_cnc_processing(cnc_processing))
                 if cnc_program and cnc_processing_arr:
+                    cnc_program.write({'programming_state': '已编程', 'work_state': '已编程'})
                     cnc_program.workorder_ids.filtered(lambda b: b.routing_type == 'CNC加工').write(
                         {'cnc_ids': cnc_processing_arr})
-
                 return json.JSONEncoder().encode(res)
             else:
                 res = {'status': 0, 'message': '该制造订单暂未开始'}