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] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E5=AE=A2=E4=BE=9B=E6=96=99=E5=85=A5=E5=BA=93=E5=8D=95=E6=89=8D?=
 =?UTF-8?q?=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 @@
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='user_id']" position="after">
-                    <field name="retrospect_ref"/>
-                    <field name="person_of_delivery"/>
-                    <field name="telephone_of_delivery"/>
-                    <field name="address_of_delivery"/>
+                    <field name="picking_type_sequence_code" invisible="1"/>
+                    <field name="retrospect_ref"
+                           attrs="{'invisible':[('picking_type_sequence_code','not in',['DL', 'INT', 'PC'])]}"/>
+                    <field name="person_of_delivery" attrs="{'invisible':[('picking_type_sequence_code','!=','DL')]}"/>
+                    <field name="telephone_of_delivery"
+                           attrs="{'invisible':[('picking_type_sequence_code','!=','DL')]}"/>
+                    <field name="address_of_delivery" attrs="{'invisible':[('picking_type_sequence_code','!=','DL')]}"/>
                 </xpath>
             </field>
         </record>