From 179ce86befffebfe88647ef7d5dff3e3e559ceb8 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Wed, 11 Dec 2024 10:33:10 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8E=BB=E9=99=A4=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=97=B6=E6=95=88=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=AD=9B=E9=80=89=E9=A1=B9=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E5=9D=AF=E6=96=99=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F=E7=A1=AE=E8=AE=A4=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E5=B7=A5=E8=89=BA=E5=8A=9F=E8=83=BD=EF=BC=9B3?= =?UTF-8?q?=E3=80=81=E5=A4=84=E7=90=86=E8=BF=94=E5=B7=A5=E6=96=B0=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=9A=84=E5=B7=A5=E5=8D=95=E5=B7=A5=E5=BA=8F=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=EF=BC=9B4=E3=80=81=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E3=80=81=E9=94=80=E5=94=AE=E9=A1=B5=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/views/mrp_workorder_view.xml | 3 +-- .../wizard/production_technology_wizard.py | 2 +- sf_manufacturing/wizard/rework_wizard.py | 2 +- sf_sale/views/sale_order_view.xml | 22 +++++++++++++++++-- 4 files changed, 23 insertions(+), 6 deletions(-) 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 + + + +