增加是否线下加工日志

2024-11-14 16:36:02 +08:00
parent ed641c85b3
commit 6e17bb933f
8 changed files with 27 additions and 30 deletions
--- a/jikimo_sale_multiple_supply_methods/init.py
+++ b/jikimo_sale_multiple_supply_methods/init.py
@@ -7,11 +7,11 @@ from odoo import api, SUPERUSER_ID
 def _data_install(cr, registry):
    env = api.Environment(cr, SUPERUSER_ID, {})
    # 获取所有需要设置的产品模板
-    env.ref('jikimo_sale_multiple_supply_methods.product_template_purchase').product_variant_id.write({'active': False})
-    env.ref('jikimo_sale_multiple_supply_methods.product_template_manual_processing').product_variant_id.write({'active': False, 'single_manufacturing': True})
-    env.ref('jikimo_sale_multiple_supply_methods.product_template_default').product_variant_id.write({'active': False})
+    env.ref('jikimo_sale_multiple_supply_methods.product_template_purchase').product_variant_id.write({'active': False, 'is_bfm': True})
+    env.ref('jikimo_sale_multiple_supply_methods.product_template_manual_processing').product_variant_id.write({'active': False, 'single_manufacturing': True, 'is_bfm': True})
+    env.ref('jikimo_sale_multiple_supply_methods.product_template_default').product_variant_id.write({'active': False, 'is_bfm': True})
    env.ref('jikimo_sale_multiple_supply_methods.product_template_raw_material_customer_provided').product_variant_id.write({'active': False})
-    env.ref('jikimo_sale_multiple_supply_methods.product_template_outsourcing').product_variant_id.write({'active': False})
+    env.ref('jikimo_sale_multiple_supply_methods.product_template_outsourcing').product_variant_id.write({'active': False, 'is_bfm': True})
    env.ref('sf_dlm.product_embryo_sf_self_machining').product_tmpl_id.write({'categ_type': '坯料'})
    env.ref('sf_dlm.product_template_sf').product_tmpl_id.write({'categ_type': '成品'})
    env.ref('sf_dlm.product_embryo_sf_outsource').product_tmpl_id.write({'categ_type': '坯料'})
--- a/jikimo_sale_multiple_supply_methods/data/product_data.xml
+++ b/jikimo_sale_multiple_supply_methods/data/product_data.xml
@@ -15,7 +15,6 @@
            <field name="company_id" ref="base.main_company"/>
            <field name="single_manufacturing">true</field>
            <field name="tracking">serial</field>
-            <field name="is_bfm">true</field>
            <field name="categ_type">成品</field>
            <field name="is_manual_processing">true</field>
        </record>
@@ -32,7 +31,6 @@
            <field name="uom_po_id" ref="uom.product_uom_unit"/>
            <field name="company_id" ref="base.main_company"/>
            <field name="categ_type">成品</field>
-            <field name="is_bfm">true</field>
        </record>

        <record id="product_template_outsourcing" model="product.template">
@@ -47,7 +45,6 @@
            <field name="uom_po_id" ref="uom.product_uom_unit"/>
            <field name="company_id" ref="base.main_company"/>
            <field name="categ_type">成品</field>
-            <field name="is_bfm">true</field>
        </record>

        <record id="product_template_default" model="product.template">
@@ -61,7 +58,6 @@
            <field name="uom_po_id" ref="uom.product_uom_unit"/>
            <field name="company_id" ref="base.main_company"/>
            <field name="categ_type">成品</field>
-            <field name="is_bfm">true</field>
        </record>

        <!-- 供应商信息（业务平台），由于数据是python创建，只能指定ID -->
--- a/sf_manufacturing/manifest.py
+++ b/sf_manufacturing/manifest.py
@@ -10,7 +10,7 @@
    """,
    'category': 'sf',
    'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer', 'jikimo_sale_multiple_supply_methods'],
+    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer'],
    'data': [
        'data/stock_data.xml',
        'data/empty_racks_data.xml',
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1300,17 +1300,17 @@ class MrpProduction(models.Model):
        return production_values_str

    # 增加制造订单类型
-    production_type = fields.Selection(
-        [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
-        string='制造类型',
-        compute='_compute_production_type',
-        store=True
-    )
+    # production_type = fields.Selection(
+    #     [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
+    #     string='制造类型',
+    #     compute='_compute_production_type',
+    #     store=True
+    # )

-    @api.depends('product_id.is_manual_processing')
-    def _compute_production_type(self):
-        for production in self:
-            production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工'
+    # @api.depends('product_id.is_manual_processing')
+    # def _compute_production_type(self):
+    #     for production in self:
+    #         production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工'


 class sf_detection_result(models.Model):
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -934,6 +934,7 @@ class ResProductMo(models.Model):
        #     if surface_technology:
        #         no_bom_copy_product_id.route_ids |= surface_technology
        no_bom_copy_product_id.product_tmpl_id.active = True
+        logging.info('no_bom_copy_product_id[is_manual_processing]:%s' % no_bom_copy_product_id.is_manual_processing)
        materials_id = self.env['sf.production.materials'].search(
            [('materials_no', '=', item['texture_code'])])
        materials_type_id = self.env['sf.materials.model'].search(
@@ -959,7 +960,7 @@ class ResProductMo(models.Model):
            'materials_type_id': materials_type_id.id,
            'single_manufacturing': product_id.single_manufacturing,
            'is_bfm': True,
-            'active': True
+            'active': True,
        }
        # 外协和采购生成的坯料需要根据材料型号绑定供应商
        if route_type == 'subcontract' or route_type == 'purchase':
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -35,10 +35,10 @@
                    <field name="reservation_state" optional="hide" decoration-danger="reservation_state == 'confirmed'"
                           decoration-success="reservation_state == 'assigned'"/>
                </xpath>
-                <xpath expr="//field[@name='state']" position="before">
+                <!-- <xpath expr="//field[@name='state']" position="before">
                    <field name="production_type" widget="badge" decoration-warning="production_type == '人工线下加工'"
                           decoration-success="production_type == '自动化产线加工'" optional="show"/>
-                </xpath>
+                </xpath> -->
                <xpath expr="//field[@name='activity_ids']" position="replace">
                    <field name="activity_ids" string="下一个活动" widget="list_activity" optional="hide"/>
                </xpath>
@@ -91,7 +91,7 @@

                </xpath>
                <xpath expr="//sheet//group//group//div[3]" position="after">
-                    <field name="production_type" readonly="1"/>
+                    <!-- <field name="production_type" readonly="1"/> -->
                    <field name="manual_quotation" readonly="1"/>
                    <field name="programming_no" readonly="1"/>
                    <field name="programming_state" readonly="1"
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -417,12 +417,12 @@ class sf_production_plan(models.Model):
            raise UserError(e)
        
    # 增加制造订单类型
-    production_type = fields.Selection(
-        [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
-        string='制造类型',
-        related='production_id.production_type',
-        store=True
-    )
+    # production_type = fields.Selection(
+    #     [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
+    #     string='制造类型',
+    #     related='production_id.production_type',
+    #     store=True
+    # )


 # 机台作业计划
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -22,7 +22,7 @@
                    <field name="production_line_id"/>
                    <field name="date_planned_start"/>
                    <field name="date_planned_finished"/>
-                    <field name="production_type" widget="badge" decoration-warning="production_type == '人工线下加工'" decoration-success="production_type == '自动化产线加工'"/>
+                    <!-- <field name="production_type" widget="badge" decoration-warning="production_type == '人工线下加工'" decoration-success="production_type == '自动化产线加工'"/> -->
                    <field name="actual_start_time" optional='hide'/>
                    <field name="actual_end_time" optional='hide'/>
                    <field name="actual_process_time" optional='hide'/>