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

修复更新程序

Browse Source
This commit is contained in:
jinling.yang
2024-07-24 17:10:35 +08:00
parent befe0c2b00
commit 3ed503391e
1 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sf_manufacturing/models/mrp_production.py
View File

@@ -870,22 +870,20 @@ class MrpProduction(models.Model):
[('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) logging.info('get_new_program productions:%s' % productions)
if productions: if productions:
workorder_ids = set()
for production in productions: for production in productions:
for workorder in production.workorder_ids: panel_workorder = production.workorder_ids.filtered(lambda
if workorder.processing_panel == processing_panel and workorder.routing_type == 'CNC加工' and workorder.state not in ( pw: pw.processing_panel == processing_panel and pw.routing_type == 'CNC加工' and pw.state not in (
'rework', 'done'): '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) logging.info('get_new_program panel_workorder:%s' % panel_workorder)
if panel_workorder: if panel_workorder:
if panel_workorder.cnc_ids:
logging.info('get_new_program 1') logging.info('get_new_program 1')
if panel_workorder.cmm_ids:
panel_workorder.cmm_ids.sudo().unlink() panel_workorder.cmm_ids.sudo().unlink()
if panel_workorder.cnc_ids:
panel_workorder.cnc_ids.sudo().unlink() panel_workorder.cnc_ids.sudo().unlink()
logging.info('get_new_program 2') 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) production)
logging.info('get_new_program 3') 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)
@@ -899,12 +897,14 @@ class MrpProduction(models.Model):
logging.info('panel_file_path:%s' % panel_file_path) logging.info('panel_file_path:%s' % panel_file_path)
logging.info('get_new_program 4') 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') logging.info('get_new_program 5')
pre_workorder = productions.workorder_ids.filtered(lambda pre_workorder = production.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 not in (
'rework', 'done'))
logging.info('get_new_program 6') logging.info('get_new_program 6')
if pre_workorder: if pre_workorder:
pre_workorder.write( pre_workorder.write(