修改胚料部分

sf_mrs_connect/controllers/controllers.py

@@ -29,9 +29,11 @@ class Sf_Mrs_Connect(http.Controller):
                 # # 从ftp拉取对应的文件
                 model_code = cnc.workorder_id.product_id.barcode
                 processing_panel = cnc.workorder_id.processing_panel
+                logging.info('model_code:%s' % model_code)
                 server_dir = cnc.with_user(request.env.ref("base.user_admin")).download_file_tmp(model_code,
                                                                                                  processing_panel)
                 cnc_file_path = os.path.join(server_dir, cnc.program_name + '.NC')
+                logging.info('cnc_file_path:%s' % cnc_file_path)
                 cnc.with_user(request.env.ref("base.user_admin")).write_file(cnc_file_path, cnc)
                 # logging.info('get_cnc_processing_create:%s' % '111111111111111')
                 # for root, dirs, files in os.walk(server_dir):

sf_mrs_connect/models/ftp_operate.py

@@ -19,25 +19,24 @@ class FtpController():
         try:
             self.ftp.connect(host, port)
             self.ftp.login(username, password)
+            logging.info("连接成功: ")
         except:
             logging.info("连接失败: ")
 
     # 下载目录下的文件
-    def download_file_tree(self, remotepath, serverdir):
+    def download_file_tree(self, target_dir, serverdir):
+        self.ftp.cwd(target_dir)  # 切换工作路径
         if not os.path.exists(serverdir):
             os.makedirs(serverdir)
-            self.ftp.cwd(remotepath)
-            remotenames = self.ftp.nlst()
-            for file in remotenames:
-                server = os.path.join(serverdir, file)
-                if file.find(".") != -1:
-                    self.download_file(server, file)
-        else:
-            return False
+        remotenames = self.ftp.nlst()
+        for file in remotenames:
+            server = os.path.join(serverdir, file)
+            if file.find(".") != -1:
+                self.download_file(server, file)
+        return
 
     # 下载指定目录下的指定文件
     def download_file(self, serverfile, remotefile):
         file_handler = open(serverfile, 'wb')
         self.ftp.retrbinary('RETR ' + remotefile, file_handler.write)
         file_handler.close()
-