diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index 13fff868..3828f00e 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -104,8 +104,7 @@ current [('state', '!=', 'cancel'),('schedule_state', '=', '已排')] - {'search_default_product': 1, 'search_default_workcenter_id': - active_id,'search_default_filter_order_warning':1,'search_default_filter_order_overdue':1,'search_default_filter_order_normal':1} + {'search_default_product': 1, 'search_default_workcenter_id': active_id}

diff --git a/sf_manufacturing/wizard/production_technology_wizard.py b/sf_manufacturing/wizard/production_technology_wizard.py index f49480aa..e5976aaa 100644 --- a/sf_manufacturing/wizard/production_technology_wizard.py +++ b/sf_manufacturing/wizard/production_technology_wizard.py @@ -14,7 +14,7 @@ class ProductionTechnologyWizard(models.TransientModel): is_technology_confirm = fields.Boolean(default=False) def confirm(self): - if self.is_technology_confirm is True and self.production_id.product_id.categ_id.type == '成品': + if self.is_technology_confirm is True and self.production_id.product_id.categ_id.type in ['成品', '坯料']: domain = [('origin', '=', self.origin), ('state', '=', 'technology_to_confirmed'), ('product_id', '=', self.production_id.product_id.id)] else: diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py index eeae9ae9..fece391a 100644 --- a/sf_manufacturing/wizard/rework_wizard.py +++ b/sf_manufacturing/wizard/rework_wizard.py @@ -119,7 +119,7 @@ class ReworkWizard(models.TransientModel): and item.panel == work.processing_panel)) if route: work_list = self.env['mrp.workorder'].json_workorder_str(self.production_id, route[0]) - work_list[2].update({'tag_type': '重新加工'}) + work_list[2].update({'tag_type': '重新加工', 'sequence': 0}) workorders_values.append(work_list) # 创建新工单,并进行返工配置的相关操作 if workorders_values: diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml index a5adfcfa..673d7fa3 100644 --- a/sf_sale/views/sale_order_view.xml +++ b/sf_sale/views/sale_order_view.xml @@ -169,6 +169,9 @@ + + 下单时间 + @@ -215,8 +218,14 @@ 订单号 - 下单时间 + 下单日期 + + hide + + + +