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-02-23 22:11:32 +08:00
parent 444e99b4cf
commit 5fbe834528
11 changed files with 206 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
sf_machine_connect/wizard/action_up.py
View File

@@ -24,7 +24,6 @@ class UpSelectWizard(models.TransientModel):
readonly=True)
program_ids = fields.Many2many('sf.cnc.processing', string='程序列表')
program_name = []
def confirm_up(self):
@@ -33,8 +32,9 @@ class UpSelectWizard(models.TransientModel):
username = self.workcenter_id.machine_tool_id.ftp_num
pwd = self.workcenter_id.machine_tool_id.ftp_pwd
remote_path = self.workcenter_id.machine_tool_id.ftp_remote_path
print(host, port, username, pwd, remote_path)
ftp = ftp_operate.FtpController(host, port, username, pwd)
# print(host, port, username, pwd, remote_path)
# ftp = ftp_operate.FtpController(host, port, username, pwd)
sequence_collect = []
try:
# 给文件名
begin_name1 = self.program_ids[0].cnc_id.display_name.split('-')
@@ -45,28 +45,34 @@ class UpSelectWizard(models.TransientModel):
for item in self.program_ids:
# print(item.program_name)
# print(item.cnc_id)
sequence_collect.append(item.sequence_number)
a = item.cnc_id
print(a.display_name)
_logger.info(a.public)
_logger.info(a.display_name)
datas = base64.standard_b64decode(a.datas)
# print(datas)
file_path_local = '{}/{}'.format('/nc2machine', final_name)
# print(file_path_local)
# 本地测试合并下发
# 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(remote_path, final_name)
# 合并文件
with open(file_path_local, mode='ab+') as file:
file.write(datas)
# 存在本地的文件下发到机床
_logger.info("==========存在服务器成功，准备下发===========")
ftp.upload_file(remotepath=file_path_remote, localpath=file_path_local)
# 下发成功标识
item.button_state = True
# _logger.info(a.public)
# _logger.info(a.display_name)
# datas = base64.standard_b64decode(a.datas)
# file_path_local = '{}/{}'.format('/nc2machine', final_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(remote_path, final_name)
# # 合并文件
# with open(file_path_local, mode='ab+') as file:
# file.write(datas)
#
# # 存在本地的文件下发到机床
# _logger.info("==========存在服务器成功，准备下发===========")
# # ftp.upload_file(remotepath=file_path_remote, localpath=file_path_local)
# # # 下发成功标识
# # item.button_state = True
up_time = str(datetime.now())
sequence_str = ','.join(sequence_collect)
self.workorder_id.delivery_records.create({
'delivery_type': '合并下发',
'delivery_time': up_time,
'influence_record': sequence_str,
})
_logger.info("==============合并下发成功==============")
except Exception as e:
_logger.info("=====================================", e)