jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #1171: (feature/修复批量更新程序 -> develop)

Browse Source 
Merge Request: 修复批量更新程序

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1171?initial=true
This commit is contained in:
杨金灵
2024-07-24 16:40:48 +08:00
committed by Coding
parent d3124bb9fe 44a9ad340b
commit befe0c2b00
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sf_manufacturing/models/mrp_production.py
View File

@@ -868,17 +868,25 @@ class MrpProduction(models.Model):
raise UserError('编程单号为%s的CNC程序文件从FTP拉取失败' % (self.programming_no)) raise UserError('编程单号为%s的CNC程序文件从FTP拉取失败' % (self.programming_no))
productions = self.env['mrp.production'].search( productions = self.env['mrp.production'].search(
[('programming_no', '=', self.programming_no), ('state', 'not in', ('cancel', 'done'))]) [('programming_no', '=', self.programming_no), ('state', 'not in', ('cancel', 'done'))])
logging.info('get_new_program productions:%s' % productions)
if productions: if productions:
panel_workorder = productions.workorder_ids.filtered( workorder_ids = set()
lambda for production in productions:
ac: ac.processing_panel == processing_panel and ac.routing_type == 'CNC加工' and ac.state not in ( for workorder in production.workorder_ids:
'rework', 'done')) if workorder.processing_panel == processing_panel and workorder.routing_type == 'CNC加工' and workorder.state not in (
'rework', 'done'):
workorder_ids.add(workorder.id)
panel_workorder = self.env['mrp.workorder'].search([('id', 'in', list(workorder_ids))])
logging.info('get_new_program panel_workorder:%s' % panel_workorder)
if panel_workorder: if panel_workorder:
if panel_workorder.cnc_ids: if panel_workorder.cnc_ids:
logging.info('get_new_program 1')
panel_workorder.cmm_ids.sudo().unlink() panel_workorder.cmm_ids.sudo().unlink()
panel_workorder.cnc_ids.sudo().unlink() panel_workorder.cnc_ids.sudo().unlink()
logging.info('get_new_program 2')
self.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan( self.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
productions) productions)
logging.info('get_new_program 3')
# program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test', # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
# processing_panel) # processing_panel)
logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel) logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)
@@ -889,15 +897,19 @@ class MrpProduction(models.Model):
if file_extension.lower() == '.pdf': if file_extension.lower() == '.pdf':
panel_file_path = os.path.join(program_path_tmp_panel, file) panel_file_path = os.path.join(program_path_tmp_panel, file)
logging.info('panel_file_path:%s' % panel_file_path) logging.info('panel_file_path:%s' % panel_file_path)
logging.info('get_new_program 4')
panel_workorder.write( panel_workorder.write(
{'cnc_ids': panel_workorder.cnc_ids.sudo()._json_cnc_processing(processing_panel, result), {'cnc_ids': panel_workorder.cnc_ids.sudo()._json_cnc_processing(processing_panel, result),
'cmm_ids': panel_workorder.cmm_ids.sudo()._json_cmm_program(processing_panel, result), 'cmm_ids': panel_workorder.cmm_ids.sudo()._json_cmm_program(processing_panel, result),
'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())}) 'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
logging.info('get_new_program 5')
pre_workorder = productions.workorder_ids.filtered(lambda pre_workorder = productions.workorder_ids.filtered(lambda
ap: ap.routing_type == '装夹预调' and ap.processing_panel == processing_panel and ap.state != 'rework') ap: ap.routing_type == '装夹预调' and ap.processing_panel == processing_panel and ap.state != 'rework')
logging.info('get_new_program 6')
if pre_workorder: if pre_workorder:
pre_workorder.write( pre_workorder.write(
{'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())}) {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
logging.info('get_new_program 7')
else: else:
raise UserError(result['message']) raise UserError(result['message'])
except Exception as e: except Exception as e: