Resolve merge conflicts

sf_demand_plan/models/mrp_bom.py

@@ -18,3 +18,12 @@ class MrpBom(models.Model):
             subcontract = self.get_supplier(product.materials_type_id)
             bom_id.subcontractor_id = subcontract.partner_id.id
         return bom_id
+
+    def name_get(self):
+        """重写name_get方法，只显示BOM编码"""
+        result = []
+        for record in self:
+            # 只显示BOM编码，如果编码为空则显示名称
+            display_name = record.code or record.name or f'BOM-{record.id}'
+            result.append((record.id, display_name))
+        return result

sf_demand_plan/views/demand_plan_info.xml

@@ -14,7 +14,6 @@
                 <sheet>
                     <group>
                         <group>
-                            <field name="demand_plan_number"/>
                             <field name="product_id"/>
                             <field name="part_name"/>
                             <field name="part_number"/>
@@ -37,13 +36,12 @@
                             <field name="inventory_quantity_auto_apply"/>
                             <field name="priority" attrs="{'readonly': [('state',  'in', ('40','50'))]}"/>
                             <field name="overdelivery_allowed"/>
-                            <field name="origin"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="计划">
-                            <field name="line_ids" attrs="{'invisible': [('state', 'in', ('40','50'))]}">
+                            <field name="line_ids" attrs="{'readonly': [('state', 'in', ('40','50'))]}">
-                                <tree editable="bottom" create="false" delete="false">
+                                <tree editable="bottom" delete="false">
                                     <field name="status"/>
                                     <field name="readonly_custom_made_type" invisible="1"/>
                                     <field name="new_supply_method" attrs="{'readonly': [('status', '!=', '30')]}"/>
@@ -53,8 +51,7 @@
                                              'required': [('new_supply_method', '=', 'custom_made')]}"/>
                                     <field name="route_ids" widget="many2many_tags" optional="hide"/>
                                     <field name="location_id" optional="hide"/>
-                                    <field name="bom_id" optional="hide"/>
+                                    <field name="bom_id" optional="hide" readonly="1" options="{'no_create': True}"/>
-                                    <field name="processing_time" optional="hide"/>
                                     <field name="plan_uom_qty" attrs="{'readonly': [('status', '!=', '30')]}"/>
                                     <field name="blank_arrival_date"/>
                                     <field name="finished_product_arrival_date"/>
@@ -73,39 +70,10 @@
                                             class="btn-primary"
                                             attrs="{'invisible': [('hide_release_production_order', '=', False)]}"
                                     />
-                                </tree>
+                                    <button name="button_delete" type="object" string="删除"
-                            </field>
-                            <field name="line_ids" attrs="{'invisible': [('state', 'not in', ('40','50'))]}">
-                                <tree editable="bottom">
-                                    <field name="status"/>
-                                    <field name="readonly_custom_made_type" invisible="1"/>
-                                    <field name="new_supply_method" attrs="{'readonly': [('status', '!=', '30')]}"/>
-                                    <field name="custom_made_type"
-                                           attrs="{
-                                             'readonly': ['|', '|', ('new_supply_method', '!=', 'custom_made'), ('status', '!=', '30'), ('readonly_custom_made_type', '=', True)],
-                                             'required': [('new_supply_method', '=', 'custom_made')]}"/>
-                                    <field name="route_ids" widget="many2many_tags" optional="hide"/>
-                                    <field name="location_id" optional="hide"/>
-                                    <field name="bom_id" optional="hide"/>
-                                    <field name="processing_time" optional="hide"/>
-                                    <field name="plan_uom_qty" attrs="{'readonly': [('status', '!=', '30')]}"/>
-                                    <field name="blank_arrival_date"/>
-                                    <field name="finished_product_arrival_date"/>
-                                    <field name="planned_start_date"/>
-                                    <field name="actual_start_date"/>
-                                    <field name="actual_end_date"/>
-                                    <field name="plan_remark"/>
-                                    <field name="procurement_reason"/>
-                                    <field name="write_date" string="更新时间"/>
-                                    <field name="hide_release_production_order" invisible="1"/>
-                                    <button string="下达计划" name="button_release_plan" type="object"
                                             class="btn-primary"
-                                            attrs="{'invisible': [('status', 'in', ('50','60','100'))]}"
+                                            attrs="{'invisible': [('status', 'not in', ('10','20','30'))]}"
-                                    />
+                                            confirm='是否确认删除？'/>
-                                    <button name="button_release_production" type="object" string="下发生产"
-                                            class="btn-primary"
-                                            attrs="{'invisible': [('hide_release_production_order', '=', False)]}"
-                                    />
                                 </tree>
                             </field>
                         </page>