diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py index 5c2f5606..5bd6c1dc 100644 --- a/sf_manufacturing/__manifest__.py +++ b/sf_manufacturing/__manifest__.py @@ -10,7 +10,7 @@ """, 'category': 'sf', 'website': 'https://www.sf.jikimo.com', - 'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer'], + 'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer', 'jikimo_sale_multiple_supply_methods'], 'data': [ 'data/cron_data.xml', 'data/stock_data.xml', diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index d042db55..d9dae2b8 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -1331,17 +1331,17 @@ class MrpProduction(models.Model): return production_values_str # 增加制造订单类型 - # production_type = fields.Selection( - # [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')], - # string='制造类型', - # compute='_compute_production_type', - # store=True - # ) + production_type = fields.Selection( + [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')], + string='制造类型', + compute='_compute_production_type', + store=True + ) - # @api.depends('product_id.is_manual_processing') - # def _compute_production_type(self): - # for production in self: - # production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工' + @api.depends('product_id.is_manual_processing') + def _compute_production_type(self): + for production in self: + production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工' class sf_detection_result(models.Model): diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 77dc7b0d..a52c3bca 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -361,16 +361,16 @@ class StockRule(models.Model): i = 0 for k in (production.product_id.model_processing_panel.split(',')): # 根据制造类型来选择成品工序模板 - # if production.production_type == '自动化产线加工': - product_routing_workcenter = self.env['sf.product.model.type.routing.sort'].search( - [('product_model_type_id', '=', production.product_id.product_model_type_id.id)], - order='sequence asc' - ) - # elif production.production_type == '人工线下加工': - # product_routing_workcenter = self.env['sf.manual.product.model.type.routing.sort'].search( - # [('manual_product_model_type_id', '=', production.product_id.product_model_type_id.id)], - # order='sequence asc' - # ) + if production.production_type == '自动化产线加工': + product_routing_workcenter = self.env['sf.product.model.type.routing.sort'].search( + [('product_model_type_id', '=', production.product_id.product_model_type_id.id)], + order='sequence asc' + ) + elif production.production_type == '人工线下加工': + product_routing_workcenter = self.env['sf.manual.product.model.type.routing.sort'].search( + [('manual_product_model_type_id', '=', production.product_id.product_model_type_id.id)], + order='sequence asc' + ) for route in product_routing_workcenter: i += 1 technology_design_values.append( diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml index ff492436..c56f4c3e 100644 --- a/sf_manufacturing/views/mrp_production_addional_change.xml +++ b/sf_manufacturing/views/mrp_production_addional_change.xml @@ -35,10 +35,10 @@ - + @@ -91,7 +91,7 @@ - + - +