Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化

# Conflicts: # sf_sale/security/ir.model.access.csv
2024-01-04 08:54:12 +08:00
parent ce58e989dd 5d09d1585b
commit 9443a07eb4
13 changed files with 103 additions and 49 deletions
--- a/sf_base/models/basic_parameters_fixture.py
+++ b/sf_base/models/basic_parameters_fixture.py
@@ -59,7 +59,7 @@ class BasicParametersFixture(models.Model):
    magnetic_field_height = fields.Float('磁场高度(mm)', digits=(16, 2))
    magnetic_pole_plate_grinding_allowance = fields.Float('磁极板磨削余量(mm)', digits=(16, 2))

-    # '转接板夹具' 字段
+    # '转接板(锁板)夹具' 字段
    screw_size = fields.Float('螺牙大小(mm)', digits=(16, 2))
    via_hole_diameter = fields.Float('过孔直径(mm)', digits=(16, 2))

--- a/sf_base/models/fixture.py
+++ b/sf_base/models/fixture.py
@@ -45,7 +45,7 @@ class FixtureModel(models.Model):
    magnet_fixture_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                         string='磁吸夹具基本参数')
    adapter_board_fixture_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
-                                                string='转接板夹具基本参数')
+                                                string='转接板(锁板)夹具基本参数')
    scroll_chuck_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                       string='三爪卡盘基本参数')

@@ -67,7 +67,7 @@ class FixtureModel(models.Model):
        if fixture_material_id:
            if self.fixture_material_id.name == "气动夹具":
                code = self._get_code("JKM-C-JJWL-QDJJ-")
-            elif self.fixture_material_id.name == "转接板夹具":
+            elif self.fixture_material_id.name == "转接板(锁板)夹具":
                code = self._get_code("JKM-C-JJWL-ZJJJ-")
            elif self.fixture_material_id.name == "磁吸夹具":
                code = self._get_code("JKM-C-JJWL-CXJJ-")
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -341,7 +341,7 @@
                                </tree>
                            </field>
                            <field name="adapter_board_fixture_ids"
-                                   attrs="{'invisible': [('fixture_material_type', '!=', '转接板夹具')]}">
+                                   attrs="{'invisible': [('fixture_material_type', '!=', '转接板(锁板)夹具')]}">
                                <tree editable="bottom" class="center" delete="0">
                                    <field name="name"/>
                                    <field name="length"/>
--- a/sf_quality/security/ir.model.access.csv
+++ b/sf_quality/security/ir.model.access.csv
@@ -1,6 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_quality_point_group_quality,quality_point_group_quality,quality.model_quality_point,sf_base.group_quality,1,1,1,0
-access_quality_point_group_quality_director,quality_point_group_quality_director,quality.model_quality_point,sf_base.group_quality_director,1,1,0,0
+access_quality_point_group_quality_director,quality_point_group_quality_director,quality.model_quality_point,sf_base.group_quality_director,1,1,1,0
 access_quality_point_group_plan_dispatch,quality_point_group_plan_dispatch,quality.model_quality_point,sf_base.group_plan_dispatch,1,0,0,0
 access_quality_point_group_plan_director,quality_point_group_plan_director,quality.model_quality_point,sf_base.group_plan_director,1,0,0,0
 access_quality_point_group_sf_equipment_user,quality_point_group_sf_equipment_user,quality.model_quality_point,sf_base.group_sf_equipment_user,1,0,0,0
@@ -30,8 +30,8 @@ access_quality_alert_group_sf_mrp_manager,quality_alert_group_sf_mrp_manager,qua
 access_quality_alert_group_equipment_user,quality_alert_group_equipment_user,quality.model_quality_alert,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_quality_alert_group_equipment_manager,quality_alert_group_equipment_manager,quality.model_quality_alert,sf_maintenance.sf_group_equipment_manager,1,0,0,0

-access_quality_alert_team_group_quality,quality_alert_team_group_quality,quality.model_quality_alert_team,sf_base.group_quality,1,1,1,0
-access_quality_alert_team_group_quality_director,quality_alert_team_group_quality_director,quality.model_quality_alert_team,sf_base.group_quality_director,1,1,0,0
+access_quality_alert_team_group_quality,quality_alert_team_group_quality,quality.model_quality_alert_team,sf_base.group_quality,1,0,0,0
+access_quality_alert_team_group_quality_director,quality_alert_team_group_quality_director,quality.model_quality_alert_team,sf_base.group_quality_director,1,1,1,0
 access_quality_alert_team_group_plan_dispatch,quality_alert_team_group_plan_dispatch,quality.model_quality_alert_team,sf_base.group_plan_dispatch,1,0,0,0
 access_quality_alert_team_group_plan_director,quality_alert_team_group_plan_director,quality.model_quality_alert_team,sf_base.group_plan_director,1,0,0,0
 access_quality_alert_team_group_sf_equipment_user,quality_alert_team_group_sf_equipment_user,quality.model_quality_alert_team,sf_base.group_sf_equipment_user,1,0,0,0
@@ -51,13 +51,13 @@ access_product_template_group_equipment_user,product_template_group_equipment_us
 access_product_template_group_equipment_manager,product_template_group_equipment_manager,product.model_product_template,sf_maintenance.sf_group_equipment_manager,1,0,0,0

 access_quality_alert_stage_group_quality,quality_alert_stage_group_quality,quality.model_quality_alert_stage,sf_base.group_quality,1,0,0,0
-access_quality_alert_stage_group_quality_director,quality_alert_stage_group_quality_director,quality.model_quality_alert_stage,sf_base.group_quality_director,1,0,0,0
+access_quality_alert_stage_group_quality_director,quality_alert_stage_group_quality_director,quality.model_quality_alert_stage,sf_base.group_quality_director,1,1,1,0

 access_quality_point_test_type_group_quality,quality_point_test_type_group_quality,quality.model_quality_point_test_type,sf_base.group_quality,1,0,0,0
 access_quality_point_test_type_group_quality_director,quality_point_test_type_group_quality_director,quality.model_quality_point_test_type,sf_base.group_quality_director,1,0,0,0

 access_quality_tag_group_quality,quality_tag_group_quality,quality.model_quality_tag,sf_base.group_quality,1,0,0,0
-access_quality_tag_group_quality_director,quality_tag_group_quality_director,quality.model_quality_tag,sf_base.group_quality_director,1,0,0,0
+access_quality_tag_group_quality_director,quality_tag_group_quality_director,quality.model_quality_tag,sf_base.group_quality_director,1,1,1,0

 access_quality_reason_type_group_quality,quality_reason_group_quality,quality.model_quality_reason,sf_base.group_quality,1,0,0,0
 access_quality_reason_type_group_quality_director,quality_reason_group_quality_director,quality.model_quality_reason,sf_base.group_quality_director,1,0,0,0
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -86,6 +86,7 @@ class ResaleOrderLine(models.Model):
    _inherit = 'sale.order.line'

    model_glb_file = fields.Binary('模型的glb文件')
+    check_status = fields.Selection(related='order_id.check_status')


 class RePurchaseOrder(models.Model):
@@ -144,16 +145,30 @@ class ResPartnerToSale(models.Model):
                else:
                    domain = [('id', '=', False)]
            return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
+        elif self._context.get('is_supplier'):
+            if self.env.user.has_group('sf_base.group_purchase_director'):
+                domain = [('supplier_rank', '>', 0)]
+            elif self.env.user.has_group('sf_base.group_purchase'):
+                customer = self.env['res.partner'].search(
+                    [('supplier_rank', '>', 0), ('user_id', '=', self.env.user.id)])
+                if customer:
+                    ids = [t.id for t in customer]
+                    domain = [('id', 'in', ids)]
+                else:
+                    domain = [('id', '=', False)]
+            return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
        return super()._name_search(name, args, operator, limit, name_get_uid)

    @api.onchange('user_id')
    def _get_salesman(self):
        if self.customer_rank > 0:
+            if self.env.user.has_group('sf_base.group_sale_salemanager'):
                self.user_id = self.env.user.id

    @api.onchange('purchase_user_id')
    def _get_purchaseman(self):
        if self.supplier_rank > 0:
+            if self.env.user.has_group('sf_base.group_purchase'):
                self.purchase_user_id = self.env.user.id


@@ -166,6 +181,9 @@ class ResUserToSale(models.Model):
            if self.env.user.has_group('sf_base.group_sale_director'):
                domain = []
            elif self.env.user.has_group('sf_base.group_sale_salemanager'):
+                if self.id != self.env.user.id:
+                    domain = [('id', '=', self.id)]
+                else:
                    domain = [('id', '=', self.env.user.id)]
            return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
        elif self._context.get('supplier_rank'):
--- a/sf_sale/security/group_security.xml
+++ b/sf_sale/security/group_security.xml
@@ -32,7 +32,7 @@
        <record model="ir.rule" id="sale_customer_rule_my">
            <field name="name">销售经理查看自己的客户</field>
            <field name="model_id" ref="base.model_res_partner"/>
-            <field name="domain_force">[('user_id','=',user.id),('customer_rank','>',0)]
+            <field name="domain_force">[('user_id', '=', user.id),('customer_rank', '>', 0)]
            </field>
            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>
            <field name="perm_read" eval="1"/>
@@ -64,8 +64,9 @@
        <record model="ir.rule" id="inventory_purchase_order_rule_director">
            <field name="name">采购总监查看所有的订单</field>
            <field name="model_id" ref="purchase.model_purchase_order"/>
-            <field name="domain_force">[(1,'=',1),('check_status','!=', False]</field>
+            <field name="domain_force">[(1,'=',1)]</field>
            <field name="groups" eval="[(4, ref('sf_base.group_purchase_director'))]"/>
+            <field name="perm_create" eval="1"/>
            <field name="perm_read" eval="1"/>
            <field name="perm_write" eval="1"/>
        </record>
--- a/sf_sale/security/ir.model.access.csv
+++ b/sf_sale/security/ir.model.access.csv
@@ -29,6 +29,8 @@ access_mrp_bom_group_sale_salemanager,mrp_bom_group_sale_salemanager,mrp.model_m
 access_mrp_bom_group_sale_director,mrp_bom_group_sale_director,mrp.model_mrp_bom,sf_base.group_sale_director,1,0,0,0
 access_mrp_bom_group_purchase,mrp_bom_group_purchase,mrp.model_mrp_bom,sf_base.group_purchase,1,0,0,0
 access_mrp_bom_group_purchase_director,mrp_bom_group_purchase_director,mrp.model_mrp_bom,sf_base.group_purchase_director,1,0,0,0
+access_mrp_bom_group_quality,mrp_bom_group_quality,mrp.model_mrp_bom,sf_base.group_quality,1,0,0,0
+access_mrp_bom_group_quality_director,mrp_bom_group_quality_director,mrp.model_mrp_bom,sf_base.group_quality_director,1,0,0,0
 access_stock_move_group_sale_salemanager,stock_move_group_sale_salemanager,stock.model_stock_move,sf_base.group_sale_salemanager,1,0,0,0
 access_stock_move_group_sale_director,stock_move_group_sale_director,stock.model_stock_move,sf_base.group_sale_director,1,0,0,0
 access_stock_move_group_purchase,stock_move_group_purchase,stock.model_stock_move,sf_base.group_purchase,1,0,0,0
@@ -69,3 +71,9 @@ access_crm_tag_group_sale_salemanager,crm_tag_group_sale_salemanager,sales_team.
 access_crm_tag_group_sale_director,crm_tag_group_sale_director,sales_team.model_crm_tag,sf_base.group_sale_director,1,1,1,0

 access_sale_order,sale.order,sale.model_sale_order,sf_base.group_plan_dispatch,1,0,0,0
+access_res_partner_group_purchase,res_partner_group_purchase,base.model_res_partner,sf_base.group_purchase,1,1,1,0
+access_res_partner_group_purchase_director,res_partner_group_purchase_director,base.model_res_partner,sf_base.group_purchase_director,1,1,1,0
+access_sale_advance_payment_inv_group_sale_salemanager,sale_advance_payment_inv_group_sale_salemanager,sale.model_sale_advance_payment_inv,sf_base.group_sale_salemanager,1,1,1,0
+access_sale_advance_payment_inv_group_sale_director,sale_advance_payment_inv_group_sale_director,sale.model_sale_advance_payment_inv,sf_base.group_sale_director,1,1,1,0
+
+
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -6,6 +6,9 @@
            <field name="model">purchase.order</field>
            <field name="inherit_id" ref="purchase.purchase_order_form"/>
            <field name="arch" type="xml">
+                <field name="partner_id" position="replace">
+                    <field name="partner_id" widget="res_partner_many2one" context="{'is_supplier': True }"/>
+                </field>
                <field name="currency_id" position="after">
                    <field name="check_status" invisible="1"/>
                    <!--                    <field name="state"/>-->
--- a/sf_sale/views/res_partner_view.xml
+++ b/sf_sale/views/res_partner_view.xml
@@ -6,6 +6,9 @@
            <field name="model">res.partner</field>
            <field name="inherit_id" ref="base.view_partner_form"/>
            <field name="arch" type="xml">
+                 <form position="attributes">
+                     <attribute name="delete">false</attribute>
+                </form>
                <field name="vat" position="after">
                    <field name="customer_rank" invisible="1"/>
                    <field name="supplier_rank" invisible="1"/>
@@ -42,7 +45,7 @@
                </field>
                <xpath expr="//group[@name='sale']/field[@name='user_id']" position="replace">
                    <field name="user_id" widget="many2one_avatar_user" context="{'is_sale': True }"
-                           attrs="{'required' : [('customer_rank','>', 0)],'readonly': [('supplier_rank','>', 0)]}"/>
+                           attrs="{'required' : [('customer_rank','>', 0)]}"/>
                </xpath>
                <field name="category_id" position="attributes">
                    <attribute name="required">1</attribute>
@@ -69,6 +72,9 @@
            <field name="model">res.partner</field>
            <field name="inherit_id" ref="base.view_partner_tree"/>
            <field name="arch" type="xml">
+                <tree position="attributes">
+                     <attribute name="delete">false</attribute>
+                </tree>
                <field name="function" position="before">
                    <field name="customer_rank" invisible="1"/>
                    <field name="supplier_rank" invisible="1"/>
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -36,8 +36,7 @@
                            attrs="{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel'])]}"/>
                </xpath>
                <xpath expr="//form/header/button[@name='action_cancel']" position="attributes">
-                    <attribute name="attrs">{'invisible': ['|',('check_status', '!=', 'approved'),('schedule_status',
-                        'not in', ['to schedule',False])]}
+                    <attribute name="attrs">{'invisible': [('check_status', '=', False)]}
                    </attribute>
                </xpath>
                <xpath expr="//form/header/button[@name='action_draft']" position="attributes">
@@ -63,7 +62,7 @@
                </field>
                <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="before">
                    <field name="model_glb_file" widget="Viewer3D" optional="show"
-                           string="模型文件"/>
+                           string="模型文件" attrs="{'readonly': [('state', 'in', ['draft'])]}"/>
                </xpath>
                <xpath expr="//field[@name='order_line']" position="attributes">
                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
+import re
 from datetime import timedelta
-
 from odoo import fields, models, api
 from odoo import SUPERUSER_ID
 from odoo.exceptions import ValidationError
@@ -234,6 +234,7 @@ class FunctionalToolWarning(models.Model):
 class StockMoveLine(models.Model):
    _inherit = 'stock.move.line'
    _description = '功能刀具出入库记录'
+    _order = 'install_tool_time desc'

    functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称')
    functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,
@@ -253,11 +254,11 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
    _name = 'sf.real.time.distribution.of.functional.tools'
    _description = '功能刀具安全库存'

-    name = fields.Char('功能刀具名称')
-    sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型',
+    name = fields.Char('功能刀具名称', readonly=False)
+    sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False,
                                              group_expand='_read_mrs_cutting_tool_type_ids', store=True)
-    diameter = fields.Integer(string='刀具直径(mm)')
-    knife_tip_r_angle = fields.Float(string='刀尖R角(mm)')
+    diameter = fields.Integer(string='刀具直径(mm)', readonly=False)
+    knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=False)
    tool_stock_num = fields.Integer(string='刀具房数量')
    side_shelf_num = fields.Integer(string='线边刀库数量')
    on_tool_stock_num = fields.Integer(string='机内刀库数量')
@@ -266,10 +267,10 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
    max_stock_num = fields.Integer('最高库存量')
    batch_replenishment_num = fields.Integer('批次补货量', readonly=True, compute='_compute_batch_replenishment_num')
    unit = fields.Char('单位')
-    image = fields.Binary('图片')
+    image = fields.Binary('图片', readonly=False)

-    coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精')
-    whether_standard_knife = fields.Boolean(string='是否标准刀', default=True)
+    coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False)
+    whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=False)
    # 能力特征信息
    suitable_machining_method_ids = fields.Many2many(
        'maintenance.equipment.image', 'rel_machining_product_template_distribution', '适合加工方式',
@@ -299,7 +300,7 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
    @api.constrains('min_stock_num', 'max_stock_num')
    def _check_stock_num(self):
        for obj in self:
-            if obj.min_stock_num > obj.min_stock_num:
+            if obj.min_stock_num > obj.max_stock_num:
                raise ValidationError('【最低安全库存】不能高于【最高安全库存】！！!')

    @api.model
@@ -326,31 +327,31 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
        if tool.tool_stock_total < tool.min_stock_num:
            tool.batch_replenishment_num = tool.max_stock_num - tool.tool_stock_total
            # 根据判断创建功能刀具组装单
-            if not tool.sf_functional_tool_assembly_ids:
+            if not tool.sf_functional_tool_assembly_ids and re.match(r'^\d+$', str(tool.id)):
                for i in range(tool.batch_replenishment_num):
-                    tool.create_functional_tool_assembly()
+                    tool.create_functional_tool_assembly(tool)
                    print(i, ": ", tool.sf_functional_tool_assembly_ids)
        else:
            tool.batch_replenishment_num = 0

-    def create_functional_tool_assembly(self):
+    def create_functional_tool_assembly(self, tool):
        """
        创建功能刀具组装单
        """
-        functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().create({
-            'functional_tool_name': self.name,
-            'functional_tool_type_id': self.sf_cutting_tool_type_id.id,
-            'functional_tool_diameter': self.diameter,
-            'knife_tip_r_angle': self.knife_tip_r_angle,
-            'coarse_middle_thin': self.coarse_middle_thin,
+        functional_tool_assembly = tool.env['sf.functional.tool.assembly'].sudo().create({
+            'functional_tool_name': tool.name,
+            'functional_tool_type_id': tool.sf_cutting_tool_type_id.id,
+            'functional_tool_diameter': tool.diameter,
+            'knife_tip_r_angle': tool.knife_tip_r_angle,
+            'coarse_middle_thin': tool.coarse_middle_thin,
            'loading_task_source': '2',
            'use_tool_time': fields.Datetime.now() + timedelta(hours=4),
            'applicant': '系统自动',
            'apply_time': fields.Datetime.now(),
-            'whether_standard_knife': self.whether_standard_knife,
+            'whether_standard_knife': tool.whether_standard_knife,
            'reason_for_applying': '安全库存',
        })
-        self.sf_functional_tool_assembly_ids = [(4, functional_tool_assembly.id)]
+        tool.sf_functional_tool_assembly_ids = [(4, functional_tool_assembly.id)]

    def estimate_functional_tool_assembly_ids(self, tool):
        """
@@ -394,6 +395,15 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
            vals['sf_functional_cutting_tool_entity_ids'] = sf_functional_cutting_tool_entity_ids.ids
            self.env['sf.real.time.distribution.of.functional.tools'].create(vals)

+    status_create = fields.Boolean('是否是新增状态', default=True)
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            vals['status_create'] = False
+        records = super(RealTimeDistributionOfFunctionalTools, self).create(vals_list)
+        return records
+

 class MachineTableToolChangingApply(models.Model):
    _name = 'sf.machine.table.tool.changing.apply'
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -310,22 +310,29 @@
                    <sheet>
                        <div class="oe_title">
                            <h1>
-                                <field name="name"/>
+                                <field name="name" attrs="{'readonly': [('status_create', '=', False)]}"/>
                            </h1>
                        </div>
+                        <field name="status_create" invisible="1"/>
                        <group>
                            <group>
-                                <field name="sf_cutting_tool_type_id" readonly="1"/>
-                                <field name="diameter" readonly="1"/>
-                                <field name="knife_tip_r_angle" readonly="1"/>
-                                <field name="coarse_middle_thin" readonly="1"/>
-                                <field name="whether_standard_knife" readonly="1"/>
+                                <field name="sf_cutting_tool_type_id"
+                                       attrs="{'readonly': [('status_create', '=', False)]}"/>
+                                <field name="diameter"
+                                       attrs="{'readonly': [('status_create', '=', False)]}"/>
+                                <field name="knife_tip_r_angle"
+                                       attrs="{'readonly': [('status_create', '=', False)]}"/>
+                                <field name="coarse_middle_thin"
+                                       attrs="{'readonly': [('status_create', '=', False)]}"/>
+                                <field name="whether_standard_knife"
+                                       attrs="{'readonly': [('status_create', '=', False)]}"/>
                                <field name="min_stock_num"/>
                                <field name="max_stock_num"/>
                                <field name="batch_replenishment_num"/>
                            </group>
                            <group>
-                                <field name="image" widget='image' readonly="1"/>
+                                <field name="image" widget='image'
+                                       attrs="{'readonly': [('status_create', '=', False)]}"/>
                            </group>
                        </group>
                        <group col="1">
@@ -366,7 +373,7 @@
                                        <field name="barcode_id"/>
                                        <field name="functional_tool_name_id"/>
                                        <field name="new_former"/>
-                                        <field name="tool_loading_length" string="总长度"/>
+                                        <field name="tool_loading_length" string="总长度(mm)"/>
                                        <field name="functional_tool_length"/>
                                        <field name="effective_length"/>
                                        <field name="max_lifetime_value"/>
@@ -1162,7 +1169,7 @@
                    <filter name="yes_assemble_status" string="已组装" domain="[('assemble_status', '=', '1')]"/>
                    <searchpanel>
                        <field name="functional_tool_type_id" enable_counters="1" icon="fa-filter"/>
-<!--                        <field name="assemble_status" enable_counters="1" icon="fa-filter"/>-->
+                        <!--                        <field name="assemble_status" enable_counters="1" icon="fa-filter"/>-->
                    </searchpanel>
                </search>
            </field>
@@ -1173,7 +1180,7 @@
            <field name="type">ir.actions.act_window</field>
            <field name="res_model">sf.functional.tool.assembly</field>
            <field name="view_mode">tree,form,search</field>
-<!--            <field name="view_id" ref="sf_functional_tool_assembly_tree"/>-->
+            <!--            <field name="view_id" ref="sf_functional_tool_assembly_tree"/>-->
            <field name="search_view_id" ref="sf_functional_tool_assembly_search"/>
            <field name="context">{'search_default_no_assemble_status':1}</field>
        </record>
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -537,6 +537,8 @@ class StockPicking(models.Model):
        self.env['stock.move.line'].create({
            'picking_id': picking_id.id,
            'product_id': stock_lot.product_id.id,
+            'location_id': picking_id.location_id.id,
+            'location_dest_id': picking_id.location_dest_id.id,
            'lot_id': stock_lot.id,
            'qty_done': 1,
            'functional_tool_name_id': functional_tool_assembly.id