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..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程序数据'} diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index 68ee8f9c..d2938c88 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -227,9 +227,6 @@ - - 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):