jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

还原注释代码

Browse Source
This commit is contained in:
jinling.yang
2024-11-21 17:19:41 +08:00
parent 48371b01cd
commit d4ff4be32e
4 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sf_bf_connect/models/process_status.py
View File

@@ -49,15 +49,15 @@ class StatusChange(models.Model):
'process_start_time': process_start_time, 'process_start_time': process_start_time,
}, },
} }
# url1 = config['bfm_url_new'] + '/api/get/state/get_order' url1 = config['bfm_url_new'] + '/api/get/state/get_order'
# ret = requests.post(url1, json=json1, data=None) ret = requests.post(url1, json=json1, data=None)
# ret = ret.json() ret = ret.json()
# if not ret.get('error'): if not ret.get('error'):
# logging.info('接口已经执行=============') logging.info('接口已经执行=============')
# else: else:
# traceback_error = traceback.format_exc() traceback_error = traceback.format_exc()
# logging.error("bfm订单状态同步失败:%s" % traceback_error) logging.error("bfm订单状态同步失败:%s" % traceback_error)
# raise UserError('工厂加工同步订单状态到bfm失败') raise UserError('工厂加工同步订单状态到bfm失败')
except UserError as e: except UserError as e:
traceback_error = traceback.format_exc() traceback_error = traceback.format_exc()
logging.error("工厂加工同步订单状态失败:%s " % traceback_error) logging.error("工厂加工同步订单状态失败:%s " % traceback_error)

10
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1273,11 +1273,11 @@ class ResMrpWorkOrder(models.Model):
def button_finish(self): def button_finish(self):
for record in self: for record in self:
if record.routing_type == '装夹预调': if record.routing_type == '装夹预调':
# if not record.rfid_code and record.is_rework is False: if not record.rfid_code and record.is_rework is False:
# raise UserError("请扫RFID码进行绑定") raise UserError("请扫RFID码进行绑定")
# if record.is_rework is False: if record.is_rework is False:
# if not record.material_center_point: if not record.material_center_point:
# raise UserError("坯料中心点为空，请检查") raise UserError("坯料中心点为空，请检查")
# if record.X_deviation_angle <= 0: # if record.X_deviation_angle <= 0:
# raise UserError("X偏差角度小于等于0，请检查！本次计算的X偏差角度为：%s" % record.X_deviation_angle) # raise UserError("X偏差角度小于等于0，请检查！本次计算的X偏差角度为：%s" % record.X_deviation_angle)
record.process_state = '待加工' record.process_state = '待加工'

2
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -251,7 +251,7 @@
decoration-danger="tag_type == '重新加工'"/> decoration-danger="tag_type == '重新加工'"/>
<field name="is_test_env" invisible="1"/> <field name="is_test_env" invisible="1"/>
<field name="rfid_code" force_save="1" readonly="1" cache="True" <field name="rfid_code" force_save="1" readonly="1" cache="True"
attrs="{'invisible': [('rfid_code_old', '!=', False)]}" /> attrs="{'invisible': [('rfid_code_old', '!=', False)]}" widget='qrcode_widget' />
<field name="rfid_code" string="RFID码(手动输入框)" force_save="1" readonly="0" cache="True" <field name="rfid_code" string="RFID码(手动输入框)" force_save="1" readonly="0" cache="True"
attrs="{'invisible': ['|',('rfid_code_old', '!=', False), ('is_test_env', '=', False)]}"/> attrs="{'invisible': ['|',('rfid_code_old', '!=', False), ('is_test_env', '=', False)]}"/>
<field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/> <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>

76
sf_mrs_connect/controllers/controllers.py
View File

@@ -34,21 +34,21 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
request.env.ref("base.user_admin")).search(domain) request.env.ref("base.user_admin")).search(domain)
if productions: if productions:
# 拉取所有加工面的程序文件 # 拉取所有加工面的程序文件
# for r in ret['processing_panel'].split(','): for r in ret['processing_panel'].split(','):
# program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r) program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
# if os.path.exists(program_path_tmp_r): if os.path.exists(program_path_tmp_r):
# files_r = os.listdir(program_path_tmp_r) files_r = os.listdir(program_path_tmp_r)
# if files_r: if files_r:
# for file_name in files_r: for file_name in files_r:
# file_path = os.path.join(program_path_tmp_r, file_name) file_path = os.path.join(program_path_tmp_r, file_name)
# os.remove(file_path) os.remove(file_path)
# download_state = request.env['sf.cnc.processing'].with_user( download_state = request.env['sf.cnc.processing'].with_user(
# request.env.ref("base.user_admin")).download_file_tmp( request.env.ref("base.user_admin")).download_file_tmp(
# ret['folder_name'], r) ret['folder_name'], r)
# if download_state is False: if download_state is False:
# res['status'] = -2 res['status'] = -2
# res['message'] = '编程单号为%s的CNC程序文件从FTP拉取失败' % (ret['programming_no']) res['message'] = '编程单号为%s的CNC程序文件从FTP拉取失败' % (ret['programming_no'])
# return json.JSONEncoder().encode(res) return json.JSONEncoder().encode(res)
for production in productions: for production in productions:
for panel in ret['processing_panel'].split(','): for panel in ret['processing_panel'].split(','):
# 查询状态为进行中且工序类型为CNC加工的工单 # 查询状态为进行中且工序类型为CNC加工的工单
@@ -65,29 +65,29 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
cnc_workorder_has.write( cnc_workorder_has.write(
{'cnc_ids': cnc_workorder_has.cnc_ids.sudo()._json_cnc_processing(panel, ret), {'cnc_ids': cnc_workorder_has.cnc_ids.sudo()._json_cnc_processing(panel, ret),
'cmm_ids': cnc_workorder_has.cmm_ids.sudo()._json_cmm_program(panel, ret)}) 'cmm_ids': cnc_workorder_has.cmm_ids.sudo()._json_cmm_program(panel, ret)})
# for panel in ret['processing_panel'].split(','): for panel in ret['processing_panel'].split(','):
# # 查询状态为进行中且工序类型为CNC加工的工单 # 查询状态为进行中且工序类型为CNC加工的工单
# cnc_workorder = productions.workorder_ids.filtered( cnc_workorder = productions.workorder_ids.filtered(
# lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done', 'rework' lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done', 'rework'
# 'cancel'] and ac.processing_panel == panel) 'cancel'] and ac.processing_panel == panel)
# if cnc_workorder: if cnc_workorder:
# # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test', # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
# # panel) # panel)
# program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel) program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
# files_panel = os.listdir(program_path_tmp_panel) files_panel = os.listdir(program_path_tmp_panel)
# if files_panel: if files_panel:
# for file in files_panel: for file in files_panel:
# file_extension = os.path.splitext(file)[1] file_extension = os.path.splitext(file)[1]
# if file_extension.lower() == '.pdf': if file_extension.lower() == '.pdf':
# panel_file_path = os.path.join(program_path_tmp_panel, file) panel_file_path = os.path.join(program_path_tmp_panel, file)
# logging.info('panel_file_path:%s' % panel_file_path) logging.info('panel_file_path:%s' % panel_file_path)
# cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())}) cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
# pre_workorder = productions.workorder_ids.filtered( pre_workorder = productions.workorder_ids.filtered(
# lambda ap: ap.routing_type == '装夹预调' and ap.state not in ['done', 'rework' lambda ap: ap.routing_type == '装夹预调' and ap.state not in ['done', 'rework'
# 'cancel'] and ap.processing_panel == panel) 'cancel'] and ap.processing_panel == panel)
# if pre_workorder: if pre_workorder:
# pre_workorder.write( pre_workorder.write(
# {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())}) {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
productions.write({'programming_state': '已编程', 'work_state': '已编程'}) productions.write({'programming_state': '已编程', 'work_state': '已编程'})
logging.info('已更新制造订单编程状态:%s' % productions.ids) logging.info('已更新制造订单编程状态:%s' % productions.ids)
res.update({ res.update({