From 57d403d7544f56b9ca3253da9ab1295a5423a83a Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 27 Feb 2023 09:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=20=E4=B8=8B=E5=8F=91=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=85=B3=E9=97=ADftp=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/models/ftp_client.py  | 4 +++-
 sf_machine_connect/models/ftp_operate.py | 7 +++++++
 sf_machine_connect/wizard/action_up.py   | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py
index c03ea39e..6b084b21 100644
--- a/sf_machine_connect/models/ftp_client.py
+++ b/sf_machine_connect/models/ftp_client.py
@@ -77,8 +77,9 @@ class FtpButton(models.Model):
             # 存在本地的文件下发到机床
             ftp.upload_file(remotepath=file_path_remote, localpath=file_path_local)
             _logger.info("======%s下发成功======" % a.display_name)
-            up_time = str(datetime.now())
+            ftp.close_ftp()
 
+            up_time = str(datetime.now())
             self.env['delivery.record'].create({
                 'workorder_id': self.workorder_id.id,
                 'delivery_type': '单个下发',
@@ -296,6 +297,7 @@ class WorkCenterBarcode(models.Model):
                 ftp.upload_file(remotepath=file_path_remote, localpath=file_path_local)
                 _logger.info("======%s下发成功======" % a.display_name)
                 item.button_state = True
+            ftp.close_ftp()
             # 增加一键下发记录
             up_time = str(datetime.now())
             sequence_str = ','.join(sequence_collect)
diff --git a/sf_machine_connect/models/ftp_operate.py b/sf_machine_connect/models/ftp_operate.py
index e60d5807..315fa765 100644
--- a/sf_machine_connect/models/ftp_operate.py
+++ b/sf_machine_connect/models/ftp_operate.py
@@ -78,6 +78,13 @@ class FtpController:
         with open(localpath, mode='rb') as file:
             self.ftp.storbinary('STOR ' + remotepath, file, bufsize)
 
+    # 关闭连接
+    def close_ftp(self):
+        """
+        下发完成后关闭ftp连接，减少资源损耗
+        """
+        self.ftp.close()
+
 
     def delAllfile(self, ftppath):
         """
diff --git a/sf_machine_connect/wizard/action_up.py b/sf_machine_connect/wizard/action_up.py
index 554f4b41..4975409e 100644
--- a/sf_machine_connect/wizard/action_up.py
+++ b/sf_machine_connect/wizard/action_up.py
@@ -67,6 +67,8 @@ class UpSelectWizard(models.TransientModel):
                 _logger.info("======%s下发成功======" % a.display_name)
                 # 下发成功标识
                 item.button_state = True
+            ftp.close_ftp()
+
             up_time = str(datetime.now())
             sequence_str = ','.join(sequence_collect)
             self.workorder_id.delivery_records.create({