Merge branch 'hotfix/优化多次编程单下发' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_1.4

sf_manufacturing/models/mrp_workorder.py

@@ -1039,8 +1039,6 @@ class CNCprocessing(models.Model):
             for f in files:
                 if os.path.splitext(f)[1] == ".pdf":
                     full_path = os.path.join(serverdir, root, f)
-                    if full_path is not False:
-                        if not cnc_processing.workorder_id.cnc_worksheet:
                     cnc_processing.workorder_id.cnc_worksheet = base64.b64encode(
                         open(full_path, 'rb').read())
                 else:

sf_tool_management/models/base.py

@@ -311,10 +311,11 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
              'applicant': None,
              'sf_functional_tool_assembly_id': None})
 
-    def create_cam_work_plan(self, cnc_processing):
+    def create_cam_work_plan(self, cnc_processing_ids):
         """
         根据传入的工单信息，查询是否有需要的功能刀具，如果没有则生成CAM工单程序用刀计划
         """
+        for cnc_processing in cnc_processing_ids:
             status = False
             if cnc_processing.cutting_tool_name:
                 functional_tools = self.env['sf.real.time.distribution.of.functional.tools'].sudo().search(
@@ -352,7 +353,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
             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 == 0 and not assembly_id.start_preset_bool:
+                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成功！！！')