Merge branch 'feature/解决主流程bug' into feature/解决bug、优化权限

sf_base/security/ir.model.access.csv

@@ -228,3 +228,16 @@ access_sf_fixture_model_group_sale_director,sf_fixture_model_group_sale_director
 access_sf_fixture_materials_basic_parameters_group_sale_director,sf_fixture_materials_basic_parameters_group_sale_director,model_sf_fixture_materials_basic_parameters,sf_base.group_sale_director,1,0,0,0
 access_sf_machine_tool_type_group_sale_director,sf_machine_tool_type_group_sale_director,model_sf_machine_tool_type,sf_base.group_sale_director,1,0,0,0
 
+access_sf_fixture_material_group_plan_director,sf_fixture_material_group_plan_director,model_sf_fixture_material,sf_base.group_plan_director,1,0,0,0
+access_sf_fixture_model_group_plan_director,sf_fixture_model_group_plan_director,model_sf_fixture_model,sf_base.group_plan_director,1,0,0,0
+access_sf_fixture_materials_basic_parameters_group_plan_director,sf_fixture_materials_basic_parameters_group_plan_director,model_sf_fixture_materials_basic_parameters,sf_base.group_plan_director,1,0,0,0
+access_sf_multi_mounting_type_group_plan_director,sf_multi_mounting_type_group_plan_director,model_sf_multi_mounting_type,sf_base.group_plan_director,1,0,0,0
+
+access_sf_production_materials_group_sf_stock_manager,sf_production_materials_group_sf_stock_manager,model_sf_production_materials,sf_warehouse.group_sf_stock_manager,1,0,0,0
+access_sf_materials_model_group_sf_stock_manager,sf_materials_model_group_sf_stock_manager,model_sf_materials_model,sf_warehouse.group_sf_stock_manager,1,0,0,0
+access_sf_fixture_material_group_sf_stock_manager,sf_fixture_material_group_sf_stock_manager,model_sf_fixture_material,sf_warehouse.group_sf_stock_manager,1,0,0,0
+access_sf_fixture_model_group_sf_stock_manager,sf_fixture_model_group_sf_stock_manager,model_sf_fixture_model,sf_warehouse.group_sf_stock_manager,1,0,0,0
+access_sf_fixture_materials_basic_parameters_group_sf_stock_manager,sf_fixture_materials_basic_parameters_group_sf_stock_manager,model_sf_fixture_materials_basic_parameters,sf_warehouse.group_sf_stock_manager,1,0,0,0
+access_sf_multi_mounting_type_group_sf_stock_manager,sf_multi_mounting_type_group_sf_stock_manager,model_sf_multi_mounting_type,sf_warehouse.group_sf_stock_manager,1,0,0,0
+access_sf_machine_brand_group_sf_stock_manager,sf_machine_brand_group_sf_stock_manager,model_sf_machine_brand,sf_warehouse.group_sf_stock_manager,1,0,0,0
+access_sf_cutting_tool_type_group_sf_stock_manager,sf_cutting_tool_type_group_sf_stock_manager,model_sf_cutting_tool_type,sf_warehouse.group_sf_stock_manager,1,0,0,0

sf_maintenance/views/maintenance_views.xml

@@ -988,7 +988,7 @@
                 <xpath expr="//div[hasclass('o_row')][field[@name='maintenance_duration']]" position="after">
 
 
-                    <field name='overhaul_id'/>
+                    <field name='overhaul_id' options="{'no_create':True}"/>
                     <field name="overhaul_date" string="下次预防检修"/>
                     <label for="overhaul_period" string="预防检修频次"/>
                     <div class="o_row">

sf_manufacturing/security/ir.model.access.csv

@@ -104,7 +104,7 @@ access_mrp_production_split_line_group_sf_mrp_user,access.mrp.production.split.l
 access_mrp_workcenter_capacity_manager_group_sf_mrp_user,mrp.workcenter.capacity.manager,mrp.model_mrp_workcenter_capacity,sf_base.group_sf_mrp_user,1,1,1,0
 
 
-access_mrp_production_group_plan_dispatch,mrp_production,model_mrp_production,sf_base.group_plan_dispatch,1,0,0,0
+access_mrp_production_group_plan_dispatch,mrp_production,model_mrp_production,sf_base.group_plan_dispatch,1,1,0,0
 access_mrp_workorder,mrp_workorder,model_mrp_workorder,sf_base.group_plan_dispatch,1,1,1,0
 access_sf_production_line_group_plan_dispatch,sf.production.line,model_sf_production_line,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_production_line_group_plan_director,sf.production.line,model_sf_production_line,sf_base.group_plan_director,1,1,1,0
@@ -129,8 +129,12 @@ access_sf_cmm_program_group_plan_dispatch,sf_cmm_program_group_plan_dispatch,mod
 access_mrp_workcenter_productivity,mrp.workcenter.productivity,mrp.model_mrp_workcenter_productivity,sf_base.group_plan_dispatch,1,0,0,0
 access_maintenance_equipment_tool_group_plan_dispatch,maintenance.equipment.tool,sf_manufacturing.model_maintenance_equipment_tool,sf_base.group_plan_dispatch,1,0,0,0
 
-access_sf_workpiece_delivery_group_plan_dispatch,sf.workpiece.delivery,sf_manufacturing.model_sf_workpiece_delivery,sf_base.group_plan_dispatch,1,0,0,0
+access_sf_workpiece_delivery_group_plan_dispatch,sf_workpiece_delivery_group_plan_dispatch,sf_manufacturing.model_sf_workpiece_delivery,sf_base.group_plan_dispatch,1,1,0,0
 
 access_sf_agv_site_group_sf_order_user,sf_agv_site_group_sf_order_user,model_sf_agv_site,sf_base.group_sf_order_user,1,1,1,0
 access_sf_agv_task_route_group_sf_order_user,sf_agv_task_route_group_sf_order_user,model_sf_agv_task_route,sf_base.group_sf_order_user,1,1,1,0
-access_center_control_interface_log_admin,center_control_interface_log_admin,model_center_control_interface_log,base.group_system,1,1,1,0
+access_center_control_interface_log_admin,center_control_interface_log_admin,model_center_control_interface_log,base.group_system,1,1,1,0
+
+access_sf_model_type_group_sf_stock_manager,sf_model_type_group_sf_mrp_manager,model_sf_model_type,sf_warehouse.group_sf_stock_manager,1,0,0,0
+access_mrp_bom_byproduct_group_sf_stock_manager,mrp_bom_byproduct_group_sf_mrp_manager,mrp.model_mrp_bom_byproduct,sf_warehouse.group_sf_stock_manager,1,0,0,0
+

sf_sale/models/sale_order.py

@@ -139,7 +139,7 @@ class ReSaleOrder(models.Model):
 class ResaleOrderLine(models.Model):
     _inherit = 'sale.order.line'
 
-    model_glb_file = fields.Binary('模型的glb文件')
+    model_glb_file = fields.Binary('模型的glb文件', compute='_compute_model_glb_file', store=True)
     # product_template_id = fields.Many2one(
     #     string="产品",
     #     comodel_name='product.template',
@@ -152,18 +152,14 @@ class ResaleOrderLine(models.Model):
     #     domain=[('sale_ok', '=', True), ('categ_type', '=', '成品')])
     check_status = fields.Selection(related='order_id.check_status')
 
-    @api.onchange('product_template_id')
+    @api.depends('product_template_id')
     def _compute_model_glb_file(self):
         for line in self:
             if line.product_template_id:
                 if not line.model_glb_file:
-                    line.update({
-                        'model_glb_file': line.product_id.product_tmpl_id.model_file,
-                    })
+                    line.model_glb_file = line.product_id.product_tmpl_id.model_file
                 if not line.price_unit:
-                    line.update({
-                        'price_unit': line.product_id.product_tmpl_id.list_price,
-                    })
+                    line.price_unit = line.product_id.product_tmpl_id.list_price
 
 
 class ProductTemplate(models.Model):

sf_tool_management/models/functional_tool.py

@@ -328,7 +328,8 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
     tool_stock_total = fields.Integer(string='当前库存量', readonly=True)
     min_stock_num = fields.Integer('最低库存量')
     max_stock_num = fields.Integer('最高库存量')
-    batch_replenishment_num = fields.Integer('批次补货量', readonly=True, compute='_compute_batch_replenishment_num')
+    batch_replenishment_num = fields.Integer('批次补货量', readonly=True, compute='_compute_batch_replenishment_num',
+                                             store=True)
     unit = fields.Char('单位')
     image = fields.Binary('图片', readonly=False)
 

sf_warehouse/security/ir.model.access.csv

@@ -140,7 +140,4 @@ access_sf_shelf_location_group_sf_tool_user,sf.shelf.location.group_sf_tool_user
 access_sf_shelf_group_user,sf.shelf.location.group_user,model_sf_shelf_location,base.group_user,1,1,0,0
 
 
-
-
-
-
+access_ir_model_group_sf_stock_user,ir_model_group_sf_stock_user,base.model_ir_model,sf_warehouse.group_sf_stock_user,1,1,0,0

sf_warehouse/views/view.xml

@@ -158,6 +158,28 @@
             <field name="view_mode">kanban,form</field>
         </record>
 
+        <record id="view_warehouse_tree_create" model="ir.ui.view">
+            <field name="name">stock.warehouse.tree.create</field>
+            <field name="model">stock.warehouse</field>
+            <field name="inherit_id" ref="stock.view_warehouse_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//tree" position="attributes">
+                    <attribute name="create">0</attribute>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_warehouse_form_create" model="ir.ui.view">
+            <field name="name">stock.warehouse.form.create</field>
+            <field name="model">stock.warehouse</field>
+            <field name="inherit_id" ref="stock.view_warehouse"/>
+            <field name="arch" type="xml">
+                <xpath expr="//form" position="attributes">
+                    <attribute name="create">0</attribute>
+                </xpath>
+            </field>
+        </record>
+
         <!--     <record id="example_action" model="ir.actions.act_window"> -->
         <!--     <field name="name">Example</field> -->
         <!--     <field name="type">ir.actions.act_window</field> -->