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

1

Browse Source
This commit is contained in:
yuxianghui
2024-05-14 14:19:44 +08:00
parent 2194374aa2
commit 62ec721c69
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1040,6 +1040,7 @@ class CNCprocessing(models.Model):
# 将FTP的nc文件下载到临时目录 # 将FTP的nc文件下载到临时目录
def download_file_tmp(self, production_no, processing_panel): def download_file_tmp(self, production_no, processing_panel):
remotepath = os.path.join('/NC', production_no, 'return', processing_panel) remotepath = os.path.join('/NC', production_no, 'return', processing_panel)
serverdir = os.path.join('/tmp', production_no, 'return', processing_panel)
ftp_resconfig = self.env['res.config.settings'].get_values() ftp_resconfig = self.env['res.config.settings'].get_values()
ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']), ftp_resconfig['ftp_user'], ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']), ftp_resconfig['ftp_user'],
ftp_resconfig['ftp_password']) ftp_resconfig['ftp_password'])

7
sf_mrs_connect/controllers/controllers.py
View File

@@ -65,8 +65,11 @@ class Sf_Mrs_Connect(http.Controller):
if cnc_program and cnc_processing_arr: if cnc_program and cnc_processing_arr:
logging.info('cnc_processing_arr:%s' % cnc_processing_arr) logging.info('cnc_processing_arr:%s' % cnc_processing_arr)
cnc_program.write({'programming_state': '已编程', 'work_state': '已编程'}) cnc_program.write({'programming_state': '已编程', 'work_state': '已编程'})
cnc_program.workorder_ids.filtered(lambda b: b.routing_type == 'CNC加工').write( # cnc_program.workorder_ids.filtered(lambda b: b.routing_type == 'CNC加工').write(
{'cnc_ids': cnc_processing_arr}) # {'cnc_ids': cnc_processing_arr})
for cnc_item in cnc_program.workorder_ids.filtered(lambda b: b.routing_type == 'CNC加工'):
logging.info('cnc_item:%s' % cnc_item.production_id.name)
cnc_item.write({'cnc_ids': cnc_processing_arr})
cnc_program_ids = [item.id for item in cnc_program] cnc_program_ids = [item.id for item in cnc_program]
workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search( workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
[('production_id', 'in', cnc_program_ids)]) [('production_id', 'in', cnc_program_ids)])