From 5997cbcb0e79e0aad99e4c1fe506d8a164b1aa9b Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Fri, 28 Jun 2024 12:00:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?download=5Fprogram=5Ffile=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E9=97=ADftp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_mrs_connect/models/ftp_operate.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sf_mrs_connect/models/ftp_operate.py b/sf_mrs_connect/models/ftp_operate.py index 6d7d172c..3183c0f6 100644 --- a/sf_mrs_connect/models/ftp_operate.py +++ b/sf_mrs_connect/models/ftp_operate.py @@ -28,15 +28,11 @@ class FtpController(): logging.info("dirname:%s" % os.path.dirname(path)) directories = os.path.normpath(path).split(os.path.sep) # 切换到上级目录 - current_dir = '/' for directory in directories: if directory: # 检查目录是否存在 if (directory in ['NC']) or (directory not in ['home', 'ftp', 'ftp_root', 'NC']): self.ftp.cwd(directory) - if directory not in ['home', 'ftp', 'ftp_root', 'NC']: - # 切换到新的目录 - self.ftp.cwd(directory) return os.path.basename(path) except Exception as e: logging.error(f"Error checking file: {e}") @@ -69,6 +65,9 @@ class FtpController(): return True except: return False + finally: + self.ftp.quit() + logging.info("ftp已关闭") # # 检测字符串的编码 # def detect_encoding(self, s): From 3b24f90385bd70123f9e40b297d925ccef703ffe Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Fri, 28 Jun 2024 14:20:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E5=8D=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8C=89Rfid=E6=90=9C=E7=B4=A2=EF=BC=8C=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E5=A4=9A=E4=BD=99=E7=9A=84Rfid=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=9B2=E3=80=81=E4=BC=98=E5=8C=96=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=A5=E6=9C=9F=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/security/ir.model.access.csv | 4 ++-- sf_machine_connect/views/WorkCenterBarcodes.xml | 1 + sf_manufacturing/controllers/controllers.py | 8 ++++---- sf_manufacturing/views/mrp_workorder_view.xml | 3 --- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv index 09b96baa..ecc572c7 100644 --- a/sf_base/security/ir.model.access.csv +++ b/sf_base/security/ir.model.access.csv @@ -11,8 +11,8 @@ access_sf_machine_control_system,sf_machine_control_system,model_sf_machine_cont access_sf_machine_control_system_admin,sf_machine_control_system_admin,model_sf_machine_control_system,base.group_system,1,1,1,0 access_sf_production_process_group_sale_director,sf_production_process_group_sale_director,model_sf_production_process,sf_base.group_sale_director,1,0,0,0 access_sf_production_process_group_sale_salemanager,sf_production_process_group_sale_salemanager,model_sf_production_process,sf_base.group_sale_salemanager,1,0,0,0 -access_res_partner_category_group_sale_salemanager,res_partner_category_group_sale_salemanager,base.model_res_partner_category,sf_base.group_sale_salemanager,1,0,1,0 -access_res_partner_category_group_sale_director,res_partner_category_group_sale_director,base.model_res_partner_category,sf_base.group_sale_director,1,0,1,0 +access_res_partner_category_group_sale_salemanager,res_partner_category_group_sale_salemanager,base.model_res_partner_category,sf_base.group_sale_salemanager,1,1,1,0 +access_res_partner_category_group_sale_director,res_partner_category_group_sale_director,base.model_res_partner_category,sf_base.group_sale_director,1,1,1,0 access_sf_production_process,sf_production_process,model_sf_production_process,base.group_user,1,1,1,0 access_sf_production_process_admin,sf_production_process_admin,model_sf_production_process,base.group_system,1,1,1,0 access_sf_production_materials,sf_production_materials,model_sf_production_materials,base.group_user,1,1,1,0 diff --git a/sf_machine_connect/views/WorkCenterBarcodes.xml b/sf_machine_connect/views/WorkCenterBarcodes.xml index aea9731b..9e5d3982 100644 --- a/sf_machine_connect/views/WorkCenterBarcodes.xml +++ b/sf_machine_connect/views/WorkCenterBarcodes.xml @@ -27,6 +27,7 @@ + diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index 4af8315b..af195938 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -318,13 +318,13 @@ class Manufacturing_Connect(http.Controller): [('rfid_code', '=', ret['RfidCode']), ('routing_type', '=', 'CNC加工')]) if workorder: for item in workorder.cmm_ids: - if item.program_date is not False: - program_date = item.program_date.strftime("%Y-%m-%d %H:%M:%S") - program_date_str = request.env['sf.sync.common'].sudo().get_add_time(program_date) + if item.program_create_date is not False: + program_create_date = item.program_create_date.strftime("%Y-%m-%d %H:%M:%S") + program_date_str = request.env['sf.sync.common'].sudo().get_add_time(program_create_date) res['Datas'].append({ 'CraftId': workorder.id, 'CraftKey': workorder.name, - 'ProgramDate': '' if not item.program_date else program_date_str, + 'ProgramDate': '' if not item.program_create_date else program_date_str, 'ProgramPath': item.program_path, 'PostProcessing': item.post_processing_name, }) diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index 790c0551..e33f20e1 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -227,9 +227,6 @@ - - From d281026086cbabc9792f3789b0e5ee1d9357f421 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Fri, 28 Jun 2024 14:23:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcmm=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/controllers/controllers.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index 4af8315b..afb3681c 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -318,15 +318,15 @@ class Manufacturing_Connect(http.Controller): [('rfid_code', '=', ret['RfidCode']), ('routing_type', '=', 'CNC加工')]) if workorder: for item in workorder.cmm_ids: - if item.program_date is not False: - program_date = item.program_date.strftime("%Y-%m-%d %H:%M:%S") - program_date_str = request.env['sf.sync.common'].sudo().get_add_time(program_date) + if item.program_create_date is not False: + program_create_date = item.program_create_date.strftime("%Y-%m-%d %H:%M:%S") + program_date_str = request.env['sf.sync.common'].sudo().get_add_time(program_create_date) res['Datas'].append({ 'CraftId': workorder.id, 'CraftKey': workorder.name, - 'ProgramDate': '' if not item.program_date else program_date_str, + 'ProgramDate': '' if not item.program_create_date else program_date_str, 'ProgramPath': item.program_path, - 'PostProcessing': item.post_processing_name, + 'PostProcessing': item.program_name, }) else: res = {'Succeed': False, 'ErrorCode': 203, 'Error': '暂无工单及对应的CNC程序数据'}