合并sf代码
This commit is contained in:
gqh
@@ -14,7 +14,6 @@
|
||||
'data': [
|
||||
# 定义权限组放在最上面
|
||||
# 权限组
|
||||
"security/ir.model.access.csv",
|
||||
'views/compensation.xml',
|
||||
'views/ftp_button.xml',
|
||||
'views/SfWorkOrderBarcodes.xml',
|
||||
@@ -23,6 +22,9 @@
|
||||
'views/machine_monitor.xml',
|
||||
],
|
||||
|
||||
'assets': {
|
||||
},
|
||||
|
||||
'installable': True,
|
||||
'application': True,
|
||||
# 'auto_install': False,
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from odoo import api, fields, models
|
||||
|
||||
# ----------------------------------------------------------
|
||||
# Models for Simulation
|
||||
# ----------------------------------------------------------
|
||||
class Simulation(models.Model):
|
||||
_name = 'simulation'
|
||||
_description = 'SIMULATION'
|
||||
|
||||
name = fields.Char('Name', size=50, readonly=True)
|
||||
place_value = fields.Boolean(String="位值")
|
||||
place_value_random = fields.Boolean(String="位值随机")
|
||||
place_value_ai = fields.Boolean(String="位值自增")
|
||||
place_value_list = fields.Boolean(String="位值列表")
|
||||
|
||||
unsigned_integer_8_DO = fields.Integer(Sting="无符号8位整数D0")
|
||||
unsigned_integer_8_D1 = fields.Integer(Sting="无符号8位整数D1")
|
||||
unsigned_integer_8_random = fields.Integer(Sting="无符号8位整数随机")
|
||||
unsigned_integer_8_ai = fields.Integer(Sting="无符号8位整数自增")
|
||||
unsigned_integer_8_list = fields.Integer(Sting="无符号8位整数列表")
|
||||
|
||||
integer_8 = fields.Integer(String="有符号8位整数")
|
||||
integer_8_random = fields.Integer(String="有符号8位整数随机")
|
||||
integer_8_ai = fields.Integer(String="有符号8位整数自增")
|
||||
integer_8_ad = fields.Integer(String="有符号8位整数自减")
|
||||
integer_16 = fields.Integer(String="有符号16位整数")
|
||||
integer_16_random = fields.Integer(String="有符号16位整数随机")
|
||||
integer_16_list = fields.Integer(String="有符号16位整数列表")
|
||||
|
||||
|
||||
|
||||
|
||||
# ----------------------------------------------------------
|
||||
# Models for Mitsubishi
|
||||
# ----------------------------------------------------------
|
||||
class MitsuCnc(models.Model):
|
||||
_name = 'mitsu.cnc'
|
||||
_description = 'Mitsubishi CNC'
|
||||
|
||||
name = fields.Char('Name', size=50, readonly=True)
|
||||
status = fields.Boolean(string="状态")
|
||||
@@ -1,22 +1,21 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
import base64
|
||||
|
||||
import psycopg2
|
||||
import os
|
||||
import logging
|
||||
from zeep.exceptions import ValidationError
|
||||
|
||||
from odoo import http
|
||||
from ftplib import FTP
|
||||
from odoo.http import request
|
||||
from odoo import api, fields, models
|
||||
import json
|
||||
import hashlib
|
||||
import time
|
||||
import requests
|
||||
from datetime import datetime
|
||||
|
||||
from odoo import fields, models, api, _
|
||||
from odoo.exceptions import ValidationError
|
||||
from odoo.exceptions import UserError
|
||||
from odoo.addons.sf_machine_connect.models import py2opcua, ftp_operate
|
||||
# from .ftp_operate import FtpController
|
||||
# from .py2opcua import Py2opcua
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# ----------------------------------------------------------
|
||||
# Models for client
|
||||
# ----------------------------------------------------------
|
||||
@@ -24,8 +23,13 @@ _logger = logging.getLogger(__name__)
|
||||
class FtpButton(models.Model):
|
||||
_inherit = 'sf.cnc.processing'
|
||||
|
||||
button_state = fields.Boolean(string='是否已经下发')
|
||||
|
||||
def pri(self):
|
||||
print('11111111111111111')
|
||||
"""
|
||||
一个测试函数，用于检测能否从”获取cnc程序“处获得NC代码文件
|
||||
:return:
|
||||
"""
|
||||
s = self.cnc_id
|
||||
s1 = self.cnc_id._filestore()
|
||||
print(s1)
|
||||
@@ -36,72 +40,115 @@ class FtpButton(models.Model):
|
||||
ftp_operate.FtpController.prin(self)
|
||||
|
||||
def up(self):
|
||||
# self.env['mrp.workorder'].check_compensation_before_up()
|
||||
ftp = ftp_operate.FtpController()
|
||||
# ftp.delAllfile('C://Users//马广威//Desktop//ftp')
|
||||
a = self.cnc_id
|
||||
print(a.display_name)
|
||||
_logger.info(a.display_name)
|
||||
datas = base64.standard_b64decode(a.datas)
|
||||
# file_path = '{}\{}\{}'.format(a._filestore(), a.store_fname.split('/'[0]), a.display_name)
|
||||
"""
|
||||
此函数用于将NC代码下发到机床
|
||||
:return:
|
||||
"""
|
||||
# 点击下发按钮自动补偿三元检测偏差值
|
||||
|
||||
# 此方法不走ftp，直接文件写入，暂不确定能否写入ftp服务器，但可以转成ftp方法，只是要把文件暂存到本地，再上传
|
||||
# file_path_local = '{}\{}'.format('C://Users//马广威//Desktop//ftp', a.display_name)
|
||||
file_path_local = '{}/{}'.format('/nc2machine', a.display_name)
|
||||
file_path_remote = '{}\{}'.format('//(192,168,2,141)//DS', a.display_name)
|
||||
try:
|
||||
try:
|
||||
if self.sequence_number == '1':
|
||||
self.check_compensation_before_up()
|
||||
except Exception:
|
||||
raise UserError("补偿值写入执行超时，请检查机床状态或者写入状态")
|
||||
|
||||
ftp = ftp_operate.FtpController()
|
||||
# ftp.delAllfile('C://Users//马广威//Desktop//ftp')
|
||||
a = self.cnc_id
|
||||
_logger.info(a.public)
|
||||
_logger.info(a.display_name)
|
||||
datas = base64.standard_b64decode(a.datas)
|
||||
|
||||
with open(file_path_local, mode='wb+') as file:
|
||||
file.write(datas)
|
||||
# file_path = '{}\{}\{}'.format(a._filestore(), a.store_fname.split('/'[0]), a.display_name)
|
||||
file_path_local = '{}/{}'.format('/nc2machine', a.display_name)
|
||||
file_path_remote = '{}\{}'.format('//(192,168,2,141)//DS', a.display_name)
|
||||
|
||||
# file = open(file_path_local, 'wb+')
|
||||
# file.write(datas)
|
||||
# file.close()
|
||||
with open(file_path_local, mode='wb+') as file:
|
||||
file.write(datas)
|
||||
# 存在本地的文件下发到机床
|
||||
ftp.upload_file(remotepath=file_path_remote, localpath=file_path_local)
|
||||
except Exception as e:
|
||||
_logger.info("=====================================", e)
|
||||
raise UserError('NC下发执行超时, 请检查下发状态')
|
||||
|
||||
# 存在本地的文件下发到机床
|
||||
ftp.upload_file(remotepath=file_path_remote, localpath=file_path_local)
|
||||
# 补偿下发都执行完毕后，按钮标志位变为true
|
||||
self.button_state = True
|
||||
|
||||
# 新增，下发完成返回当前工单位置
|
||||
# return {
|
||||
# 'name': _("工单"),
|
||||
# 'view_mode': 'form',
|
||||
# 'res_model': 'mrp.workorder',
|
||||
# 'res_id': self.workorder_id,
|
||||
# 'type': 'ir.actions.act_window',
|
||||
# 'target': 'new'
|
||||
# }
|
||||
|
||||
class FtpClient(models.Model):
|
||||
_name = "ftp.client"
|
||||
_description = 'Ftp Client'
|
||||
|
||||
name = fields.Char('Name', size=50, readonly=True)
|
||||
description = fields.Char(size=50)
|
||||
mobile = fields.Char(size=50)
|
||||
|
||||
def up(self):
|
||||
ftp = ftp_operate.FtpController()
|
||||
# FtpController.__init__(self, host="127.0.0.1", port=2121, username="admin", password="123456")
|
||||
ftp.upload_file(remotepath='/(192,168,199,2)/DS/02-222.NC', localpath='D:/ftp/up/02-222.NC')
|
||||
|
||||
# def delete(self):
|
||||
# ftp = FtpController()
|
||||
# ftp.del_file()
|
||||
|
||||
#
|
||||
# def _compute_ip_url(self):
|
||||
# for box in self:
|
||||
# if not box.ip:
|
||||
# box.ip_url = False
|
||||
# else:
|
||||
# url = 'https://%s' if box.get_base_url()[:5] == 'https' else 'http://%s:8069'
|
||||
# box.ip_url = url % box.ip
|
||||
#
|
||||
# def _compute_device_count(self):
|
||||
# for box in self:
|
||||
# box.device_count = len(box.device_ids)
|
||||
def check_compensation_before_up(self):
|
||||
"""
|
||||
下发NC代码前自动补偿三元检测偏差值
|
||||
:return:
|
||||
"""
|
||||
try:
|
||||
temp_dict = {}
|
||||
temp_dict[
|
||||
'ns=1;s=Project_Default.Group1.Mitsubishi_NC2.hongbianliang550'] = self.workorder_id.compensation_value_x
|
||||
temp_dict[
|
||||
'ns=1;s=Project_Default.Group1.Mitsubishi_NC2.hongbianliang551'] = self.workorder_id.compensation_value_y
|
||||
temp = py2opcua.Py2opcua()
|
||||
# temp.connect()
|
||||
temp.write(temp_dict)
|
||||
# temp.disconnect()
|
||||
except Exception as e:
|
||||
_logger.info("=====================================", e)
|
||||
raise UserError('补偿值获取失败，或机床未连接，请检查')
|
||||
|
||||
|
||||
class Machine_ftp(models.Model):
|
||||
# _name = 'data.collection'
|
||||
"""
|
||||
数据采集类
|
||||
"""
|
||||
_inherit = 'sf.machine_tool'
|
||||
|
||||
timestamp = fields.Datetime('时间戳', readonly=True)
|
||||
signed = fields.Integer('刷新间隔', readonly=True)
|
||||
status = fields.Boolean('在线状态', readonly=True)
|
||||
time_on = fields.Char('总在线时长', readonly=True)
|
||||
time_on_now = fields.Char('本次在线时长', readonly=True)
|
||||
tool_num = fields.Integer('当前刀具', readonly=True)
|
||||
program = fields.Char('当前程序', readonly=True)
|
||||
run_status = fields.Selection([('0', '空闲中'), ('1', '加工中'), ('2', '加工中'), ('3', '等待中')], string='运行状态',
|
||||
readonly=True, default='0')
|
||||
run_time = fields.Char('总运行时长', readonly=True)
|
||||
cut_time = fields.Char('总切削时长', readonly=True)
|
||||
cut_status = fields.Selection([('0', '未切削'), ('1', '切削中'), ('2', '切削中'), ('3', '切削中')], string='切削状态',
|
||||
readonly=True, default='0')
|
||||
|
||||
tool_num_process_time1 = fields.Char('刀位1', readonly=True, default='0')
|
||||
tool_num_process_time2 = fields.Char('刀位2', readonly=True, default='0')
|
||||
tool_num_process_time3 = fields.Char('刀位3', readonly=True, default='0')
|
||||
tool_num_process_time4 = fields.Char('刀位4', readonly=True, default='0')
|
||||
tool_num_process_time5 = fields.Char('刀位5', readonly=True, default='0')
|
||||
tool_num_process_time6 = fields.Char('刀位6', readonly=True, default='0')
|
||||
tool_num_process_time7 = fields.Char('刀位7', readonly=True, default='0')
|
||||
tool_num_process_time8 = fields.Char('刀位8', readonly=True, default='0')
|
||||
tool_num_process_time9 = fields.Char('刀位9', readonly=True, default='0')
|
||||
tool_num_process_time10 = fields.Char('刀位10', readonly=True, default='0')
|
||||
tool_num_process_time11 = fields.Char('刀位11', readonly=True, default='0')
|
||||
tool_num_process_time12 = fields.Char('刀位12', readonly=True, default='0')
|
||||
tool_num_process_time13 = fields.Char('刀位13', readonly=True, default='0')
|
||||
tool_num_process_time14 = fields.Char('刀位14', readonly=True, default='0')
|
||||
tool_num_process_time15 = fields.Char('刀位15', readonly=True, default='0')
|
||||
tool_num_process_time16 = fields.Char('刀位16', readonly=True, default='0')
|
||||
tool_num_process_time17 = fields.Char('刀位17', readonly=True, default='0')
|
||||
tool_num_process_time18 = fields.Char('刀位18', readonly=True, default='0')
|
||||
tool_num_process_time19 = fields.Char('刀位19', readonly=True, default='0')
|
||||
tool_num_process_time20 = fields.Char('刀位20', readonly=True, default='0')
|
||||
tool_num_process_time21 = fields.Char('刀位21', readonly=True, default='0')
|
||||
tool_num_process_time22 = fields.Char('刀位22', readonly=True, default='0')
|
||||
tool_num_process_time23 = fields.Char('刀位23', readonly=True, default='0')
|
||||
tool_num_process_time24 = fields.Char('刀位24', readonly=True, default='0')
|
||||
|
||||
|
||||
class WorkCenterBarcode(models.Model):
|
||||
@@ -109,45 +156,56 @@ class WorkCenterBarcode(models.Model):
|
||||
扫码托盘码可查到制造订单，由制造订单查工单
|
||||
"""
|
||||
_inherit = "mrp.workorder"
|
||||
|
||||
compensation_value_x = fields.Float(string='X轴补偿值')
|
||||
compensation_value_y = fields.Float(string='Y轴补偿值')
|
||||
button_compensation_state = fields.Boolean(string='是否已经补偿')
|
||||
|
||||
def compensation(self):
|
||||
'''
|
||||
"""
|
||||
将节点与其值放入字典，字典作为参数传入
|
||||
:return:
|
||||
'''
|
||||
temp_dict = {}
|
||||
temp_dict['ns=1;s=Project_Default.Group1.Mitsubishi_NC.hongbianliang520'] = self.compensation_value_x
|
||||
temp_dict['ns=1;s=Project_Default.Group1.Mitsubishi_NC.hongbianliang521'] = self.compensation_value_y
|
||||
print("测试补偿能够执行")
|
||||
temp = py2opcua.Py2opcua()
|
||||
_logger.info(temp)
|
||||
temp.connect()
|
||||
temp.write(temp_dict)
|
||||
temp.disconnect()
|
||||
|
||||
def check_compensation_before_up(self):
|
||||
temp_value = self.env['mrp.workorder'].getcenter()
|
||||
_logger.info("====================================================================================")
|
||||
_logger.info(temp_value)
|
||||
if temp_value[0] == 0 or temp_value[1] != 0:
|
||||
"""
|
||||
try:
|
||||
temp_dict = {}
|
||||
# temp_dict['ns=1;s=Project_Default.Group1.Mitsubishi_NC.hongbianliang520'] = temp_value[0]
|
||||
temp_dict['ns=1;s=Project_Default.Group1.Mitsubishi_NC.hongbianliang520'] = 111
|
||||
temp_dict['ns=1;s=Project_Default.Group1.Mitsubishi_NC.hongbianliang521'] = 111
|
||||
# temp_dict['ns=1;s=Project_Default.Group1.Mitsubishi_NC.hongbianliang521'] = temp_value[1]
|
||||
print("测试补偿能够执行")
|
||||
temp_dict['ns=1;s=Project_Default.Group1.Mitsubishi_NC2.hongbianliang550'] = self.compensation_value_x
|
||||
temp_dict['ns=1;s=Project_Default.Group1.Mitsubishi_NC2.hongbianliang551'] = self.compensation_value_y
|
||||
temp = py2opcua.Py2opcua()
|
||||
_logger.info(temp)
|
||||
temp.connect()
|
||||
# temp.connect()
|
||||
temp.write(temp_dict)
|
||||
temp.disconnect()
|
||||
self.button_compensation_state = True
|
||||
# temp.disconnect()
|
||||
except Exception as e:
|
||||
_logger.info("=====================================", e)
|
||||
raise UserError('补偿值获取失败，或机床未连接，请检查')
|
||||
|
||||
def get__state(self):
|
||||
pay_time = str(datetime.now())
|
||||
json = {
|
||||
'params': {
|
||||
'model_name': 'jikimo.process.order',
|
||||
'field_name': 'name',
|
||||
'default_code': 'PO-2022-1207-0020',
|
||||
'state': '待付款',
|
||||
# 'pay_time': pay_time,
|
||||
# 'get_order_sf': 21,
|
||||
|
||||
},
|
||||
}
|
||||
# res_str = json.dumps(vals)
|
||||
url = 'https://bfm.cs.jikimo.com/api/get/state'
|
||||
requests.post(url, json=json, data=None)
|
||||
|
||||
def process_control(self):
|
||||
|
||||
def test(self, barcode):
|
||||
# 托盘对象
|
||||
tray = self.env('sf.tray').search("code", "=", barcode)
|
||||
product = tray.product_id
|
||||
if self.routing_type == '获取CNC加工程序' and self.state == '进行中':
|
||||
json = {
|
||||
'params': {
|
||||
'model_name': 'jikimo.process.order',
|
||||
'field_name': 'name',
|
||||
'default_code': 'PO-2022-1123-0014',
|
||||
'state': '加工中',
|
||||
},
|
||||
}
|
||||
url = 'https://bfm.cs.jikimo.com/api/get/state'
|
||||
requests.post(url, json=json, data=None)
|
||||
|
||||
@@ -2,13 +2,18 @@
|
||||
import os
|
||||
from ftplib import FTP
|
||||
|
||||
|
||||
class FTP_P(FTP):
|
||||
"""
|
||||
重写FTP类，重写dirs方法
|
||||
"""
|
||||
|
||||
def dirs(self, *args):
|
||||
'''List a directory in long form.
|
||||
"""List a directory in long form.
|
||||
By default list current directory to stdout.
|
||||
Optional last argument is callback function; all
|
||||
non-empty arguments before it are concatenated to the
|
||||
LIST command. (This *should* only be used for a pathname.)'''
|
||||
LIST command. (This *should* only be used for a pathname.)"""
|
||||
cmd = 'LIST'
|
||||
templist = []
|
||||
tempdic = {}
|
||||
@@ -19,7 +24,6 @@ class FTP_P(FTP):
|
||||
if arg:
|
||||
cmd = cmd + (' ' + arg)
|
||||
self.retrlines(cmd, templist.append)
|
||||
# print(templist)
|
||||
# 处理返回结果，只需要目录名称
|
||||
r_files = [file.split(" ")[-1] for file in templist]
|
||||
tempdic['name'] = [file for file in r_files if file != "." and file != ".."]
|
||||
@@ -27,13 +31,14 @@ class FTP_P(FTP):
|
||||
return tempdic
|
||||
# return [file for file in r_files if file != "." and file != ".."]
|
||||
|
||||
# FTP接口类
|
||||
class FtpController():
|
||||
|
||||
'''
|
||||
# FTP接口类
|
||||
class FtpController:
|
||||
"""
|
||||
这是ftp接口类，在类初始化的时候就连接了ftp服务器，能否成功连接有反馈。
|
||||
类中定义了两个接口：上传接口和删除接口
|
||||
'''
|
||||
"""
|
||||
|
||||
# 三菱机床连接
|
||||
def __init__(self, host="192.168.2.158", port=8080, username="MITSUBISHI", password="CNC"):
|
||||
self.host = host
|
||||
@@ -42,47 +47,41 @@ class FtpController():
|
||||
self.password = password
|
||||
ftp = FTP_P()
|
||||
# self.ftp.set_debuglevel(2) #打开调试级别2，显示详细信息
|
||||
ftp.set_pasv(0) #0主动模式 1 #被动模式
|
||||
ftp.set_pasv(0) # 0主动模式 1 #被动模式
|
||||
try:
|
||||
ftp.connect(self.host, self.port)
|
||||
ftp.login(self.username, self.password)
|
||||
print("连接成功")
|
||||
self.ftp = ftp
|
||||
except:
|
||||
print("连接失败")
|
||||
except Exception as e:
|
||||
print("连接失败" + str(e))
|
||||
|
||||
# 试验接口
|
||||
def prin(self):
|
||||
print("这是试验接口")
|
||||
|
||||
# 试验ftp服务器连接
|
||||
# def connect(self, host="127.0.0.1", port=2121, username="admin", password="123456"):
|
||||
# ftp = FTP_P()
|
||||
# try:
|
||||
# ftp.connect(host, port)
|
||||
# ftp.login(username, password)
|
||||
# print("连接成功")
|
||||
# ftp1 = ftp
|
||||
# return ftp1
|
||||
# except:
|
||||
# print("连接失败")
|
||||
|
||||
|
||||
# 三菱代码下发
|
||||
def upload_file(self, remotepath='/(192,168,199,2)/DS/Z4.5.NC', localpath='D:/ftp/up/Z4.5.NC'):
|
||||
'''
|
||||
"""
|
||||
第一个是要上传到ftp服务器路径下的文件，第二个是本地要上传的的路径文件
|
||||
:param remotepath: 上传和下载都需要设置工作目录，注意只能使用文件名，不能有路径中的冒号
|
||||
:param localpath:
|
||||
:return:
|
||||
'''
|
||||
"""
|
||||
bufsize = 1024
|
||||
fp = open(localpath, 'rb')
|
||||
self.ftp.storbinary('STOR ' + remotepath, fp, bufsize)
|
||||
fp.close()
|
||||
# return "上传成功"
|
||||
# fp = open(localpath, 'rb')
|
||||
# self.ftp.storbinary('STOR ' + remotepath, fp, bufsize)
|
||||
# fp.close()
|
||||
with open(localpath, mode='rb') as file:
|
||||
self.ftp.storbinary('STOR ' + remotepath, file, bufsize)
|
||||
|
||||
|
||||
def delAllfile(self, ftppath):
|
||||
"""
|
||||
删除ftp服务器端全部文件
|
||||
:param ftppath:
|
||||
:return:
|
||||
"""
|
||||
dir_res = []
|
||||
try:
|
||||
print(ftppath)
|
||||
@@ -106,13 +105,13 @@ class FtpController():
|
||||
# print("删除FTP目录：" + ftppath + "下存在文件:" + f)
|
||||
# ftp.delete(f)
|
||||
except Exception as e:
|
||||
raise e
|
||||
print("删除失败" + str(e))
|
||||
|
||||
# 删除远端ftp文件
|
||||
# 出现550 not found file是路径不对
|
||||
# def del_file(self, delpath='./YIN.NC'):
|
||||
def del_file(self, delpath='/(192,168,199,2)/DS/Z4.5.NC'):
|
||||
self.ftp.delete(delpath) # 删除远程文件
|
||||
|
||||
|
||||
|
||||
"""
|
||||
删除ftp服务器端指定文件
|
||||
:param delpath:
|
||||
:return:
|
||||
"""
|
||||
self.ftp.delete(delpath)
|
||||
|
||||
@@ -2,22 +2,35 @@ from opcua import ua, Client
|
||||
|
||||
|
||||
class Py2opcua:
|
||||
"""
|
||||
将三元检测补偿值写入opcua服务器
|
||||
"""
|
||||
|
||||
def __init__(self, url='opc.tcp://192.168.2.99:4840'):
|
||||
self.client = Client(url)
|
||||
|
||||
def connect(self):
|
||||
|
||||
try:
|
||||
# 连接客户端
|
||||
self.client.connect()
|
||||
print("opcua服务器连接成功，可以写入")
|
||||
return self.client
|
||||
except:
|
||||
print("opcua服务器连接失败，请检查")
|
||||
# 连接客户端
|
||||
# def connect(self):
|
||||
# try:
|
||||
# self.client.connect()
|
||||
# print("opcua服务器连接成功，可以写入")
|
||||
# return self.client
|
||||
# except Exception as e:
|
||||
# print("opcua服务器连接失败，请检查" + str(e))
|
||||
|
||||
def write(self, temp_dict):
|
||||
temp_dict = temp_dict
|
||||
"""
|
||||
补偿值写入方法，参数是一个字典，键是节点名，值是补偿值
|
||||
:param temp_dict:
|
||||
:return:
|
||||
"""
|
||||
# try:
|
||||
self.client.connect()
|
||||
# print("opcua服务器连接成功，可以写入")
|
||||
# return self.client
|
||||
# except Exception as e:
|
||||
# print("opcua服务器连接失败，请检查" + str(e))
|
||||
# temp_dict = temp_dict
|
||||
temp_list = list(temp_dict.items())
|
||||
for i in range(len(temp_list)):
|
||||
# 寻找节点上的变量
|
||||
@@ -25,8 +38,9 @@ class Py2opcua:
|
||||
# var.set_value(ua.Variant(1.234, ua.VariantType.Float))
|
||||
# 通过set_value写值
|
||||
var.set_value(ua.Variant(temp_list[i][1], ua.VariantType.Double))
|
||||
print("%s 已写入" % var.get_value())
|
||||
|
||||
def disconnect(self):
|
||||
# 断开连接
|
||||
# print("%s 已写入" % var.get_value())
|
||||
self.client.disconnect()
|
||||
|
||||
# 断开连接
|
||||
# def disconnect(self):
|
||||
# self.client.disconnect()
|
||||
|
||||
13
sf_machine_connect/static/src/css/many2one_field.scss
Normal file
13
sf_machine_connect/static/src/css/many2one_field.scss
Normal file
@@ -0,0 +1,13 @@
|
||||
.o_form_view:not(.o_field_highlight) {
|
||||
.o_field_many2one_selection {
|
||||
.o_external_button, .o_dropdown_button {
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
&:hover, &:focus-within {
|
||||
.o_external_button, .o_dropdown_button {
|
||||
visibility: visible;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
82
sf_machine_connect/static/src/js/test.js
Normal file
82
sf_machine_connect/static/src/js/test.js
Normal file
@@ -0,0 +1,82 @@
|
||||
/** @odoo-module **/
|
||||
|
||||
import { browser } from "@web/core/browser/browser";
|
||||
import { Dialog } from "@web/core/dialog/dialog";
|
||||
import { _lt } from "@web/core/l10n/translation";
|
||||
import { useChildRef, useOwnedDialogs, useService } from "@web/core/utils/hooks";
|
||||
import { sprintf } from "@web/core/utils/strings";
|
||||
import { isMobileOS } from "@web/core/browser/feature_detection";
|
||||
import * as BarcodeScanner from "@web/webclient/barcode/barcode_scanner";
|
||||
|
||||
const {xml, Component} = owl;
|
||||
import { standardFieldProps } from "@web/views/fields/standard_field_props";
|
||||
// Import the registry
|
||||
import {registry} from "@web/core/registry";
|
||||
|
||||
|
||||
export class CodeField extends Component {
|
||||
setup() {
|
||||
super.setup();
|
||||
}
|
||||
async onBarcodeBtnClick() {
|
||||
const barcode = await BarcodeScanner.scanBarcode();
|
||||
if (barcode) {
|
||||
await this.onBarcodeScanned(barcode);
|
||||
if ("vibrate" in browser.navigator) {
|
||||
browser.navigator.vibrate(100);
|
||||
}
|
||||
} else {
|
||||
this.notification.add(this.env._t("Please, scan again !"), {
|
||||
type: "warning",
|
||||
});
|
||||
}
|
||||
}
|
||||
async search(barcode) {
|
||||
const results = await this.orm.call("sf.tray", "name_search", [code], {
|
||||
name: barcode,
|
||||
args: this.getDomain(),
|
||||
operator: "ilike",
|
||||
limit: 2, // If one result we set directly and if more than one we use normal flow so no need to search more
|
||||
context: this.context,
|
||||
});
|
||||
return results.map((result) => {
|
||||
const [id, displayName] = result;
|
||||
return {
|
||||
id,
|
||||
name: displayName,
|
||||
};
|
||||
});
|
||||
}
|
||||
async onBarcodeScanned(barcode) {
|
||||
const results = await this.search(barcode);
|
||||
const records = results.filter((r) => !!r.id);
|
||||
if (records.length === 1) {
|
||||
this.update([{ id: records[0].id, name: records[0].name }]);
|
||||
} else {
|
||||
const searchInput = this.autocompleteContainerRef.el.querySelector("input");
|
||||
searchInput.value = barcode;
|
||||
searchInput.dispatchEvent(new Event("input"));
|
||||
if (this.env.isSmall) {
|
||||
searchInput.click();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
CodeField.template = xml`
|
||||
<button
|
||||
t-on-click="onBarcodeBtnClick"
|
||||
type="button"
|
||||
class="btn ms-3 o_barcode"
|
||||
tabindex="-1"
|
||||
draggable="false"
|
||||
aria-label="Scan barcode"
|
||||
title="Scan barcode"
|
||||
data-tooltip="Scan barcode"
|
||||
/>
|
||||
`;
|
||||
// CodeField.template = 'sf_machine_connect.CodeField';
|
||||
CodeField.props = standardFieldProps;
|
||||
|
||||
// Add the field to the correct category
|
||||
registry.category("fields").add("code", CodeField);
|
||||
@@ -1,17 +1,20 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<templates xml:space="preserve">
|
||||
|
||||
<t t-name="web.Many2OneField" owl="1">
|
||||
<button
|
||||
t-on-click="onBarcodeBtnClick"
|
||||
type="button"
|
||||
class="btn ms-3 o_barcode"
|
||||
tabindex="-1"
|
||||
draggable="false"
|
||||
aria-label="Scan barcode"
|
||||
title="Scan barcode"
|
||||
data-tooltip="Scan barcode"
|
||||
/>
|
||||
</t>
|
||||
<t t-name="sf_machine_connect.CodeField" owl="1">
|
||||
<div class="o_field_many2one_selection">
|
||||
<button
|
||||
t-on-click="onBarcodeBtnClick"
|
||||
type="button"
|
||||
class="btn ms-3 o_barcode"
|
||||
tabindex="-1"
|
||||
draggable="false"
|
||||
aria-label="Scan barcode"
|
||||
title="Scan barcode"
|
||||
data-tooltip="Scan barcode"
|
||||
/>
|
||||
</div>
|
||||
|
||||
</t>
|
||||
|
||||
</templates>
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<odoo>
|
||||
<record id="view_order_form_scan_barcode" model="ir.ui.view">
|
||||
<field name="name">sale.order.form.scan.barcode</field>
|
||||
<field name="model">sale.order</field>
|
||||
<field name="inherit_id" ref="sale.view_order_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="partner_id" position="after">
|
||||
<!-- invisible="1" -->
|
||||
<field name="_barcode_scanned" widget="barcode_handler"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
@@ -8,6 +8,7 @@
|
||||
<xpath expr="//page//field[@name='tray_code']" position="before">
|
||||
<!-- invisible="1" -->
|
||||
<field name="_barcode_scanned" widget="barcode_handler"/>
|
||||
<field name="tray_code" widget="code"/>
|
||||
</xpath>
|
||||
|
||||
</field>
|
||||
|
||||
@@ -11,12 +11,13 @@
|
||||
<field name="compensation_value_y"/>
|
||||
</group>
|
||||
<div>
|
||||
<field name="button_compensation_state"/>
|
||||
<button string="一键补偿" name="compensation" type="object" confirm="是否确认下发补偿" class="btn-primary"/>
|
||||
<!-- <button string="显示补偿" name="compensation1" type="object" confirm="是否确认下发补偿" class="btn-primary"/>-->
|
||||
<!-- <button string="修改状态" name="get__state" type="object" class="btn-primary"/>-->
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</xpath>
|
||||
<!-- attrs='{"invisible": [("routing_type","!=","CNC加工")]}'-->
|
||||
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
<template id="flush">
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
|
||||
<title>World Map</title>
|
||||
<script type="text/javascript">
|
||||
$(function () {
|
||||
setInterval(function () {
|
||||
$("#map").load(location.href + " #map>*", "");//注意后面DIV的ID前面的空格跟 id 后的>*，很重要！
|
||||
}, 1000);//8秒自动刷新
|
||||
})
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
</template>
|
||||
</odoo>
|
||||
@@ -9,8 +9,9 @@
|
||||
<field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='remark']" position="after">
|
||||
<button string="测试按钮" name="pri" type="object" class="btn-primary"/>
|
||||
<button string="下发按钮" name="up" type="object" confirm="是否确认下发此程序" class="btn-primary"/>
|
||||
<!-- <button string="测试按钮" name="pri" type="object" class="btn-primary"/>-->
|
||||
<field name="button_state"/>
|
||||
<button string="下发按钮" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"/>
|
||||
|
||||
</xpath>
|
||||
</field>
|
||||
|
||||
@@ -4,40 +4,99 @@
|
||||
<field name="name">sf_base_extension</field>
|
||||
<field name="model">sf.machine_tool</field>
|
||||
<field name="inherit_id" ref="sf_base.sf_machine_tool_form"/>
|
||||
<!-- <field name="inherit_id" ref="sf_base.form_mrs_machine_tool_type"/>-->
|
||||
<field eval="20" name="priority"/>
|
||||
<field name="arch" type="xml">
|
||||
<!-- <xpath expr="//field[@name='knife_type']" position="before">-->
|
||||
<xpath expr="//form//notebook//page[1]" position="inside">
|
||||
<!-- <xpath expr="//page[@name='other']" position="before">-->
|
||||
<!-- <page string="监控页面">-->
|
||||
<group string="监控">
|
||||
<field name="timestamp"/>
|
||||
<field name="signed"/>
|
||||
<field name="status"/>
|
||||
<!-- <field name="tool_num"/>-->
|
||||
<field name="time_on"/>
|
||||
<field name="time_on_now"/>
|
||||
<field name="run_status"/>
|
||||
<field name="run_time"/>
|
||||
<field name="cut_status"/>
|
||||
<!-- <field name="cut_time"/>-->
|
||||
<field name="program"/>
|
||||
<field name="tool_num"/>
|
||||
<!-- <div class="o_address_format">-->
|
||||
<!-- <label for="tool_num_process_time1" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time1" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time2" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time2" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time3" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time3" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time4" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time4" class="o_form_label"/>-->
|
||||
<!-- <div></div>-->
|
||||
<!-- <label for="tool_num_process_time5" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time5" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time6" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time6" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time7" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time7" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time8" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time8" class="o_form_label"/>-->
|
||||
<!-- <div></div>-->
|
||||
<!-- <label for="tool_num_process_time9" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time9" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time10" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time10" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time11" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time11" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time12" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time12" class="o_form_label"/>-->
|
||||
<!-- <div></div>-->
|
||||
<!-- <label for="tool_num_process_time13" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time13" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time14" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time14" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time15" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time15" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time16" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time16" class="o_form_label"/>-->
|
||||
<!-- <div></div>-->
|
||||
<!-- <label for="tool_num_process_time17" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time17" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time18" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time18" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time19" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time19" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time20" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time20" class="o_form_label"/>-->
|
||||
<!-- <div></div>-->
|
||||
<!-- <label for="tool_num_process_time21" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time21" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time22" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time22" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time23" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time23" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time24" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time24" class="o_form_label"/>-->
|
||||
<!-- </div>-->
|
||||
</group>
|
||||
<!-- </page>-->
|
||||
|
||||
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
|
||||
<!--<!–继承了本模块的视图–>-->
|
||||
<!--<?xml version="1.0" encoding="utf-8"?>-->
|
||||
<!--<odoo>-->
|
||||
<!-- <record id="view_tree_mrs_machine_tool_inherited" model="ir.ui.view">-->
|
||||
<!-- <field name="name">sf_base_extension</field>-->
|
||||
<!-- <field name="model">ftp.client</field>-->
|
||||
<!-- <field name="inherit_id" ref="ftp_form"/>-->
|
||||
<!-- <field eval="20" name="priority"/>-->
|
||||
<!-- <field name="arch" type="xml">-->
|
||||
<!-- <xpath expr="//field[@name='name']" position="before">-->
|
||||
<!-- <field name="count_books"/>-->
|
||||
<!-- </xpath>-->
|
||||
<!-- </field>-->
|
||||
<!-- </record>-->
|
||||
<!--</odoo>-->
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
<record id="view_purchase_order_barcode_inherit_form" model="ir.ui.view">
|
||||
<field name="name">purchase.order.form</field>
|
||||
<field name="model">purchase.order</field>
|
||||
<field name="inherit_id" ref="purchase.purchase_order_form"/>
|
||||
<field name="priority" eval="8"/>
|
||||
<field name="arch" type="xml">
|
||||
<form position="inside">
|
||||
<field name="_barcode_scanned" widget="purchaseorder_barcode_handler"/>
|
||||
</form>
|
||||
|
||||
<xpath expr="//field[@name='order_line']/tree" position="inside">
|
||||
<field name="product_barcode" invisible="1"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='order_line']/kanban" position="inside">
|
||||
<field name="product_barcode" invisible="1"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='order_line']//field[@name='product_qty']" position="attributes">
|
||||
<attribute name="options">{'barcode_events': True}</attribute>
|
||||
<attribute name="widget">field_float_scannable</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//button[@name='button_confirm']" position="attributes">
|
||||
<attribute name="barcode_trigger">validate</attribute>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
@@ -1,176 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
|
||||
<!-- Menus -->
|
||||
<menuitem
|
||||
id="ftp_menu_root"
|
||||
name="sf2machine"
|
||||
web_icon="iot,static/description/icon.png"
|
||||
groups="base.group_system"
|
||||
/>
|
||||
IoT Boxes
|
||||
|
||||
<record model="ir.ui.view" id="data_list">
|
||||
<field name="model">ftp.client</field>
|
||||
<field name="arch" type="xml">
|
||||
<!-- <div id="map">-->
|
||||
<tree string="目标">
|
||||
<field name="name"/>
|
||||
<field name="mobile"/>
|
||||
<field name="description"/>
|
||||
</tree>
|
||||
<!-- </div>-->
|
||||
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="barcode_list">
|
||||
<field name="model">mrp.production</field>
|
||||
<field name="arch" type="xml">
|
||||
<!-- <div id="map">-->
|
||||
<tree string="目标">
|
||||
<field name="_barcode_scanned" widget="barcode_handler"/>
|
||||
<field name="aa"/>
|
||||
</tree>
|
||||
<!-- </div>-->
|
||||
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="ftp_form">
|
||||
<field name="model">ftp.client</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="数据采集">
|
||||
<group string="基本信息">
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="mobile"/>
|
||||
<field name="description"/>
|
||||
<field name="_barcode_scanned" widget="barcode_handler"/>
|
||||
<!-- <button string="测试按钮" name="pri" type="object"/>-->
|
||||
<button string="下发程序" name="up" type="object" data-hotkey="enter"/>
|
||||
<button string="扫码" name="on_barcode_scanned" type="object"/>
|
||||
<!-- <button string="删除程序" name="delete" type="object"/>-->
|
||||
<templates xml:space="preserve">
|
||||
|
||||
<t t-name="web.Many2OneField" owl="1">
|
||||
<button t-on-click="onBarcodeBtnClick"
|
||||
type="button"
|
||||
class="btn ms-3 o_barcode"
|
||||
tabindex="-1"
|
||||
draggable="false"
|
||||
aria-label="Scan barcode"
|
||||
title="Scan barcode"
|
||||
data-tooltip="Scan barcode"
|
||||
>saomiao</button>
|
||||
</t>
|
||||
|
||||
</templates>
|
||||
</group>
|
||||
</group>
|
||||
|
||||
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="barcode_form">
|
||||
<field name="model">mrp.production</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="扫码">
|
||||
<group string="基本信息">
|
||||
<field name="_barcode_scanned" widget="barcode_handler"/>
|
||||
<field name="aa"/>
|
||||
</group>
|
||||
|
||||
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="ftp_action" model="ir.actions.act_window">
|
||||
<field name="name">数据采集</field>
|
||||
<field name="res_model">ftp.client</field>
|
||||
<field name="view_mode">list,form,kanban</field>
|
||||
<field name="help" type="html">
|
||||
<p class="o_view_nocontent_smiling_face">
|
||||
这是我们的数据采集与程序管理页面！
|
||||
</p>
|
||||
</field>
|
||||
</record>
|
||||
<record id="barcode_action" model="ir.actions.act_window">
|
||||
<field name="name">扫码</field>
|
||||
<field name="res_model">mrp.production</field>
|
||||
<field name="view_mode">list,form,kanban</field>
|
||||
<field name="help" type="html">
|
||||
<p class="o_view_nocontent_smiling_face">
|
||||
这是我们的扫码页面！
|
||||
</p>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<menuitem
|
||||
id="ftp_data_menu_action"
|
||||
name="数据采集"
|
||||
action="ftp_action"
|
||||
parent="ftp_menu_root"
|
||||
sequence="1"/>
|
||||
<menuitem
|
||||
id="ftp_cnc_data_menu_action"
|
||||
name="CNC"
|
||||
action="ftp_action"
|
||||
parent="ftp_data_menu_action"
|
||||
sequence="1"/>
|
||||
<!-- <menuitem-->
|
||||
<!-- id="ftp_mit_cnc_data_menu_action"-->
|
||||
<!-- name="三菱CNC"-->
|
||||
<!-- action="ftp_action"-->
|
||||
<!-- parent="ftp_cnc_data_menu_action"-->
|
||||
<!-- sequence="1"/>-->
|
||||
<!-- <menuitem-->
|
||||
<!-- id="ftp_sim_cnc_data_menu_action"-->
|
||||
<!-- name="西门子CNC"-->
|
||||
<!-- action="ftp_action"-->
|
||||
<!-- parent="ftp_cnc_data_menu_action"-->
|
||||
<!-- sequence="1"/>-->
|
||||
<!-- <menuitem-->
|
||||
<!-- id="ftp_fan_cnc_data_menu_action"-->
|
||||
<!-- name="发那科CNC"-->
|
||||
<!-- action="ftp_action"-->
|
||||
<!-- parent="ftp_cnc_data_menu_action"-->
|
||||
<!-- sequence="1"/>-->
|
||||
<menuitem
|
||||
id="ftp_plc_data_menu_action"
|
||||
name="PLC"
|
||||
action="ftp_action"
|
||||
parent="ftp_data_menu_action"
|
||||
sequence="3"/>
|
||||
<menuitem
|
||||
id="ftp_instrument_data_menu_action"
|
||||
name="仪器仪表"
|
||||
action="ftp_action"
|
||||
parent="ftp_data_menu_action"
|
||||
sequence="9"/>
|
||||
<menuitem
|
||||
id="ftp_procedure_menu_action"
|
||||
name="程序管理"
|
||||
action="barcode_action"
|
||||
parent="ftp_menu_root"
|
||||
sequence="2"/>
|
||||
<menuitem
|
||||
id="ftp_up_menu_action"
|
||||
name="本地代码"
|
||||
action="ftp_action"
|
||||
parent="ftp_procedure_menu_action"
|
||||
sequence="2"/>
|
||||
<menuitem
|
||||
id="ftp_down_menu_action"
|
||||
name="机床代码"
|
||||
action="ftp_action"
|
||||
parent="ftp_procedure_menu_action"
|
||||
sequence="6"/>
|
||||
|
||||
|
||||
|
||||
</odoo>
|
||||
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
<record id="sale_order_form_inherit" model="ir.ui.view">
|
||||
<field name="name">sale.order.form.inherit</field>
|
||||
<field name="model">sf.machine_tool</field>
|
||||
<field name="inherit_id" ref="sf_base.sf_machine_tool_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//form//notebook//page[1]" position="inside">
|
||||
|
||||
<group string="监控">
|
||||
<field name="timestamp"/>
|
||||
<field name="signed"/>
|
||||
<field name="signed16"/>
|
||||
<field name="pulse2"/>
|
||||
<field name="tool_num"/>
|
||||
<field name="program"/>
|
||||
</group>
|
||||
<!-- </page>-->
|
||||
<div class="o_partner_order_summary" colspan="2"/>
|
||||
|
||||
|
||||
</xpath>
|
||||
<!-- <field name="payment_term_id" position="after">-->
|
||||
<!-- <field name="create_date" widget="show_units" options="{'units':'UTC'}"/>-->
|
||||
<!-- -->
|
||||
<!-- </field>-->
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
|
||||
|
||||
<!--<?xml version="1.0" encoding="utf-8"?>-->
|
||||
<!--<odoo>-->
|
||||
<!-- <record id="sale_order_form_inherit" model="ir.ui.view">-->
|
||||
<!-- <field name="name">sale.order.form.inherit</field>-->
|
||||
<!-- <field name="model">sale.order</field>-->
|
||||
<!-- <field name="inherit_id" ref="sale.view_order_form"/>-->
|
||||
<!-- <field name="arch" type="xml">-->
|
||||
<!-- <field name="payment_term_id" position="after">-->
|
||||
<!-- <field name="create_date" widget="show_units" options="{'units':'UTC'}"/>-->
|
||||
<!-- <div class="o_partner_order_summary" colspan="2"/>-->
|
||||
<!-- </field>-->
|
||||
<!-- </field>-->
|
||||
<!-- </record>-->
|
||||
<!--</odoo>-->
|
||||
@@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
<record id="sf_install_the_tray_workorder_form_view_inherit" model="ir.ui.view">
|
||||
<field name="name">sale.order.form.inherit</field>
|
||||
<field name="model">mrp.workorder</field>
|
||||
<field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="tray_code" position="before">
|
||||
<!-- <field name="create_date" widget="show_units" options="{'units':'UTC'}"/>-->
|
||||
<div class="o_partner_order_summary" colspan="2"/>
|
||||
<!-- <field name="aa"/>-->
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
@@ -1,18 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
|
||||
|
||||
<record id="mrp_workcenter_view_kanban_inherit_workorder_inherit" model="ir.ui.view">
|
||||
<field name="name">mrp.workcenter.view.kanban.inherit.mrpworkorder</field>
|
||||
<field name="model">mrp.workcenter</field>
|
||||
<!-- <field name="model">cnc.processing</field>-->
|
||||
<field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//button[@name='action_work_order']" position="after">
|
||||
<!-- <field name="aaaa"/>-->
|
||||
<button string="扫码查询" name="search_order" type="object" class="btn-primary"/>
|
||||
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
Reference in New Issue
Block a user