Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协修复

# Conflicts: # sf_sale/views/sale_order_view.xml
2024-05-17 11:00:58 +08:00
parent ea1ed43c92 af45775040
commit 7e31869d1f
22 changed files with 254 additions and 66 deletions
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -60,6 +60,7 @@ class Sf_Mrs_Connect(http.Controller):
                    cnc_processing = request.env['sf.cnc.processing'].with_user(
                        request.env.ref("base.user_admin")).cnc_processing_create(cnc_production, ret, program_path,
                                                                                  program_path_tmp)
+                    logging.info('cnc_processing111:%s' % cnc_processing)
                    if cnc_processing:
                        cnc_processing_arr.append(cnc_processing._json_cnc_processing(cnc_processing))
                if cnc_program and cnc_processing_arr: