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

Merge branch 'feature/从ftp获取cnc程序文件' into develop

Browse Source 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
This commit is contained in:
jinling.yang
2022-11-30 17:27:47 +08:00
parent d1d748cf11 1bf8e8a268
commit 096cd44b9c
5 changed files with 89 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1,18 +1,17 @@
import os
import json
import math
import requests
import logging
import base64
from datetime import datetime
from dateutil.relativedelta import relativedelta
from odoo import api, fields, models, SUPERUSER_ID, _
<<<<<<< HEAD
from odoo.exceptions import ValidationError
from odoo.addons.sf_base.commons.common import Common
=======
from odoo.addons.sf_base.commons.common import Common
from odoo.exceptions import UserError
>>>>>>> b2d1e9ce8c5d8965ed09c3fbd6de543708223487
from odoo.addons.sf_mrs_connect.models.ftp_operate import FtpController
class ResMrpWorkOrder(models.Model):
@@ -347,7 +346,7 @@ class CNCprocessing(models.Model):
workorder = self.env['mrp.workorder'].search([('production_id.name', '=', obj['manufacturing_order_no']),
('processing_panel', '=', obj['processing_panel']),
('routing_type', '=', 'CNC加工')])
self.env['sf.cnc.processing'].create({
vals = {
'workorder_id': workorder.id,
'sequence_number': obj['sequence_number'],
'program_name': obj['program_name'],
@@ -359,9 +358,37 @@ class CNCprocessing(models.Model):
'depth_of_processing_z': obj['depth_of_processing_z'],
'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
'estimated_processing_time': obj['estimated_processing_time'],
'remark': obj['remark']
# 'FJGDate': obj['']
}
return self.env['sf.cnc.processing'].create(vals)
def attachment_create(self, name, data):
attachment = self.env['ir.attachment'].create({
'datas': base64.b64encode(data),
'type': 'binary',
'description': '程序文件',
'name': name
})
return attachment
def download_file_tmp(self, model_code, processing_panel):
remotepath = os.path.join('/', model_code, 'return', processing_panel)
serverdir = os.path.join('/tmp', model_code, 'return', processing_panel)
ftp = FtpController()
ftp.download_file_tree(remotepath, serverdir)
return serverdir
def write_file(self, nc_file_path, cnc):
if os.path.exists(nc_file_path):
with open(nc_file_path, 'rb') as file:
data_bytes = file.read()
attachment = self.attachment_create(cnc.program_name + '.NC', data_bytes)
cnc.write({'cnc_id': attachment.id})
file.close()
else:
return False
class SfWorkOrderBarcodes(models.Model):
"""
@@ -371,9 +398,8 @@ class SfWorkOrderBarcodes(models.Model):
_inherit = ["mrp.workorder", "barcodes.barcode_events_mixin"]
def on_barcode_scanned(self, barcode):
tray_code = self.env['sf.tray'].search([('code', '=', barcode)])
self.tray_code = tray_code.code
workorder = self.env['mrp.workorder'].browse(self.ids)
workorder.gettray_auto(barcode)
workorder.gettray_auto(barcode)