Merge branch 'refs/heads/develop' into feature/tax_sync

# Conflicts:
#	sf_manufacturing/models/res_config_setting.py
#	sf_manufacturing/views/res_config_settings_views.xml
#	sf_mrs_connect/models/res_config_setting.py

sf_base/security/ir.model.access.csv

@@ -242,3 +242,8 @@ access_sf_fixture_materials_basic_parameters_group_sf_stock_manager,sf_fixture_m
 access_sf_multi_mounting_type_group_sf_stock_manager,sf_multi_mounting_type_group_sf_stock_manager,model_sf_multi_mounting_type,sf_base.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_base.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_base.group_sf_stock_manager,1,0,0,0
+
+
+access_sf_cutting_tool_material_group_plan_dispatch,sf_cutting_tool_material_group_plan_dispatch,model_sf_cutting_tool_material,sf_base.group_plan_dispatch,1,0,0,0
+access_sf_functional_cutting_tool_model_group_plan_dispatch,sf_functional_cutting_tool_model_group_plan_dispatch,model_sf_functional_cutting_tool_model,sf_base.group_plan_dispatch,1,0,0,0
+access_sf_cutting_tool_type_group_plan_dispatch,sf_cutting_tool_type_group_plan_dispatch,model_sf_cutting_tool_type,sf_base.group_plan_dispatch,1,0,0,0

sf_manufacturing/wizard/workpiece_delivery_wizard.py

@@ -184,7 +184,8 @@ class WorkpieceDeliveryWizard(models.TransientModel):
         if not barcode.isdigit():
             # 判断是否是AGV接驳站名称
             agv_site = self.env['sf.agv.site'].search([('name', '=', barcode)])
-            self.feeder_station_start_id = agv_site.id   # 修正：移除 .id
+            if agv_site:
+                self.feeder_station_start_id = agv_site.id   # 修正：移除 .id
             return
         
         if delivery_type == '上产线':

sf_mrs_connect/models/res_config_setting.py

@@ -16,11 +16,11 @@ class ResConfigSettings(models.TransientModel):
     token = fields.Char(string='TOKEN', default='b811ac06-3f00-11ed-9aed-0242ac110003')
     sf_secret_key = fields.Char(string='密钥', default='wBmxej38OkErKhD6')
     sf_url = fields.Char(string='访问地址', default='https://sf.cs.jikimo.com')
-
     center_control_url = fields.Char(string='中控访问地址',
                                      default='http://172.16.21.50:8001')
     center_control_Authorization = fields.Char(string='中控访问认证')
 
+    task_type_no = fields.Char('任务单类型编号')
     model_parser_url = fields.Char('特征识别路径')
     ftp_host = fields.Char(string='FTP的ip')
     ftp_port = fields.Char(string='FTP端口')

sf_tool_management/views/jikimo_bom.xml

@@ -9,7 +9,7 @@
         <field name="name">jikimo.bom.form</field>
         <field name="model">jikimo.bom</field>
         <field name="arch" type="xml">
-            <form>
+            <form  create="False">
                 <header>
                     <button type="action" name="%(action_jikimo_bom_wizard)d"
                             class="btn btn-info" string="组装方式.." context="{'default_bom_id':id}"
@@ -31,7 +31,7 @@
                     <notebook colspan="4">
                         <page string="物料清单">
                             <field name="product_ids" context="{'jikimo_bom_product': True}">
-                                <tree>
+                                <tree create="False">
                                     <field name="name"/>
 <!--                                    <field name="categ_id"/>-->
                                     <field name="cutting_tool_material_id"/>

sf_tool_management/views/tool_inventory.xml

@@ -20,7 +20,7 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='extension']" position="after">
                 <searchpanel>
-                    <field name="knife_handle_model" enable_counters="1"/>
+                    <field name="functional_cutting_tool_model_id" enable_counters="1"/>
                     <!--                    <field name="job_id" enable_counters="1"/>-->
 <!--                    <field name="department_id" enable_counters="1"/>-->
                     <!--                    <field name="company_id" enable_counters="1"/>-->

sf_tool_management/wizard/jikimo_bom_wizard.py

@@ -17,6 +17,22 @@ class JikimoBomWizard(models.TransientModel):
     ], string='组装方式', required=True)
     is_ok = fields.Boolean('确认上述信息正确无误。')
 
+
+    @api.model
+    def default_get(self, fields):
+        res = super(JikimoBomWizard, self).default_get(fields)
+        # 根据某个字段的值设置默认选项
+        if 'default_bom_id' in self.env.context:
+            jikimo_bom = self.env['jikimo.bom'].browse(self.env.context['default_bom_id'])
+            if not jikimo_bom:
+                return res
+
+            if jikimo_bom.options:
+                res['assembly_options'] = jikimo_bom.options
+            # some_field_value = self.env.context.get('some_field')
+            # if some_field_value == 'condition_value':
+            #     res['default_option'] = 'option2'  # 设置为特定选项
+        return res
     def submit(self):
         if not self.bom_id:
             raise UserError('缺少bom信息')