Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化报废和返工

# Conflicts:
#	sf_tool_management/models/base.py

sf_tool_management/models/base.py

@@ -348,6 +348,18 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
                 else:
                     logging.info('功能刀具【%s】满足CNC用刀需求！！！' % cnc_processing.cutting_tool_name)
 
+    def unlink_cam_plan(self, production):
+        for item in production:
+            cam_plan_ids = self.env['sf.cam.work.order.program.knife.plan'].search([('name', '=', item.name)])
+            for cam_plan_id in cam_plan_ids:
+                assembly_id = cam_plan_id.sf_functional_tool_assembly_id
+                if assembly_id.assemble_status in ('0', '待组装') and not assembly_id.start_preset_bool:
+                    logging.info('%s删除成功！！！' % assembly_id)
+                    assembly_id.sudo().unlink()
+                    logging.info('unlink_cam_plan成功！！！')
+            cam_plan_ids.sudo().unlink()
+
+
 
 class FunctionalToolAssembly(models.Model):
     _name = 'sf.functional.tool.assembly'