diff --git a/sf_bf_connect/models/process_status.py b/sf_bf_connect/models/process_status.py index 09fecfae..47ad70f1 100644 --- a/sf_bf_connect/models/process_status.py +++ b/sf_bf_connect/models/process_status.py @@ -49,15 +49,15 @@ class StatusChange(models.Model): 'process_start_time': process_start_time, }, } - url1 = config['bfm_url_new'] + '/api/get/state/get_order' - ret = requests.post(url1, json=json1, data=None) - ret = ret.json() - if not ret.get('error'): - logging.info('接口已经执行=============') - else: - traceback_error = traceback.format_exc() - logging.error("bfm订单状态同步失败:%s" % traceback_error) - raise UserError('工厂加工同步订单状态到bfm失败') + # url1 = config['bfm_url_new'] + '/api/get/state/get_order' + # ret = requests.post(url1, json=json1, data=None) + # ret = ret.json() + # if not ret.get('error'): + # logging.info('接口已经执行=============') + # else: + # traceback_error = traceback.format_exc() + # logging.error("bfm订单状态同步失败:%s" % traceback_error) + # raise UserError('工厂加工同步订单状态到bfm失败') except UserError as e: traceback_error = traceback.format_exc() logging.error("工厂加工同步订单状态失败:%s " % traceback_error) diff --git a/sf_manufacturing/models/sf_technology_design.py b/sf_manufacturing/models/sf_technology_design.py index b1bd229d..8a993cf4 100644 --- a/sf_manufacturing/models/sf_technology_design.py +++ b/sf_manufacturing/models/sf_technology_design.py @@ -18,7 +18,7 @@ class sf_technology_design(models.Model): def json_technology_design_str(self, k, route, i, process_parameter): workorders_values_str = [0, '', { - 'route_id': route.id, + 'route_id': route.id if route.routing_type == '表面工艺' else route.route_workcenter_id.id, 'panel': k, 'process_parameters_id': False if route.routing_type != '表面工艺' else self.env[ 'sf.production.process.parameter'].search( diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 801806ad..50cd482c 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -328,7 +328,7 @@ class StockRule(models.Model): i += 1 technology_design_values.append( self.env['sf.technology.design'].json_technology_design_str(k, route, i, False)) - elif production.product_id.categ_id.type == '坯料': + elif production_item.product_id.categ_id.type == '坯料': embryo_routing_workcenter = self.env['sf.embryo.model.type.routing.sort'].search( [('embryo_model_type_id', '=', production_item.product_id.embryo_model_type_id.id)], order='sequence asc'