1.ftp文件路径修改为:/NC/以下

sf_mrs_connect/models/ftp_operate.py

@@ -27,8 +27,16 @@ class FtpController():
             os.makedirs(serverdir)
         try:
             logging.info("进入FTP目录 ")
-            self.ftp.cwd(target_dir)  # 切换工作路径
-            logging.info('FTP目录:%s' % target_dir)
+            logging.info('目录:%s' % target_dir)
+            target_dir1 = target_dir.split('/')
+            logging.info('目录1:%s' % target_dir1[1])
+            self.ftp.cwd(target_dir1[1])  # 切换工作路径
+            logging.info('目录2:%s' % target_dir1[2])
+            self.ftp.cwd(target_dir1[2])  # 切换工作路径
+            logging.info('目录3:%s' % target_dir1[3])
+            self.ftp.cwd(target_dir1[3])  # 切换工作路径
+            logging.info('目录4:%s' % target_dir1[4])
+            self.ftp.cwd(target_dir1[4])  # 切换工作路径
             remotenames = self.ftp.nlst()
             logging.info('FTP目录文件:%s' % remotenames)
             for file in remotenames:
@@ -38,6 +46,9 @@ class FtpController():
             return 1
         except Exception:
             return 0
+        finally:
+            self.ftp.quit()
+            logging.info("ftp已关闭")
 
     # 下载目录下的检测文件
     def download_reportfile_tree(self, target_dir, serverdir, reportpath):
@@ -51,6 +62,8 @@ class FtpController():
             self.ftp.cwd(target_dir1[1])  # 切换工作路径
             logging.info('目录2:%s' % target_dir1[2])
             self.ftp.cwd(target_dir1[2])  # 切换工作路径
+            logging.info('目录2:%s' % target_dir1[3])
+            self.ftp.cwd(target_dir1[3])  # 切换工作路径
             remotenames = self.ftp.nlst()
             logging.info('FTP目录检测报告文件:%s' % remotenames)
             for filename in remotenames:

sf_mrs_connect/models/res_config_setting.py

@@ -140,5 +140,20 @@ class ResAgvSite(models.Model):
     _name = 'res.agv.site'
     _description = 'agv站点'
 
+    number = fields.Integer('编号')
     type = fields.Selection([('00', '位置编号'), ('01', '库区编号'), ('02', '货架编号')], '类型')
     content = fields.Char('内容')
+    site_prop = fields.Selection([('上产线', '上产线'), ('下产线', '下产线')], '属性')
+    state_status = fields.Selection([('占用', '占用'), ('空闲', '空闲')], '状态')
+    # remark = fields.Char
+    active = fields.Boolean('有效', default=True)
+
+    # @api.model
+    # def create(self, vals):
+    #     if vals.get('number', 'new') == 'new':
+    #         vals['number'] = self.env['ir.sequence'].next_by_code('res.agv.site') or '/'
+    #     return super(ResAgvSite, self).create(vals)
+
+    def unlink(self):
+        for item in self:
+            item.active == True

sf_mrs_connect/models/sync_common.py

@@ -2375,6 +2375,7 @@ class CuttingToolBasicParameters(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
+        logging.info(result)
         if result['status'] == 1:
             if 'basic_parameters_integral_tool' in result['cutting_tool_basic_parameters_all_list']:
                 if result['cutting_tool_basic_parameters_all_list']['basic_parameters_integral_tool']:

sf_mrs_connect/views/res_config_settings_views.xml

@@ -6,8 +6,10 @@
             <field name="model">res.agv.site</field>
             <field name="arch" type="xml">
                 <tree editable="bottom">
+                    <field name="number"/>
                     <field name="type"/>
                     <field name="content"/>
+                    <field name="state_status"/>
                 </tree>
             </field>
         </record>