Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单和工单逾期消息推送

# Conflicts:
#	sf_message/__manifest__.py
#	sf_message/data/bussiness_node.xml

sf_tool_management/models/base.py

@@ -321,9 +321,12 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
 
         # 获取编程单号
         programming_no = cnc_processing.workorder_id.production_id.programming_no
-        if not self.env['sf.cam.work.order.program.knife.plan'].sudo().search(
-                [('programming_no', '=', programming_no),
-                 ('functional_tool_name', '=', cnc_processing.cutting_tool_name)]):
+        logging.info(f'编程单号:{programming_no}')
+        cam_id = self.env['sf.cam.work.order.program.knife.plan'].sudo().search(
+            [('programming_no', '=', programming_no),
+             ('functional_tool_name', '=', cnc_processing.cutting_tool_name)])
+        logging.info(f'CAM装刀计划：{cam_id}')
+        if not cam_id:
             knife_plan = self.env['sf.cam.work.order.program.knife.plan'].sudo().create({
                 'name': cnc_processing.workorder_id.production_id.name,
                 'programming_no': programming_no,

sf_tool_management/models/jikimo_bom.py

@@ -84,7 +84,7 @@ class jikimo_bom(models.Model):
 
             if option.name == '整体式刀具':
                 domain = ['&'] + domain + [
-                    '|',
+                    '&',
                     # 刀具直径
                     ('cutting_tool_blade_diameter', '=', self.tool_inventory_id.diameter),
 

sf_tool_management/views/tool_base_views.xml

@@ -1046,7 +1046,7 @@
             <field name="res_model">sf.functional.tool.dismantle</field>
             <field name="view_mode">tree,form,search</field>
             <field name="search_view_id" ref="sf_functional_tool_dismantle_search"/>
-            <field name="context">{'search_default_no_dismantle_state':1}</field>
+            <field name="context">{'search_default_no_dismantle_state':1,'is_web_request':True}</field>
         </record>
     </data>
 </odoo>