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

修改字段名称，为一键下发增加异常捕获

Browse Source
This commit is contained in:
mgw
2023-01-31 10:27:57 +08:00
parent 4e57c76c63
commit 51c89f5c6b
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
sf_machine_connect/models/ftp_client.py
View File

@@ -185,7 +185,7 @@ class Machine_ftp(models.Model):
y_compensation_node = fields.Char('y补偿值节点') y_compensation_node = fields.Char('y补偿值节点')
# 数采配置相关 # 数采配置相关
machine_ip = fields.Char('机床IP') machine_ip = fields.Char('机床IP')
machine_signed = fields.Char('刷新间隔') machine_signed = fields.Char('机床刷新间隔')
machine_status = fields.Char('机床在线状态') machine_status = fields.Char('机床在线状态')
machine_time_on = fields.Char('机床总在线时长') machine_time_on = fields.Char('机床总在线时长')
machine_tool_num = fields.Char('机床当前刀具') machine_tool_num = fields.Char('机床当前刀具')
@@ -318,29 +318,30 @@ class WorkCenterBarcode(models.Model):
print(host, port, username, pwd, remote_path) print(host, port, username, pwd, remote_path)
ftp = ftp_operate.FtpController(host, port, username, pwd) ftp = ftp_operate.FtpController(host, port, username, pwd)
# ftp.delAllfile('C://Users//马广威//Desktop//ftp') # ftp.delAllfile('C://Users//马广威//Desktop//ftp')
for item in self.cnc_ids: try:
a = item.cnc_id for item in self.cnc_ids:
print(a.display_name) a = item.cnc_id
_logger.info(a.public) print(a.display_name)
_logger.info(a.display_name) _logger.info(a.public)
datas = base64.standard_b64decode(a.datas) _logger.info(a.display_name)
datas = base64.standard_b64decode(a.datas)
# file_path = '{}\{}\{}'.format(a._filestore(), a.store_fname.split('/'[0]), a.display_name) # file_path = '{}\{}\{}'.format(a._filestore(), a.store_fname.split('/'[0]), a.display_name)
file_path_local = '{}/{}'.format('/nc2machine', a.display_name) file_path_local = '{}/{}'.format('/nc2machine', a.display_name)
# 本地测试一键下发 # 本地测试一键下发
# file_path_local = '{}/{}'.format('D:\\jikimo', a.display_name) # file_path_local = '{}/{}'.format('D:\\jikimo', a.display_name)
# file_path_remote = '{}\{}'.format('//M80(192,168,2,142)//DS', a.display_name) # file_path_remote = '{}\{}'.format('//M80(192,168,2,142)//DS', a.display_name)
file_path_remote = '{}\{}'.format(remote_path, a.display_name) file_path_remote = '{}\{}'.format(remote_path, a.display_name)
with open(file_path_local, mode='wb+') as file: with open(file_path_local, mode='wb+') as file:
file.write(datas) file.write(datas)
# 存在本地的文件下发到机床 # 存在本地的文件下发到机床
_logger.info("=====================11================") _logger.info("=====================11================")
ftp.upload_file(remotepath=file_path_remote, localpath=file_path_local) ftp.upload_file(remotepath=file_path_remote, localpath=file_path_local)
# _logger.info("=====================22================") # _logger.info("=====================22================")
# except Exception as e: except Exception as e:
# _logger.info("=====================================", e) _logger.info("=====================================", e)
# raise UserError('NC下发执行超时, 请检查下发状态') raise UserError('NC下发执行超时, 请检查下发状态')
# 下发都执行完毕后，按钮标志位变为true # 下发都执行完毕后，按钮标志位变为true
self.button_up_all_state = True self.button_up_all_state = True