附件新增字段
This commit is contained in:
@@ -294,8 +294,6 @@ class ResMrpWorkOrder(models.Model):
|
|||||||
else:
|
else:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
# def fetchCNCing(self):
|
|
||||||
# return None
|
|
||||||
|
|
||||||
# cnc程序获取
|
# cnc程序获取
|
||||||
def fetchCNC(self):
|
def fetchCNC(self):
|
||||||
@@ -346,20 +344,10 @@ class ResMrpWorkOrder(models.Model):
|
|||||||
self.write(
|
self.write(
|
||||||
{'programming_no': ret['programming_no'], 'programming_state': '编程中', 'work_state': '编程中'})
|
{'programming_no': ret['programming_no'], 'programming_state': '编程中', 'work_state': '编程中'})
|
||||||
else:
|
else:
|
||||||
logging.info('fetchCNC-error:%s' % cnc)
|
|
||||||
raise UserError(ret['message'])
|
raise UserError(ret['message'])
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logging.info('fetchCNC error:%s' % e)
|
logging.info('fetchCNC error:%s' % e)
|
||||||
raise UserError(e)
|
raise UserError("cnc程序获取编程单失败,请联系管理员")
|
||||||
|
|
||||||
# return {
|
|
||||||
# 'name': _("工单"),
|
|
||||||
# 'view_mode': 'form',
|
|
||||||
# 'res_model': 'mrp.workorder',
|
|
||||||
# 'res_id': self.id,
|
|
||||||
# 'type': 'ir.actions.act_window',
|
|
||||||
# 'target': 'new'
|
|
||||||
# }
|
|
||||||
|
|
||||||
def json_workorder_str1(self, k, production, route):
|
def json_workorder_str1(self, k, production, route):
|
||||||
workorders_values_str = [0, '', {
|
workorders_values_str = [0, '', {
|
||||||
@@ -495,11 +483,13 @@ class CNCprocessing(models.Model):
|
|||||||
cnc_file_path = os.path.join(serverdir, root, f)
|
cnc_file_path = os.path.join(serverdir, root, f)
|
||||||
logging.info('cnc_file_path:%s' % cnc_file_path)
|
logging.info('cnc_file_path:%s' % cnc_file_path)
|
||||||
self.write_file(cnc_file_path, cnc_processing)
|
self.write_file(cnc_file_path, cnc_processing)
|
||||||
|
|
||||||
# 创建附件(nc文件)
|
# 创建附件(nc文件)
|
||||||
def attachment_create(self, name, data):
|
def attachment_create(self, name, data):
|
||||||
attachment = self.env['ir.attachment'].create({
|
attachment = self.env['ir.attachment'].create({
|
||||||
'datas': base64.b64encode(data),
|
'datas': base64.b64encode(data),
|
||||||
'type': 'binary',
|
'type': 'binary',
|
||||||
|
'public': True,
|
||||||
'description': '程序文件',
|
'description': '程序文件',
|
||||||
'name': name
|
'name': name
|
||||||
})
|
})
|
||||||
@@ -527,20 +517,6 @@ class CNCprocessing(models.Model):
|
|||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
# 将nc文件对应的excel清单转为pdf
|
|
||||||
# def to_pdf(self, excel_path, pdf_path):
|
|
||||||
# """
|
|
||||||
# 需要在linux中下载好libreoffice
|
|
||||||
# """
|
|
||||||
# logging.info('pdf_path:%s' % pdf_path)
|
|
||||||
# logging.info('pdf_path:%s' % excel_path)
|
|
||||||
# # 注意cmd中的libreoffice要和linux中安装的一致
|
|
||||||
# cmd = 'soffice --headless --convert-to pdf'.split() + [excel_path] + ['--outdir'] + [pdf_path]
|
|
||||||
# p = subprocess.Popen(cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE, bufsize=1)
|
|
||||||
# # p.wait(timeout=30) # 停顿30秒等待转化
|
|
||||||
# # stdout, stderr = p.communicate()
|
|
||||||
# p.communicate()
|
|
||||||
|
|
||||||
|
|
||||||
class SfWorkOrderBarcodes(models.Model):
|
class SfWorkOrderBarcodes(models.Model):
|
||||||
"""
|
"""
|
||||||
|
|||||||
Reference in New Issue
Block a user