diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 68781885..209d76f2 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -341,19 +341,19 @@ class StockRule(models.Model): is_purchase = True consecutive_process_parameters = [] m = 0 - if m == len(consecutive_process_parameters) - 1 and m != 0: - self.env['purchase.order'].get_purchase_order(consecutive_process_parameters, - production_item, - product_id_to_production_names) - if is_purchase is False and m == 0: - if len(sorted_process_parameters) == 1: - self.env['purchase.order'].get_purchase_order(sorted_process_parameters, - production_item, - product_id_to_production_names) - else: - self.env['purchase.order'].get_purchase_order(sorted_process_parameters[i], + if m == len(consecutive_process_parameters) - 1 and m != 0: + self.env['purchase.order'].get_purchase_order(consecutive_process_parameters, production_item, product_id_to_production_names) + if is_purchase is False and m == 0: + if len(sorted_process_parameters) == 1: + self.env['purchase.order'].get_purchase_order(sorted_process_parameters, + production_item, + product_id_to_production_names) + else: + self.env['purchase.order'].get_purchase_order(sorted_process_parameters[i], + production_item, + product_id_to_production_names) if not technology_design_values: if production.product_id.categ_id.type == '成品': production.product_id.model_processing_panel = 'ZM,FM' @@ -384,10 +384,12 @@ class StockRule(models.Model): self.env['sf.technology.design'].json_technology_design_str('', route_embryo, i)) surface_technics_arr = [] route_workcenter_arr = [] - aa = production.product_id.product_model_type_id.surface_technics_routing_tmpl_ids.filtered( - lambda st: st.id in production.product_id.model_process_parameters_ids.ids) + aa = production.product_id.model_process_parameters_ids.ids + aa1 = tuple(production.product_id.model_process_parameters_ids.ids) + aa2 = production.product_id.product_model_type_id.surface_technics_routing_tmpl_ids.filtered( + lambda st: st.id == 12) for process_param in production.product_id.product_model_type_id.surface_technics_routing_tmpl_ids.filtered( - lambda st: st.id in production.product_id.model_process_parameters_ids.ids): + lambda st: st.id in (12,16)): # if item.route_workcenter_id.surface_technics_id.id: # for process_param in production.product_id.model_process_parameters_ids: logging.info('process_param:%s%s' % (process_param.id, process_param.name))