Merge branch 'develop' into feature/wechat_message

2024-09-20 10:43:41 +08:00
parent 22ebb1bbe1 bc888d7984
commit e13bad8483
33 changed files with 329 additions and 126 deletions
--- a/jikimo_system_order/static/description/系统工单.png
+++ b/jikimo_system_order/static/description/系统工单.png
--- a/jikimo_system_order/views/yizuo_system_order_view.xml
+++ b/jikimo_system_order/views/yizuo_system_order_view.xml
@@ -234,7 +234,7 @@
        </record>


-        <menuitem name="系统工单" id="work_order_1_list" web_icon="jikimo_system_order,static/description/icon.png"/>
+        <menuitem name="系统工单" id="work_order_1_list" web_icon="jikimo_system_order,static/description/系统工单.png"/>
        <menuitem name="工单" id="work_order" parent="work_order_1_list" action="system_order"/>
        <menuitem name="工单模板" id="work_order_template" parent="work_order_1_list" action="work_template" groups="jikimo_system_order.group_operations_permissions_rwc"/>
        <menuitem name="工单分类" id="work_order_type" parent="work_order_1_list" action="classify" groups="jikimo_system_order.group_operations_permissions_rwc"/>
--- a/quality_control/static/description/质量.png
+++ b/quality_control/static/description/质量.png
--- a/quality_control/views/quality_views.xml
+++ b/quality_control/views/quality_views.xml
@@ -1024,7 +1024,7 @@
    <menuitem
            id="menu_quality_root"
            name="Quality"
-            web_icon="quality_control,static/description/icon.svg"
+            web_icon="quality_control,static/description/质量.png"
            sequence="150"
            groups="quality.group_quality_user"/>

--- a/sf_base/security/ir.model.access.csv
+++ b/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
--- a/sf_hr/manifest.py
+++ b/sf_hr/manifest.py
@@ -10,6 +10,8 @@
    'depends': ['hr'],
    'data': [
        'views/hr_employee.xml',
+        'views/res_config_settings_views.xml',
+        'data/cron_data.xml',
    ],
    'demo': [
    ],
--- a/sf_hr/data/cron_data.xml
+++ b/sf_hr/data/cron_data.xml
@@ -0,0 +1,15 @@
+<odoo>
+    <data noupdate="1">
+        <record model="ir.cron" id="ir_cron_employee_info_sync">
+            <field name="name">员工企微id同步</field>
+            <field name="model_id" ref="hr.model_hr_employee"/>
+            <field name="state">code</field>
+            <field name="code">model._employee_info_sync()</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
--- a/sf_hr/models/init.py
+++ b/sf_hr/models/init.py
@@ -1,2 +1,4 @@
 # -*- coding: utf-8 -*-

+from . import hr_employee
+from . import res_config_setting
--- a/sf_hr/models/hr_employee.py
+++ b/sf_hr/models/hr_employee.py
@@ -0,0 +1,26 @@
+import logging
+import requests
+from odoo import models, fields, api, _
+
+_logger = logging.getLogger(__name__)
+
+
+class JkmPracticeEmployee(models.Model):
+    _inherit = 'hr.employee'
+    _description = '员工信息'
+
+    we_id = fields.Char(string='企微ID', index=True)
+
+    def _employee_info_sync(self):
+        url = '/api/get/organization'
+        config = self.env['res.config.settings'].get_values()
+        ret = requests.post((config['ims_url'] + url), json={}, data={})
+        result = ret.json()['result']
+        if result['code'] == 200:
+            if result['employee_list']:
+                for employee_info in result['employee_list']:
+                    if employee_info['work_email']:
+                        self.sudo().search([('work_email', '=', employee_info['work_email'])]).write(
+                            {'we_id': employee_info['we_id']})
+        else:
+            logging.info('_employee_info_sync error:%s' % result['message'])
--- a/sf_hr/models/res_config_setting.py
+++ b/sf_hr/models/res_config_setting.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+import logging
+from odoo import api, fields, models
+
+_logger = logging.getLogger(__name__)
+
+
+class ResIMSConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    ims_url = fields.Char('综合管理系统访问地址')
+
+    @api.model
+    def get_values(self):
+        """
+        重载获取参数的方法，参数都存在系统参数中
+        :return:
+        """
+        values = super(ResIMSConfigSettings, self).get_values()
+        config = self.env['ir.config_parameter'].sudo()
+        ims_url = config.get_param('ims_url', default='')
+        values.update(
+            ims_url=ims_url,
+        )
+        return values
+
+    def set_values(self):
+        super(ResIMSConfigSettings, self).set_values()
+        ir_config = self.env['ir.config_parameter'].sudo()
+        ir_config.set_param("ims_url", self.ims_url or "")
--- a/sf_hr/views/hr_employee.xml
+++ b/sf_hr/views/hr_employee.xml
@@ -9,6 +9,15 @@
                <xpath expr="//group//field[@name='work_email']" position="attributes">
                    <attribute name="required">1</attribute>
                </xpath>
+                <xpath expr="//page[@name='public']" position='after'>
+                    <page string="企业微信">
+                        <group col="2">
+                            <group>
+                                <field name="we_id"/>
+                            </group>
+                        </group>
+                    </page>
+                </xpath>
            </field>
        </record>
    </data>
--- a/sf_hr/views/res_config_settings_views.xml
+++ b/sf_hr/views/res_config_settings_views.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="res_config_settings_finance_view_form_extend" model="ir.ui.view">
+            <field name="name">res.config.settings.finance.view.form.extend</field>
+            <field name="model">res.config.settings</field>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[hasclass('app_settings_block')]/div" position="before">
+                    <div>
+                        <h2>综合管理系统接口配置</h2>
+                        <div class="row mt16 o_settings_container" id="jd_api">
+                            <div class="col-12 col-lg-6 o_setting_box">
+                                <div class="o_setting_left_pane"/>
+                                <div class="o_setting_right_pane">
+                                    <div class="text-muted">
+                                        <label for="ims_url"/>
+                                        <field name="ims_url"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
--- a/sf_machine_connect/views/res_config_settings_views.xml
+++ b/sf_machine_connect/views/res_config_settings_views.xml
@@ -24,7 +24,7 @@
                    </div>
                    <div>
                        <h2>获取检测报告服务配置</h2>
-                        <div class="row mt16 o_settings_container" id="jd_api">
+                        <div class="row mt16 o_settings_container" id="check_report_config">
                            <div class="col-12 col-lg-6 o_setting_box">
                                <div class="o_setting_left_pane"/>
                                    <div class="o_setting_right_pane">
@@ -38,6 +38,18 @@
                        </div>
                    </div>
                </xpath>
+                <xpath expr="//div[@id='check_report_config']/div" position="after">
+                        <div class="col-12 col-lg-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="is_get_detection_file"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <div class="text-muted">
+                                    <label for="is_get_detection_file"/>
+                                </div>
+                            </div>
+                        </div>
+                </xpath>
            </field>
        </record>
    </data>
--- a/sf_maintenance/static/description/维护.png
+++ b/sf_maintenance/static/description/维护.png
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -1230,5 +1230,9 @@
            action="hr_equipment_action1"
            sequence="0"/>

+    <menuitem
+            id="maintenance.menu_maintenance_title"
+            web_icon="sf_maintenance,static/description/维护.png"/>
+

 </odoo>
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -144,6 +144,8 @@ class ResMrpWorkOrder(models.Model):
    # 是否绑定托盘
    is_trayed = fields.Boolean(string='是否绑定托盘', default=False)

+    tag_type = fields.Selection([("重新加工", "重新加工")], string="标签", tracking=True)
+
    @api.depends('name', 'production_id.name')
    def _compute_surface_technics_picking_ids(self):
        for workorder in self:
@@ -426,7 +428,8 @@ class ResMrpWorkOrder(models.Model):
        logging.info('local_file_path:%s' % local_file_path)
        remote_path = '/home/ftp/ftp_root/ThreeTest/XT/Before/' + local_filename
        logging.info('remote_path:%s' % remote_path)
-        if not ftp.file_exists(remote_path):
+        is_get_detection_file = self.env['ir.config_parameter'].sudo().get_param('is_get_detection_file')
+        if not is_get_detection_file:
            paload_data = {
                "filename": local_filename
            }
@@ -603,6 +606,8 @@ class ResMrpWorkOrder(models.Model):
            print("(%.2f,%.2f)" % (x, y))
            self.material_center_point = ("(%.2f,%.2f,%.2f)" % (x, y, z))
            self.X_deviation_angle = jdz
+            logging.info("坯料中心点坐标：(%.2f,%.2f)" % (x, y))
+            logging.info("X轴偏差度数:%.2f" % jdz)
            # 将补偿值写入CNC加工工单
            workorder = self.env['mrp.workorder'].browse(self.ids)
            work = workorder.production_id.workorder_ids
@@ -705,6 +710,7 @@ class ResMrpWorkOrder(models.Model):
            'date_planned_finished': datetime.now() + timedelta(days=1),
            'duration_expected': duration_expected,
            'duration': 0,
+            'tag_type': '重新加工' if item is False else False,
            'cnc_ids': False if route.routing_type != 'CNC加工' else self.env['sf.cnc.processing']._json_cnc_processing(
                k, item),
            'cmm_ids': False if route.routing_type != 'CNC加工' else self.env['sf.cmm.program']._json_cmm_program(k,
@@ -1183,8 +1189,10 @@ class ResMrpWorkOrder(models.Model):
                if not record.rfid_code and record.is_rework is False:
                    raise UserError("请扫RFID码进行绑定")
                if record.is_rework is False:
-                    if not record.material_center_point or record.X_deviation_angle <= 0:
-                        raise UserError("坯料中心点为空或X偏差角度小于等于0")
+                    if not record.material_center_point:
+                        raise UserError("坯料中心点为空，请检查")
+                    if record.X_deviation_angle <= 0:
+                        raise UserError("X偏差角度小于等于0，请检查！本次计算的X偏差角度为：%s" % record.X_deviation_angle)
                record.process_state = '待加工'
                # record.write({'process_state': '待加工'})
                record.production_id.process_state = '待加工'
@@ -1565,6 +1573,8 @@ class SfWorkOrderBarcodes(models.Model):

    def on_barcode_scanned(self, barcode):
        logging.info('Rfid:%s' % barcode)
+        if 'O-CMD' in barcode:
+            return None
        workorder = self.env['mrp.workorder'].browse(self.ids)
        # workorder_preset = self.env['mrp.workorder'].search(
        #     [('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)])
--- a/sf_manufacturing/models/res_config_setting.py
+++ b/sf_manufacturing/models/res_config_setting.py
@@ -4,19 +4,39 @@ from odoo import models, fields, api
 class ResConfigSettings(models.TransientModel):
    _inherit = 'res.config.settings'

+    agv_rcs_url = fields.Char(string='avg_rcs访问地址',
+                              default='http://172.16.10.114:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask')
+    wbcode = fields.Char('地码')
+    agv_code = fields.Char(string='agv编号')
+    task_type_no = fields.Char('任务单类型编号')
+
    is_agv_task_dispatch = fields.Boolean('是否下发AGV任务', default=False)
+    # 是否重新获取检测文件
+    is_get_detection_file = fields.Boolean(string='重新获取检测文件', default=False)

    @api.model
    def get_values(self):
        values = super(ResConfigSettings, self).get_values()
        config = self.env['ir.config_parameter'].sudo()
+        agv_rcs_url = config.get_param('agv_rcs_url', default='')
+        wbcode = config.get_param('wbcode', default='')
+        agv_code = config.get_param('agv_code', default='')
        is_agv_task_dispatch = config.get_param('is_agv_task_dispatch')
+        is_get_detection_file = config.get_param('is_get_detection_file')
        values.update(
+            agv_rcs_url=agv_rcs_url,
+            wbcode=wbcode,
+            agv_code=agv_code,
            is_agv_task_dispatch=is_agv_task_dispatch,
+            is_get_detection_file=is_get_detection_file
        )
        return values

    def set_values(self):
        super(ResConfigSettings, self).set_values()
        config = self.env['ir.config_parameter'].sudo()
+        config.set_param("agv_rcs_url", self.agv_rcs_url or "")
+        config.set_param("wbcode", self.wbcode or "")
+        config.set_param("agv_code", self.agv_code or "")
        config.set_param("is_agv_task_dispatch", self.is_agv_task_dispatch or False)
+        config.set_param("is_get_detection_file", self.is_get_detection_file or False)
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -32,6 +32,8 @@
            </field>
            <xpath expr="//field[@name='qty_remaining']" position="after">
                <field name="manual_quotation" optional="show"/>
+                <field name='tag_type' widget="badge"
+                       decoration-danger="tag_type == '重新加工'"/>
            </xpath>
            <xpath expr="//field[@name='date_planned_start']" position="replace">
                <field name="date_planned_start" string="计划开始日期" optional="show"/>
@@ -221,9 +223,12 @@
            <xpath expr="//label[1]" position="before">
                <field name='routing_type' readonly="1"/>
                <field name='process_state' attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
+                <field name='tag_type' readonly="1" attrs='{"invisible": [("tag_type","=",False)]}'
+                       decoration-danger="tag_type == '重新加工'"/>
                <field name="rfid_code" force_save="1" readonly="1" cache="True"
                       attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
                <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
+
            </xpath>
            <xpath expr="//label[1]" position="attributes">
                <attribute name="string">计划加工时间</attribute>
@@ -479,10 +484,10 @@

                    <div class="col-12 col-lg-6 o_setting_box">
                        <field name="data_state" invisible="1"/>
-                        <button type="object" class="oe_highlight" name="get_three_check_datas" string="获取数据"
-                                attrs='{"invisible": ["|", "|", "|", ("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", True)]}'/>
-                        <button type="object" class="oe_highlight" name="getcenter" string="计算定位"
-                                attrs='{"invisible": ["|","|", "|",("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", False)]}'/>
+                        <!--                         <button type="object" class="oe_highlight" name="get_three_check_datas" string="获取数据" -->
+                        <!--                                 attrs='{"invisible": ["|", "|", "|", ("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", True)]}'/> -->
+                        <!--                         <button type="object" class="oe_highlight" name="getcenter" string="计算定位" -->
+                        <!--                                 attrs='{"invisible": ["|","|", "|",("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", False)]}'/> -->
                    </div>

                    <group>
@@ -514,8 +519,8 @@
            </xpath>

            <xpath expr="//form//header" position="inside">
-                <button type="object" class="oe_highlight" name="get_three_check_datas" string="获取数据"
-                attrs='{"invisible": [("state","!=","progress")]}'/>
+                <button type="object" class="oe_highlight jikimo_button_confirm" name="get_three_check_datas"
+                        string="获取数据" attrs='{"invisible": [("state","!=","progress")]}'/>
            </xpath>


@@ -666,7 +671,8 @@
        <field name="arch" type="xml">
            <tree string="工件配送" class="center" create="0" delete="0" js_class="remove_focus_list_view">
                <header>
-                    <button name="button_delivery" type="object" string="工件配送" class="btn-primary jikimo_button_confirm" attrs="{'force_show':1}"/>
+                    <button name="button_delivery" type="object" string="工件配送"
+                            class="btn-primary jikimo_button_confirm" attrs="{'force_show':1}"/>
                </header>
                <field name="status" widget="badge"
                       decoration-success="status == '已配送'"
--- a/sf_manufacturing/views/res_config_settings_views.xml
+++ b/sf_manufacturing/views/res_config_settings_views.xml
@@ -6,6 +6,32 @@
            <field name="model">res.config.settings</field>
            <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
            <field name="arch" type="xml">
+                <xpath expr="//div[hasclass('app_settings_block')]/div" position="before">
+                    <div>
+                        <h2>AGV参数配置</h2>
+                        <div class="row mt16 o_settings_container" id="agv_config">
+                            <div class="col-12 col-lg-6 o_setting_box">
+                                <div class="o_setting_left_pane"/>
+                                <div class="o_setting_right_pane">
+                                    <div class="text-muted">
+                                        <label for="agv_rcs_url" string="访问地址"/>
+                                        <field name="agv_rcs_url"/>
+                                    </div>
+                                    <div class="text-muted">
+                                        <label for="agv_code" string="车辆编号"/>
+                                        <field name="agv_code"/>
+                                    </div>
+                                    <div class="text-muted">
+                                        <label for="wbcode"/>
+                                        <field name="wbcode"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </xpath>
+
+
                <xpath expr="//div[@id='agv_config']/div" position="after">
                        <div class="col-12 col-lg-6 o_setting_box">
                            <div class="o_setting_left_pane">
--- a/sf_manufacturing/wizard/workpiece_delivery_wizard.py
+++ b/sf_manufacturing/wizard/workpiece_delivery_wizard.py
@@ -184,6 +184,7 @@ class WorkpieceDeliveryWizard(models.TransientModel):
        if not barcode.isdigit():
            # 判断是否是AGV接驳站名称
            agv_site = self.env['sf.agv.site'].search([('name', '=', barcode)])
+            if agv_site:
                self.feeder_station_start_id = agv_site.id   # 修正：移除 .id
            return
        
@@ -206,6 +207,9 @@ class WorkpieceDeliveryWizard(models.TransientModel):
                    workorder.production_line_id.id != self.production_ids[0].production_line_id.id):
                raise UserError(f'该rfid对应的制造订单号为{workorder.production_id.name}的目的生产线不一致')

+            # 调用打印成品条码方法
+            workorder.print_method()
+
            # 将对象添加到对应的同模型且是多对多类型里
            self.production_ids |= workorder.production_id
            self.workorder_ids |= workorder
--- a/sf_message/models/sf_message_sale.py
+++ b/sf_message/models/sf_message_sale.py
@@ -4,3 +4,8 @@ from odoo import models, fields, api, _
 class SFMessageSale(models.Model):
    _name = 'sale.order'
    _inherit = ['sale.order', 'sf.message.template']
+
+    # def create(self):
+    #     res = super(SFMessageSale, self).create()
+    #     if res is True:
+
--- a/sf_message/models/sf_message_template.py
+++ b/sf_message/models/sf_message_template.py
@@ -8,30 +8,6 @@ class SfMessageTemplate(models.Model):
    _description = u'消息模板'

    name = fields.Char(string=u"名称", required=True)
-    # type = fields.Selection([
-    #     ('待接单', '待接单'),
-    #     ('待排程', '待排程'),
-    #     ('坯料采购', '坯料采购'),
-    #     ('坯料发料', '坯料发料'),
-    #     ('待编程', '待编程'),
-    #     ('调拨入库', '调拨入库'),
-    #     ('功能刀具组装', '功能刀具组装'),
-    #     ('功能刀具寿命到期', '功能刀具寿命到期'),
-    #     ('程序用刀计划异常', '程序用刀计划异常'),
-    #     ('工单无CNC程序', '工单无CNC程序'),
-    #     ('生产线无功能刀具', '生产线无功能刀具'),
-    #     ('工单无定位数据', '工单无定位数据'),
-    #     ('工单FTP无文件', '工单FTP无文件'),
-    #     ('工单加工失败', '工单加工失败'),
-    #     ('设备故障及异常', '设备故障及异常'),
-    #     ('工单逾期预警', '工单逾期预警'),
-    #     ('工单已逾期', '工单已逾期'),
-    #     ('销售订单逾期', '销售订单逾期'),
-    #     ('销售订单已逾期', '销售订单已逾期'),
-    #     ('待质量判定', '待质量判定'),
-    #     ('生产完工待入库', '生产完工待入库'),
-    #     ('订单发货', '订单发货')
-    # ], string='类型', required=True)
    description = fields.Char(string=u"描述")
    content = fields.Html(string=u"内容", render_engine='qweb', translate=True, prefetch=True, sanitize=False)
    msgtype = fields.Selection(
@@ -41,6 +17,9 @@ class SfMessageTemplate(models.Model):
    notification_employee_ids = fields.Many2many('hr.employee', string=u'员工',
                                                 domain="[('department_id', '=',notification_department_id)]",
                                                 required=True)
+    is_send_time = fields.Boolean(string=u"定时发送", default=False)
+    send_time_1 = fields.Integer('发送时间点1')
+    send_time_2 = fields.Integer('发送时间点2')
    active = fields.Boolean(string=u"是否有效", default=True)

    @api.onchange('notification_department_id')
--- a/sf_message/views/sf_message_template_view.xml
+++ b/sf_message/views/sf_message_template_view.xml
@@ -23,6 +23,9 @@
                                   options="{'style-inline': true, 'codeview': true, 'dynamic_placeholder': true}"/>
                            <field name="description"/>
                            <field name="msgtype"/>
+                            <field name="is_send_time"/>
+                            <field name="send_time_1" attrs="{'invisible': [('is_send_time', '=', False)]}"/>
+                            <field name="send_time_2" attrs="{'invisible': [('is_send_time', '=', False)]}"/>
                            <field name="notification_department_id"/>
                            <field name="notification_employee_ids" widget="many2many_tags"/>
                        </group>
@@ -40,6 +43,9 @@
                    <!--                    <field name="type"/>-->
                    <field name="content"/>
                    <field name="msgtype"/>
+                    <field name="is_send_time"/>
+                    <field name="send_time_1" attrs="{'invisible': [('is_send_time', '=', False)]}"/>
+                    <field name="send_time_2" attrs="{'invisible': [('is_send_time', '=', False)]}"/>
                    <field name="notification_department_id"/>
                    <field name="notification_employee_ids" widget="many2many_tags"/>
                    <field name="description"/>
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -16,13 +16,10 @@ 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')
-    agv_rcs_url = fields.Char(string='avg_rcs访问地址',
-                              default='http://172.16.10.114:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask')
    center_control_url = fields.Char(string='中控访问地址',
                                     default='http://172.16.21.50:8001')
    center_control_Authorization = fields.Char(string='中控访问认证')
-    wbcode = fields.Char('地码')
-    agv_code = fields.Char(string='agv编号')
+
    task_type_no = fields.Char('任务单类型编号')
    model_parser_url = fields.Char('特征识别路径')
    ftp_host = fields.Char(string='FTP的ip')
@@ -103,9 +100,7 @@ class ResConfigSettings(models.TransientModel):
        token = config.get_param('token', default='')
        sf_secret_key = config.get_param('sf_secret_key', default='')
        sf_url = config.get_param('sf_url', default='')
-        agv_rcs_url = config.get_param('agv_rcs_url', default='')
-        wbcode = config.get_param('wbcode', default='')
-        agv_code = config.get_param('agv_code', default='')
+
        center_control_url = config.get_param('center_control_url', default='')
        center_control_Authorization = config.get_param('center_control_Authorization', default='')
        ftp_host = config.get_param('ftp_host', default='')
@@ -118,9 +113,7 @@ class ResConfigSettings(models.TransientModel):
            token=token,
            sf_secret_key=sf_secret_key,
            sf_url=sf_url,
-            agv_rcs_url=agv_rcs_url,
-            wbcode=wbcode,
-            agv_code=agv_code,
+
            center_control_url=center_control_url,
            center_control_Authorization=center_control_Authorization,
            ftp_host=ftp_host,
@@ -137,9 +130,7 @@ class ResConfigSettings(models.TransientModel):
        ir_config.set_param("token", self.token or "")
        ir_config.set_param("sf_secret_key", self.sf_secret_key or "")
        ir_config.set_param("sf_url", self.sf_url or "")
-        ir_config.set_param("agv_rcs_url", self.agv_rcs_url or "")
-        ir_config.set_param("wbcode", self.wbcode or "")
-        ir_config.set_param("agv_code", self.agv_code or "")
+
        ir_config.set_param("center_control_url", self.center_control_url or "")
        ir_config.set_param("center_control_Authorization", self.center_control_Authorization or "")
        ir_config.set_param("ftp_host", self.ftp_host or "")
--- a/sf_mrs_connect/views/order_price.xml
+++ b/sf_mrs_connect/views/order_price.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <menuitem sequence="22" name="销售订单bfm对比" id="menu_sale_order_bfm_price"
-              action="order_price_tree_act"
-              parent="sale.sale_order_menu"
-              groups="base.group_user"
-    />
    <record model="ir.actions.act_window" id="order_price_tree_act">
        <field name="name">bfm订单价格对比</field>
        <field name="res_model">order.price</field>
        <field name="view_mode">tree,form</field>
    </record>
+    <menuitem sequence="22" name="销售订单bfm对比" id="menu_sale_order_bfm_price"
+              action="order_price_tree_act"
+              parent="sale.sale_order_menu"
+              groups="base.group_user"
+    />
+
    <record id="view_order_price_tree" model="ir.ui.view">
        <field name="name">order.price.list</field>
        <field name="model">order.price</field>
--- a/sf_mrs_connect/views/res_config_settings_views.xml
+++ b/sf_mrs_connect/views/res_config_settings_views.xml
@@ -74,28 +74,7 @@
                            </div>
                        </div>
                    </div>
-                    <div>
-                        <h2>AGV参数配置</h2>
-                        <div class="row mt16 o_settings_container" id="agv_config">
-                            <div class="col-12 col-lg-6 o_setting_box">
-                                <div class="o_setting_left_pane"/>
-                                <div class="o_setting_right_pane">
-                                    <div class="text-muted">
-                                        <label for="agv_rcs_url" string="访问地址"/>
-                                        <field name="agv_rcs_url"/>
-                                    </div>
-                                    <div class="text-muted">
-                                        <label for="agv_code" string="车辆编号"/>
-                                        <field name="agv_code"/>
-                                    </div>
-                                    <div class="text-muted">
-                                        <label for="wbcode"/>
-                                        <field name="wbcode"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+
                    <div>
                        <h2>中控参数配置</h2>
                        <div class="row mt16 o_settings_container">
--- a/sf_tool_management/models/jikimo_bom.py
+++ b/sf_tool_management/models/jikimo_bom.py
@@ -50,7 +50,7 @@ class jikimo_bom(models.Model):

    def write(self, vals):
        # 在更新模型时记录旧的 Many2many ID 列表
-        if 'product_ids' in vals:
+        if 'product_ids' in vals and not self.env.context.get('is_assembly_options'):
            old_product_counter = Counter(self.product_ids.ids)
            super(jikimo_bom, self).write(vals)
            new_product_counter = Counter(self.product_ids.ids)
@@ -102,7 +102,7 @@ class jikimo_bom(models.Model):
            domains = domains + domain
            if index != 0:
                domains = ['|'] + domains
-        domains = domains + [('stock_move_count', '>', 0)]
+        domains = domains + [('stock_move_ids', '!=',False)]
        return domains

    def generate_bill_materials(self, assembly_options):
@@ -117,7 +117,10 @@ class jikimo_bom(models.Model):
        domains = self.bom_product_domains(assembly_options)
        products = self.env['product.product'].search(domains)
        if products:
-            self.product_ids = [Command.set(products.ids)]
+            new_context = dict(self.env.context)
+            new_context['is_assembly_options'] = True
+            self.with_context(new_context).write({'product_ids': [Command.set(products.ids)]})
+            # self.product_ids = [Command.set(products.ids)]


 class jikimo_bom_line(models.Model):
@@ -130,15 +133,15 @@ class jikimo_bom_line(models.Model):
 class ProductProduct(models.Model):
    _inherit = 'product.product'
    _order = 'cutting_tool_material_id, cutting_tool_type_id'
-    stock_move_count = fields.Integer(string='stock_move count', compute='_compute_stock_move_count', store=True)
-
-    @api.depends('stock_move_ids')
-    def _compute_stock_move_count(self):
-        for record in self:
-            if record.stock_move_ids:
-                record.stock_move_count = len(record.stock_move_ids)
-            else:
-                record.stock_move_count = 0
+    # stock_move_count = fields.Integer(string='stock_move count', compute='_compute_stock_move_count')
+    #
+    # @api.depends('stock_move_ids')
+    # def _compute_stock_move_count(self):
+    #     for record in self:
+    #         if record.stock_move_ids:
+    #             record.stock_move_count = len(record.stock_move_ids)
+    #         else:
+    #             record.stock_move_count = 0

    def search(self, args, offset=0, limit=None, order=None, count=False):
        # 你可以在这里修改 `args` 以调整搜索条件
--- a/sf_tool_management/views/jikimo_bom.xml
+++ b/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"/>
--- a/sf_tool_management/views/tool_inventory.xml
+++ b/sf_tool_management/views/tool_inventory.xml
@@ -6,10 +6,32 @@
        <field name="inherit_id" ref="sf_base.view_tool_inventory_tree"/>
        <field name="arch" type="xml">
            <xpath expr="//field[@name='extension']" position="before">
-                <field name="knife_handle_model" />
+                <field name="knife_handle_model" class="o-sticky-header"/>
                <button name="bom_mainfest" string="bom清单" type="object" class="btn-link"
                        icon="fa-refresh"/>
            </xpath>
        </field>
    </record>
+
+    <record id="view_tool_inventory_inherit_search" model="ir.ui.view">
+        <field name="name">sf.tool.inventory.inherit.search</field>
+        <field name="model">sf.tool.inventory</field>
+        <field name="inherit_id" ref="sf_base.view_cutting_tool_material_search"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='extension']" position="after">
+                <searchpanel>
+                    <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"/>-->
+                </searchpanel>
+            </xpath>
+        </field>
+    </record>
+    <!--    <searchpanel>-->
+    <!--                    <field name="org_type_id_display" enable_counters="1"/>-->
+    <!--                    &lt;!&ndash;                    <field name="job_id" enable_counters="1"/>&ndash;&gt;-->
+    <!--                    <field name="department_id" enable_counters="1"/>-->
+    <!--                    &lt;!&ndash;                    <field name="company_id" enable_counters="1"/>&ndash;&gt;-->
+    <!--                </searchpanel>-->
 </odoo>
--- a/sf_tool_management/wizard/jikimo_bom_wizard.py
+++ b/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信息')
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -931,13 +931,6 @@ class SfStockMoveLine(models.Model):
                        if not record.destination_location_id.product_id:
                            record.destination_location_id.product_id = record.product_id.id

-    @api.model_create_multi
-    def create(self, vals_list):
-
-        records = super(SfStockMoveLine, self).create(vals_list)
-        self.put_shelf_location(records)
-        return records
-

 class SfStockPicking(models.Model):
    _inherit = 'stock.picking'
@@ -1122,6 +1115,12 @@ class SfPickingType(models.Model):
            'sf_warehouse.group_sf_stock_manager'
        )

+    def _get_action(self, action_xmlid):
+        action = super(SfPickingType, self)._get_action(action_xmlid)
+        if not self.env.user.has_group('base.group_system'):
+            action['context']['create'] = False
+        return action
+

 class CustomStockMove(models.Model):
    _name = 'stock.move'
--- a/sf_warehouse/views/view.xml
+++ b/sf_warehouse/views/view.xml
@@ -4,6 +4,7 @@

        <record model="ir.actions.act_window" id="stock.stock_picking_type_action">
            <field name="context">{'search_default_groupby_code':1}</field>
+            <field name="domain">[('name', '!=', '制造')]</field>
        </record>

        <record id="view_location_form_sf_inherit" model="ir.ui.view">
--- a/sf_warehouse/wizard/wizard.py
+++ b/sf_warehouse/wizard/wizard.py
@@ -77,18 +77,20 @@ class ShelfLocationWizard(models.TransientModel):

    def confirm_the_change(self):
        if self.destination_barcode_id:
+            stocks = []
            if self.lot_id:
                self.current_barcode_id.product_sn_id = False
                self.destination_barcode_id.product_sn_id = self.lot_id.id
-                self.create_stock_moves(self.lot_id, 1)
+                stocks = self.create_stock_moves(self.lot_id, 1)
            elif self.current_product_sn_ids:
                for current_product_sn_id in self.current_product_sn_ids:
-                    self.create_stock_moves(current_product_sn_id.lot_id, current_product_sn_id.qty_num)
+                    stocks = self.create_stock_moves(current_product_sn_id.lot_id, current_product_sn_id.qty_num)
                    current_product_sn_id.write({
                        'qty_num': 0
                    })
            else:
                raise ValidationError('没有需要变更的批次/序列号！')
+            self.env['stock.move.line'].sudo().put_shelf_location(stocks[-1])
        else:
            raise ValidationError('请选择目标货位编码!')