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

Accept Merge Request #2183: (feature/需求计划 -> develop)

Browse Source 
Merge Request: 需求计划

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2183
This commit is contained in:
管欢
2025-06-11 09:22:25 +08:00
committed by Coding
parent 39a25bb6c8 0e753b1c85
commit 9cbd311fec
15 changed files with 898 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_mrs_connect/controllers/controllers.py
View File

@@ -91,12 +91,15 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
files_panel = os.listdir(program_path_tmp_panel)
panel_file_path = ''
panel_file_name = ''
if files_panel:
for file in files_panel:
file_extension = os.path.splitext(file)[1]
if file_extension.lower() == '.pdf':
panel_file_path = os.path.join(program_path_tmp_panel, file)
panel_file_name = os.path.splitext(file)[0]
logging.info('panel_file_path:%s' % panel_file_path)
logging.info('panel_file_name:%s' % panel_file_name)
# 向编程单中添加二维码
request.env['printing.utils'].add_qr_code_to_pdf(
@@ -105,7 +108,8 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
"模型ID：%s" % model_id,
"零件图号：%s" % part_number if part_number else None
)
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()),
'cnc_worksheet_name': panel_file_name})
pre_workorder = productions.workorder_ids.filtered(
lambda ap: ap.routing_type in ['装夹预调', '人工线下加工'] and ap.state not in ['done', 'rework'
'cancel'] and ap.processing_panel == panel)