Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

2023-04-21 17:43:29 +08:00
parent dcb63ecd6c 9b05b87cb4
commit 843e44b441
2 changed files with 37 additions and 36 deletions
--- a/odoo.conf
+++ b/odoo.conf
@@ -4,7 +4,7 @@ csv_internal_sep = ,
 data_dir = /var/lib/odoo
 db_host = 172.17.0.2
 db_maxconn = 64
-db_name = sf_dev_pro
+db_name = sf_dev_odoo
 db_password = sf
 db_port = 5432
 db_sslmode = prefer
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -131,6 +131,7 @@ class MrpProduction(models.Model):
                                self.env['mrp.workorder'].json_workorder_str(k, production, route))
                # 表面工艺工序
                # 获取表面工艺id
+                if production.product_id.model_process_parameters_ids:
                    surface_technics_arr = []
                    # 工序id
                    route_workcenter_arr = []