From 330726007d54f7fb4cb632b8c0886fc3568696a5 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 7 Nov 2024 16:26:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E5=8F=AA?= =?UTF-8?q?=E6=9C=89=E5=AE=A2=E4=BE=9B=E6=96=99=E5=85=A5=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E6=89=8D=E8=83=BD=E7=9C=8B=E8=A7=81=E6=94=B6=E8=B4=A7=E4=BA=BA?= =?UTF-8?q?/=E8=81=94=E7=B3=BB=E5=9C=B0=E5=9D=80/=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E5=8F=B7=E7=A0=81=E7=AD=89=E5=AD=97=E6=AE=B5;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_maintenance/models/sf_maintenance.py | 4 ++++ sf_manufacturing/models/stock.py | 19 +++++++++++-------- sf_manufacturing/views/stock_picking_view.xml | 11 +++++++---- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py index 3d68bb9a..de6be8da 100644 --- a/sf_maintenance/models/sf_maintenance.py +++ b/sf_maintenance/models/sf_maintenance.py @@ -689,6 +689,8 @@ class SfMaintenanceEquipment(models.Model): if next_date < date_now: next_date = date_now else: + if not equipment.initial_action_date: + raise ValidationError('重置保养日期不能为空!!!') next_date = equipment.initial_action_date + timedelta(days=equipment.period) equipment.next_action_date = next_date else: @@ -735,6 +737,8 @@ class SfMaintenanceEquipment(models.Model): if next_date < date_now: next_date = date_now else: + if not equipment.initial_overhaul_date: + raise ValidationError('重置维修日期不能为空') next_date = equipment.initial_overhaul_date + timedelta(days=equipment.overhaul_period) equipment.overhaul_date = next_date else: diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 55667d41..2060ea48 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -554,7 +554,9 @@ class StockPicking(models.Model): retrospect_ref = fields.Char('追溯参考', compute='_compute_move_ids', store=True) - @api.depends('move_ids') + picking_type_sequence_code = fields.Char(related='picking_type_id.sequence_code') + + @api.depends('move_ids', 'move_ids.product_id') def _compute_move_ids(self): for item in self: if item.move_ids: @@ -574,13 +576,14 @@ class StockPicking(models.Model): default_codes = '' if boms: for bom in boms: - code = bom.product_tmpl_id.default_code.split('-')[-1] - default_code = bom.product_tmpl_id.default_code.split(f'-{code}')[0] - if default_code not in default_codes: - if default_codes == '': - default_codes = default_code - else: - default_codes = default_codes + ',' + default_code + if bom.product_tmpl_id.default_code: + code = bom.product_tmpl_id.default_code.split('-')[-1] + default_code = bom.product_tmpl_id.default_code.split(f'-{code}')[0] + if default_code not in default_codes: + if default_codes == '': + default_codes = default_code + else: + default_codes = default_codes + ',' + default_code item.retrospect_ref = default_codes elif item.picking_type_id.sequence_code in ['INT', 'PC']: pass diff --git a/sf_manufacturing/views/stock_picking_view.xml b/sf_manufacturing/views/stock_picking_view.xml index 356059c2..2fae1fac 100644 --- a/sf_manufacturing/views/stock_picking_view.xml +++ b/sf_manufacturing/views/stock_picking_view.xml @@ -18,10 +18,13 @@ - - - - + + + + + From 5dae0ea973cecd6d5ba9d2be734324b10bf6c503 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Mon, 11 Nov 2024 14:52:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81sf=E8=A7=86=E5=9B=BE=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quality_control/views/quality_views.xml | 2 +- sf_base/static/src/scss/format_img.scss | 1 + .../views/product_template_management_view.xml | 1 + sf_plan/views/view.xml | 2 +- sf_quality/views/quality_cnc_test_view.xml | 4 ++-- sf_quality/views/view.xml | 2 +- sf_sale/views/purchase_order_view.xml | 1 + sf_sale/views/sale_order_view.xml | 12 ++++++++---- sf_stock/views/stock_product_template.xml | 1 + 9 files changed, 17 insertions(+), 9 deletions(-) diff --git a/quality_control/views/quality_views.xml b/quality_control/views/quality_views.xml index fbd917b2..8e5af75a 100644 --- a/quality_control/views/quality_views.xml +++ b/quality_control/views/quality_views.xml @@ -203,7 +203,7 @@ Quality Alerts quality.alert - kanban,tree,form,pivot,graph,calendar + tree,kanban,form,pivot,graph,calendar

Create a new quality alert diff --git a/sf_base/static/src/scss/format_img.scss b/sf_base/static/src/scss/format_img.scss index 982d3c50..fc6f02dc 100644 --- a/sf_base/static/src/scss/format_img.scss +++ b/sf_base/static/src/scss/format_img.scss @@ -14,6 +14,7 @@ .img-fluid { max-width: unset !important; + width: 40px; } .o_inner_group .img-fluid { diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml index 1862e33c..ca551d40 100644 --- a/sf_dlm_management/views/product_template_management_view.xml +++ b/sf_dlm_management/views/product_template_management_view.xml @@ -2,6 +2,7 @@ + tree,kanban,form,activity {"search_default_categ_id":1,"search_default_consumable": 1, 'default_detailed_type': 'product'} diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml index f30cbb49..21e320d1 100644 --- a/sf_plan/views/view.xml +++ b/sf_plan/views/view.xml @@ -89,7 +89,7 @@ - + diff --git a/sf_quality/views/quality_cnc_test_view.xml b/sf_quality/views/quality_cnc_test_view.xml index 2cfc8cda..7aa6a201 100644 --- a/sf_quality/views/quality_cnc_test_view.xml +++ b/sf_quality/views/quality_cnc_test_view.xml @@ -174,8 +174,8 @@ 驾驶舱 ir.actions.act_window quality.cnc.test - kanban,tree,form - + tree,kanban,form + [] { 'search_default_filter_waiting':1} diff --git a/sf_quality/views/view.xml b/sf_quality/views/view.xml index e0b2064b..6b7e4fa0 100644 --- a/sf_quality/views/view.xml +++ b/sf_quality/views/view.xml @@ -26,7 +26,7 @@ 质量缺陷单 quality.alert - kanban,tree,form,pivot,graph,calendar + tree,kanban,form,pivot,graph,calendar

Create a new quality alert diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml index 0a66287f..23c71a1f 100644 --- a/sf_sale/views/purchase_order_view.xml +++ b/sf_sale/views/purchase_order_view.xml @@ -218,6 +218,7 @@ {"search_default_categ_id":1,"search_default_filter_to_purchase":1, "purchase_product_template": 1} + tree,kanban,form,activity \ No newline at end of file diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml index 16ae9c4c..fe7c840d 100644 --- a/sf_sale/views/sale_order_view.xml +++ b/sf_sale/views/sale_order_view.xml @@ -95,7 +95,7 @@ {'readonly': [('state', 'in', ['cancel','sale'])]} - + @@ -165,9 +165,11 @@ 拒绝接单 - + - + @@ -218,7 +220,7 @@ 下单时间 - @@ -283,6 +285,8 @@ + tree,kanban,form,activity + {"search_default_categ_id":1, "search_default_filter_to_sell":1,"sale_multi_pricelist_product_template": 1} diff --git a/sf_stock/views/stock_product_template.xml b/sf_stock/views/stock_product_template.xml index 2d2a2fbe..8938f924 100644 --- a/sf_stock/views/stock_product_template.xml +++ b/sf_stock/views/stock_product_template.xml @@ -2,6 +2,7 @@ + tree,kanban,form,activity {"search_default_categ_id":1,"search_default_consumable": 1, 'default_detailed_type': 'product'}