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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程

Browse Source
This commit is contained in:
mgw
2023-08-11 12:24:35 +08:00
parent 68805fee4a e6a496d062
commit 9b239dbcb2
18 changed files with 959 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sf_base/models/base.py
View File

@@ -267,7 +267,7 @@ class MachineToolType(models.Model):
('youyagang', '油压缸驱动'),
('chilunjia', '齿轮架驱动')
], string="主轴加高方式", default='sifudianji')
workpiece_load = fields.Char('工件负载')
workpiece_load = fields.Char('工件最大负载(kg)')
lead_screw = fields.Char('丝杆')
workbench_L = fields.Char('工作台长度(mm)')
workbench_W = fields.Char('工作台宽度(mm)')
@@ -276,14 +276,16 @@ class MachineToolType(models.Model):
machine_tool_W = fields.Char('机床宽度(mm)')
machine_tool_H = fields.Char('机床高度(mm)')
feed_speed = fields.Char('进给速度(mm/min)')
tool_speed = fields.Char('刀具速度')
distance = fields.Char('主轴端面至工作台面距离(mm)')
tool_speed = fields.Char('刀具速度(m/min)')
distance_min = fields.Char('主轴端面至工作台面距离MIN(mm)')
distance_max = fields.Char('主轴端面至工作台面距离MIN(mm)')
taper = fields.Char('主轴锥度(°)')
torque = fields.Char('主轴点击扭矩(n/m)')
motor_power = fields.Char('主轴电机功率(kw)')
tool_quality_max = fields.Char('刀具最大质量')
tool_long_max = fields.Char('刀具最大长度')
tool_diameter_max = fields.Char('刀具最大刀径')
tool_quality_max = fields.Char('刀具最大质量(kg)')
tool_long_max = fields.Char('刀具最大长度(mm)')
tool_diameter_max = fields.Char('刀具刀径max(mm)')
tool_diameter_min = fields.Char('刀具刀径min(mm)')
machine_tool_category = fields.Many2one('sf.machine_tool.category', string='机床类型')
# 多个型号对应一个机床
@@ -298,7 +300,8 @@ class MachineToolType(models.Model):
b_axis = fields.Integer('B轴')
c_axis = fields.Integer('C轴')
remark = fields.Char('备注')
precision = fields.Float('加工精度')
precision_min = fields.Float('X轴定位精度min(mm)', digits=(12, 3))
precision_max = fields.Float('X轴定位精度max(mm)', digits=(12, 3))
control_system_id = fields.Many2one('sf.machine.control_system',
string="控制系统")
active = fields.Boolean('有效', default=True)

1
sf_base/static/src/scss/test.scss
View File

@@ -4,4 +4,5 @@
.test_model>.o_form_label {
margin-left: 20px;
margin-right: 0px !important;
white-space: nowrap;
}

41
sf_base/views/base_view.xml
View File

@@ -87,7 +87,7 @@
<field name="name">tree.sf.machine_tool.type</field>
<field name="model">sf.machine_tool.type</field>
<field name="arch" type="xml">
<tree string="机床型号">
<tree string="机床型号" create="0">
<field name="code"/>
<field name="name"/>
<field name="brand_id"/>
@@ -116,10 +116,10 @@
<field name="machine_tool_picture" widget="image" nolabel="1"/>
</group>
</group>
<notebook>
<notebook>
<page string="基本信息">
<group>
<group string="基础参数">
<group string="基本参数">
<field name="control_system_id" required="1" options="{'no_create': True}"/>
<label for="workbench_L" string="工作台尺寸(mm)"/>
<div class="test_model">
@@ -145,7 +145,16 @@
options="{'format': false}"/>
</div>
<field name="feed_speed" required="1"/>
<field name="precision" required="1" string="X轴定位精度(mm)"/>
<label for="precision_min" string="X轴定位精度(mm)"/>
<div class="test_model">
<label for="precision_min" string="最小(min)"/>
<field name="precision_min" class="o_address_zip" required="1"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="precision_max" string="最大(max)"/>
<field name="precision_max" class="o_address_zip" required="1"
options="{'format': false}"/>
</div>
<field name="workpiece_load" required="1"/>
<field name="number_of_knife_library" required="1" options="{'format': false}"/>
<field name="lead_screw" required="1"/>
@@ -187,16 +196,32 @@
<field name="heightened_way" required="1"/>
<field name="torque" required="1"/>
<field name="motor_power" required="1"/>
<field name="distance" required="1"/>
</group>
<group>
<label for="distance_min" string="主轴端面-工作台距离(mm)"/>
<div class="test_model">
<label for="distance_min" string="最小(min)"/>
<field name="distance_min" class="o_address_zip" required="1"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="distance_max" string="最大(max)"/>
<field name="distance_max" class="o_address_zip" required="1"
options="{'format': false}"/>
</div>
<field name="guide_rail" required="1"/>
</group>
<group string="刀具">
<field name="knife_type" required="1"/>
<field name="tool_speed" required="1"/>
<field name="tool_long_max" required="1"/>
<field name="tool_diameter_max" required="1"/>
<label for="tool_diameter_min" string="刀具刀径(mm)"/>
<div class="test_model">
<label for="tool_diameter_min" string="最小(min)"/>
<field name="tool_diameter_min" class="o_address_zip" required="1"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="tool_diameter_max" string="最大(max)"/>
<field name="tool_diameter_max" class="o_address_zip" required="1"
options="{'format': false}"/>
</div>
<field name="tool_quality_max" required="1"/>
</group>
</group>

39
sf_maintenance/models/sf_maintenance.py
View File

@@ -85,7 +85,8 @@ class SfMaintenanceEquipment(models.Model):
c_axis = fields.Integer('C轴')
remark = fields.Char('备注')
is_binding = fields.Boolean('是否绑定机床', default=False)
precision = fields.Float('加工精度')
precision_min = fields.Float('X轴定位精度min(mm)', digits=(12, 3))
precision_max = fields.Float('X轴定位精度max(mm)', digits=(12, 3))
control_system_id = fields.Many2one('sf.machine.control_system',
string="控制系统")
# 多个机床型号对应一个机床
@@ -102,7 +103,7 @@ class SfMaintenanceEquipment(models.Model):
('youyagang', '油压缸驱动'),
('chilunjia', '齿轮架驱动')
], string="主轴加高方式", default='sifudianji')
workpiece_load = fields.Char('工件负载')
workpiece_load = fields.Char('工件最大负载(kg)')
lead_screw = fields.Char('丝杆')
workbench_L = fields.Char('工作台长度(mm)')
workbench_W = fields.Char('工作台宽度(mm)')
@@ -111,14 +112,16 @@ class SfMaintenanceEquipment(models.Model):
machine_tool_W = fields.Char('机床宽度(mm)')
machine_tool_H = fields.Char('机床高度(mm)')
feed_speed = fields.Char('进给速度(mm/min)')
tool_speed = fields.Char('刀具速度')
distance = fields.Char('主轴端面至工作台面距离(mm)')
tool_speed = fields.Char('刀具速度(m/min)')
distance_min = fields.Char('主轴端面至工作台面距离MIN(mm)')
distance_max = fields.Char('主轴端面至工作台面距离MIN(mm)')
taper = fields.Char('主轴锥度(°)')
torque = fields.Char('主轴点击扭矩(n/m)')
motor_power = fields.Char('主轴电机功率(kw)')
tool_quality_max = fields.Char('刀具最大质量')
tool_long_max = fields.Char('刀具最大长度')
tool_diameter_max = fields.Char('刀具最大刀径')
tool_quality_max = fields.Char('刀具最大质量(kg)')
tool_long_max = fields.Char('刀具最大长度(mm)')
tool_diameter_max = fields.Char('刀具刀径max(mm)')
tool_diameter_min = fields.Char('刀具刀径min(mm)')
machine_tool_category = fields.Many2one('sf.machine_tool.category', string='机床类型')
# 一个机床对应一個加工工厂，一个加工工厂对应多个机床
factory_id = fields.Many2one('res.partner', string='所属工厂',
@@ -132,20 +135,7 @@ class SfMaintenanceEquipment(models.Model):
active = fields.Boolean('有效', default=True)
# 多个型号对应一个机床
machine_tool_id = fields.Many2one('sf.machine_tool', '机床')
number_of_axles = fields.Selection(
[("三轴", "三轴"), ("四轴", "四轴"), ("五轴", "五轴")],
default="", string="轴数")
# 加工进程
x_axis = fields.Integer('X轴')
y_axis = fields.Integer('Y轴')
z_axis = fields.Integer('Z轴')
b_axis = fields.Integer('B轴')
c_axis = fields.Integer('C轴')
remark = fields.Char('备注')
precision = fields.Float('加工精度')
control_system_id = fields.Many2one('sf.machine.control_system',
string="控制系统")
active = fields.Boolean('有效', default=True)
def name_get(self):
result = []
@@ -208,7 +198,8 @@ class SfMaintenanceEquipment(models.Model):
item.number_of_knife_library = item.type_id.number_of_knife_library
item.number_of_axles = item.type_id.number_of_axles
item.rotate_speed = item.type_id.rotate_speed
item.precision = item.type_id.precision
item.precision_min = item.type_id.precision_min
item.precision_max = item.type_id.precision_max
item.control_system_id = item.type_id.control_system_id
item.x_axis = item.type_id.x_axis
item.y_axis = item.type_id.y_axis
@@ -227,13 +218,15 @@ class SfMaintenanceEquipment(models.Model):
item.machine_tool_H = item.type_id.machine_tool_H
item.feed_speed = item.type_id.feed_speed
item.tool_speed = item.type_id.tool_speed
item.distance = item.type_id.distance
item.distance_min = item.type_id.distance_min
item.distance_max = item.type_id.distance_max
item.taper = item.type_id.taper
item.torque = item.type_id.torque
item.motor_power = item.type_id.motor_power
item.tool_quality_max = item.type_id.tool_quality_max
item.tool_long_max = item.type_id.tool_long_max
item.tool_diameter_max = item.type_id.tool_diameter_max
item.tool_diameter_min = item.type_id.tool_diameter_min
item.machine_tool_category = item.type_id.machine_tool_category.id
item.brand_id = item.type_id.brand_id.id

4
sf_maintenance/models/sf_maintenance_logs.py
View File

@@ -8,8 +8,8 @@ class SfMaintenanceLogs(models.Model):
code = fields.Char(string='编码')
name = fields.Char(string='名称')
type = fields.Selection([('type1', '类型1'), ('type2', '类型2')], string='类型')
brand = fields.Char(string='品牌')
model = fields.Char(string='型号')
brand = fields.Many2one('sf.machine.brand', relared='model.brand_id', string='品牌')
model = fields.Many2one('maintenance.equipment', string='设备')
code_location = fields.Char(string='编码位置')
fault_type = fields.Selection([('电气类', '电气类'), ('机械类', '机械类'), ('程序类', '程序类'), ('系统类', '系统类')], string='故障类型')
fault_code = fields.Char(string='故障代码')

3
sf_maintenance/views/maintenance_logs_views.xml
View File

@@ -63,6 +63,9 @@
<field name="model">sf.maintenance.logs</field>
<field name="arch" type="xml">
<search>
<searchpanel>
<field name="model" icon="fa-building" enable_counters="1"/>
</searchpanel>
<field name="code"/>
<field name="name"/>
<field name="type"/>

205
sf_maintenance/views/maintenance_views.xml
View File

@@ -38,107 +38,114 @@
</xpath>
<xpath expr="//page[@name='description']" position="before">
<page string="设备参数" name="sf_equipment" attrs="{'invisible': [('type_id', '=', False)]}">
<group string="参数">
<group>
<field name="control_system_id" options="{'no_create': True}"/>
<label for="workbench_L" string="工作台[mm]"/>
<div class="o_address_format">
<label for="workbench_L" string="长"/>
<field name="workbench_L" class="o_address_zip"
<group>
<group string="基本参数">
<field name="control_system_id" required="1" options="{'no_create': True}"/>
<label for="workbench_L" string="工作台尺寸(mm)"/>
<div class="test_model">
<label for="workbench_L" string="长"/>
<field name="workbench_L" class="o_address_zip" required="1"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="workbench_W" string="宽"/>
<field name="workbench_W" class="o_address_zip" required="1"
options="{'format': false}"/>
</div>
<label for="machine_tool_L" string="机床尺寸(mm)"/>
<div class="test_model">
<label for="machine_tool_L" string="长"/>
<field name="machine_tool_L" class="o_address_zip" required="1"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="machine_tool_W" string="宽"/>
<field name="machine_tool_W" class="o_address_zip" required="1"
options="{'format': false}"/>
<label for="machine_tool_H" string="高"/>
<field name="machine_tool_H" class="o_address_zip" required="1"
options="{'format': false}"/>
</div>
<field name="feed_speed" required="1"/>
<label for="precision_min" string="X轴定位精度(mm)"/>
<div class="test_model">
<label for="precision_min" string="最小(min)"/>
<field name="precision_min" class="o_address_zip" required="1"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="precision_max" string="最大(max)"/>
<field name="precision_max" class="o_address_zip" required="1"
options="{'format': false}"/>
</div>
<field name="workpiece_load" required="1"/>
<field name="number_of_knife_library" required="1" options="{'format': false}"/>
<field name="lead_screw" required="1"/>
<field name="number_of_axles" required="1" widget="radio"
options="{'horizontal': true}"/>
<label for="x_axis" string="加工行程(mm)"
attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
<div class="test_model"
attrs="{'invisible': [('number_of_axles', '=', False)]}">
<label for="x_axis" string="x"/>
<field name="x_axis" class="o_address_zip" required="1"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="y_axis" string="y"/>
<field name="y_axis" class="o_address_zip" required="1"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="z_axis" string="z"/>
<field name="z_axis" class="o_address_zip" required="1"
options="{'format': false}"/>
<br></br>
<label for="b_axis" string="b"
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
<field name="b_axis" class="o_address_zip" required="1"
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="c_axis" string="c"
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
<field name="c_axis" class="o_address_zip" required="1"
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
options="{'format': false}"/>
</div>
</group>
<group string="主轴">
<field name="taper" required="1"/>
<field name="rotate_speed" string="主轴转速(min)" required="1"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="workbench_W" string="宽"/>
<field name="workbench_W" class="o_address_zip"
options="{'format': false}"/>
</div>
<!-- <field name="workbench_L"/>-->
<!-- <field name="workbench_W"/>-->
<label for="machine_tool_L" string="机床[mm]"/>
<div class="o_address_format">
<label for="machine_tool_L" string="长"/>
<field name="machine_tool_L" class="o_address_zip"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="machine_tool_W" string="宽"/>
<field name="machine_tool_W" class="o_address_zip"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="machine_tool_H" string="高"/>
<field name="machine_tool_H" class="o_address_zip"
options="{'format': false}"/>
</div>
<!-- <field name="machine_tool_L"/>-->
<!-- <field name="machine_tool_W"/>-->
<!-- <field name="machine_tool_H"/>-->
<label for="taper" string="主轴"/>
<div class="o_address_format">
<label for="taper" string="锥度(°)"/>
<field name="taper" class="o_address_zip"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="torque" string="点击扭矩(n/m)"/>
<field name="torque" class="o_address_zip"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="motor_power" string="电机功率(kw)"/>
<field name="motor_power" class="o_address_zip"
options="{'format': false}"/>
<label for="motor_power" string="转速(min)"/>
<field name="rotate_speed" class="o_address_zip"
options="{'format': false}"/>
</div>
<field name="number_of_axles" widget="radio"
options="{'horizontal': true}"/>
<field name="heightened_way"/>
<label for="x_axis" string="加工行程(mm)"
attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
<div class="test_model"
attrs="{'invisible': [('number_of_axles', '=', False)]}">
<label for="x_axis" string="x"/>
<field name="x_axis" class="o_address_zip"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="y_axis" string="y"/>
<field name="y_axis" class="o_address_zip"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="z_axis" string="z"/>
<field name="z_axis" class="o_address_zip"
options="{'format': false}"/>
<br></br>
<label for="b_axis" string="b"
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
<field name="b_axis" class="o_address_zip"
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="c_axis" string="c"
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
<field name="c_axis" class="o_address_zip"
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
options="{'format': false}"/>
</div>
<field name="distance"/>
<field name="precision" string="X轴定位精度(mm)"/>
<field name="heightened_way" required="1"/>
<field name="torque" required="1"/>
<field name="motor_power" required="1"/>
<label for="distance_min" string="主轴端面-工作台距离(mm)"/>
<div class="test_model">
<label for="distance_min" string="最小（min）"/>
<field name="distance_min" class="o_address_zip" required="1"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="distance_max" string="最大（max）"/>
<field name="distance_max" class="o_address_zip" required="1"
options="{'format': false}"/>
</div>
<field name="guide_rail" required="1"/>
</group>
<group string="刀具">
<field name="knife_type" required="1"/>
<field name="tool_speed" required="1"/>
<field name="tool_long_max" required="1"/>
<label for="tool_diameter_min" string="刀具刀径(mm)"/>
<div class="test_model">
<label for="tool_diameter_min" string="最小(min)"/>
<field name="tool_diameter_min" class="o_address_zip" required="1"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="tool_diameter_max" string="最大(max)"/>
<field name="tool_diameter_max" class="o_address_zip" required="1"
options="{'format': false}"/>
</div>
<field name="tool_quality_max" required="1"/>
</group>
</group>
<!-- <field name="taper"/>-->
<!-- <field name="torque"/>-->
<!-- <field name="motor_power"/>-->
</group>
<group>
<field name="knife_type"/>
<field name="number_of_knife_library" options="{'format': false}"/>
<field name="tool_quality_max"/>
<field name="tool_long_max"/>
<field name="tool_diameter_max"/>
<field name="tool_speed"/>
<field name="guide_rail"/>
<field name="feed_speed"/>
<field name="workpiece_load"/>
<field name="lead_screw"/>
</group>
</group>
</page>
<page string="其他" attrs="{'invisible': [('type_id', '=', False)]}">

27
sf_manufacturing/static/src/js/kanban_change.js
View File

@@ -1,8 +1,8 @@
/** @odoo-module */
import { KanbanController } from "@web/views/kanban/kanban_controller";
import { kanbanView } from "@web/views/kanban/kanban_view";
import { registry } from "@web/core/registry";
import {KanbanController} from "@web/views/kanban/kanban_controller";
import {kanbanView} from "@web/views/kanban/kanban_view";
import {registry} from "@web/core/registry";
// the controller usually contains the Layout and the renderer.
class CustomKanbanController extends KanbanController {
@@ -14,7 +14,13 @@ class CustomKanbanController extends KanbanController {
console.log('99999999111');
this.workOrders = await this.getAllWorkOrders();
console.log('lines', this.workOrders);
}
var aDiv = document.getElementsByClassName('o_kanban_record')
// for (var i = 0; i < aDiv.length; i++) {
// console.log(aDiv[i])
// }
console.log(aDiv)
}
buttonClick(ev) {
const button = ev.currentTarget;
const id = button.getAttribute('data-id');
@@ -27,6 +33,7 @@ class CustomKanbanController extends KanbanController {
args: [[], ['id']],
kwargs: {}
}).then((records) => {
console.log(records)
const ids = records.map(record => record.id);
const context = {production_line_show: id};
this.env.services.rpc('/web/dataset/call_kw', {
@@ -37,20 +44,22 @@ class CustomKanbanController extends KanbanController {
}).then((response) => {
console.log('response', response);
location.reload();
window.onload = function () {
button.classList.add('choose')
}
});
});
}
async getAllWorkOrders() {
const response = await this.env.services.rpc('/web/dataset/call_kw',{
async getAllWorkOrders() {
const response = await this.env.services.rpc('/web/dataset/call_kw', {
model: 'sf.production.line',
method: 'search_read',
args: [],
kwargs: {},
});
// const response1 = await this.env.services.rpc('/web/dataset/call_kw',{
// model: 'mrp.workcenter',
// model: 'mrp.workcenter',
// method: 'search_read',
// args: [],
// kwargs: {},

28
sf_manufacturing/static/src/scss/kanban_change.scss
View File

@@ -2,12 +2,26 @@
display: flex;
justify-content: flex-start;
align-items: center;
margin-top: 1vw !important;
}
.choosekanban > button {
width: 4vw !important;
height: 2vw !important;
border: none !important;
margin-left: 16px !important;
}
.choosekanban > button {
padding: 0 2vw !important;
height: 2vw !important;
border: none !important;
border-right: 1px solid #ccc !important;
background-color: #EEEEEE;
color: #989799;
font-weight: bold;
}
//.o_content > .d-flex {
// display: block !important;
//}

2
sf_manufacturing/static/src/xml/kanban_change.xml
View File

@@ -4,7 +4,7 @@
<xpath expr="//t[@t-component='props.Renderer']" position="before">
<div class="choosekanban">
<!-- <t t-foreach="env['mrp.workcenter'].get_dynamic_data()" t-as="i" t-key="i"> -->
<t t-foreach="workOrders" t-as="i" t-key="i">
<t t-foreach="workOrders" t-as="i" t-key="i.id">
<button t-on-click="buttonClick" t-att-data-id="i.name">
<t t-esc="i.name"></t>
</button>

163
sf_manufacturing/views/mrp_workcenter_views.xml
View File

@@ -94,7 +94,7 @@
<xpath expr="//field[@name='alternative_workcenter_ids']" position="after">
<field name="production_line_id"/>
<field name="equipment_id"/>
<field name="production_line_show"/>
<field name="production_line_show" invisible="1"/>
</xpath>
<xpath expr="//field[@name='resource_calendar_id']" position="after">
<field name="is_process_outsourcing"/>
@@ -102,26 +102,27 @@
</field>
</record>
<!-- <record id="mrp_workcenter_view_kanban_inherit_maintenance" model="ir.ui.view"> -->
<!-- <field name="name">mrp.workcenter.view.kanban.inherit.maintenance</field> -->
<!-- <field name="model">mrp.workcenter</field> -->
<!-- <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/> -->
<!-- <field name="arch" type="xml"> -->
<!-- <xpath expr="//div[@name='plan_order']" position="after"> -->
<!-- <div> -->
<!-- <a name="%(maintenance.hr_equipment_request_action)d" type="action">Maintenance</a> -->
<!-- </div> -->
<!-- </xpath> -->
<!-- </field> -->
<!-- </record> -->
<!-- 继承原有的看板视图 -->
<record id="mrp_workcenter_kanban_inherit1" model="ir.ui.view">
<field name="name">mrp.workcenter.kanban.inherit</field>
<field name="model">mrp.workcenter</field>
<field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
<field name="arch" type="xml">
<xpath expr="//kanban" position="replace">
<kanban class="oe_background_grey o_kanban_dashboard o_workcenter_kanban" create="0" sample="1" js_class="custom_kanban1">
<!-- <record id="mrp_workcenter_view_kanban_inherit_maintenance" model="ir.ui.view"> -->
<!-- <field name="name">mrp.workcenter.view.kanban.inherit.maintenance</field> -->
<!-- <field name="model">mrp.workcenter</field> -->
<!-- <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/> -->
<!-- <field name="arch" type="xml"> -->
<!-- <xpath expr="//div[@name='plan_order']" position="after"> -->
<!-- <div> -->
<!-- <a name="%(maintenance.hr_equipment_request_action)d" type="action">Maintenance</a> -->
<!-- </div> -->
<!-- </xpath> -->
<!-- </field> -->
<!-- </record> -->
<!-- 继承原有的看板视图 -->
<record id="mrp_workcenter_kanban_inherit1" model="ir.ui.view">
<field name="name">mrp.workcenter.kanban.inherit</field>
<field name="model">mrp.workcenter</field>
<field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
<field name="arch" type="xml">
<xpath expr="//kanban" position="replace">
<kanban class="oe_background_grey o_kanban_dashboard o_workcenter_kanban" create="0" sample="1"
js_class="custom_kanban1">
<field name="name"/>
<field name="color"/>
<field name="workorder_count"/>
@@ -130,39 +131,48 @@
<field name="production_line_show"/>
<field name="production_line_id"/>
<templates>
<t t-name="kanban-box" t-if="record.production_line_id.value == record.production_line_show.raw_value">
<t t-name="kanban-box"
t-if="record.production_line_id.value == record.production_line_show.raw_value">
<!-- <div t-on-click="console.log(record.production_line_id,'11111111111')"></div>-->
<!-- <div t-on-click="console.log(record.production_line_show,'22222222222')"></div>-->
<div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}">
<div t-attf-class="o_kanban_card_header o_kanban_record_top">
<div class="o_kanban_record_headings o_kanban_card_header_title">
<span class="o_primary ml8" style="display: inline-block">
<field name="name"/>
<field name="production_line_show"/>
</span>
</div>
<div class="o_kanban_manage_button_section">
<a class="o_kanban_manage_toggle_button" href="#"><i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/></a>
<a class="o_kanban_manage_toggle_button" href="#">
<i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/>
</a>
</div>
</div>
<div class="container o_kanban_card_content">
<div class="row mb16">
<div class="col-6 o_kanban_primary_left">
<div class="btn-group" name="o_wo">
<t t-if="record.workorder_count.raw_value &gt; 0">
<button class="btn btn-primary" name="action_work_order" type="object" context="{'search_default_ready': 1, 'search_default_progress': 1}">
<span>WORK ORDERS</span>
</button>
</t>
<t t-if="record.workorder_count.raw_value &lt;= 0">
<button class="btn btn-warning" name="%(mrp.act_product_mrp_production_workcenter)d" type="action">
<span>PLAN ORDERS</span>
</button>
</t>
<t t-if="record.workorder_count.raw_value &gt; 0">
<button class="btn btn-primary" name="action_work_order"
type="object"
context="{'search_default_ready': 1, 'search_default_progress': 1}">
<span>WORK ORDERS</span>
</button>
</t>
<t t-if="record.workorder_count.raw_value &lt;= 0">
<button class="btn btn-warning"
name="%(mrp.act_product_mrp_production_workcenter)d"
type="action">
<span>PLAN ORDERS</span>
</button>
</t>
</div>
</div>
<div class="col-6 o_kanban_primary_right">
<div class="row" t-if="record.workorder_ready_count.raw_value &gt; 0">
<div class="col-8">
<a name="action_work_order" type="object" context="{'search_default_ready': 1}">
<a name="action_work_order" type="object"
context="{'search_default_ready': 1}">
To Launch
</a>
</div>
@@ -172,7 +182,8 @@
</div>
<div class="row" t-if="record.workorder_progress_count.raw_value &gt; 0">
<div class="col-8">
<a name="action_work_order" type="object" context="{'search_default_progress': 1}">
<a name="action_work_order" type="object"
context="{'search_default_progress': 1}">
In Progress
</a>
</div>
@@ -182,7 +193,8 @@
</div>
<div class="row" t-if="record.workorder_late_count.raw_value &gt; 0">
<div class="col-8">
<a name="action_work_order" type="object" context="{'search_default_late': 1}">
<a name="action_work_order" type="object"
context="{'search_default_late': 1}">
Late
</a>
</div>
@@ -192,7 +204,8 @@
</div>
<div class="row" t-if="record.oee.raw_value &gt; 0">
<div class="col-6">
<a name="%(mrp.mrp_workcenter_productivity_report_oee)d" type="action">
<a name="%(mrp.mrp_workcenter_productivity_report_oee)d"
type="action">
OEE
</a>
</div>
@@ -207,22 +220,26 @@
</div>
</div>
<div class="row">
<div class="col-12 o_kanban_primary_left" style="position:absolute; bottom:10px;" name="wc_stages">
<a name="%(mrp.act_mrp_block_workcenter)d" type="action" class="o_status float-end"
title="No workorder currently in progress. Click to mark work center as blocked."
aria-label="No workorder currently in progress. Click to mark work center as blocked."
attrs="{'invisible': [('working_state','in',('blocked','done'))]}"/>
<div class="col-12 o_kanban_primary_left"
style="position:absolute; bottom:10px;" name="wc_stages">
<a name="%(mrp.act_mrp_block_workcenter)d" type="action"
class="o_status float-end"
title="No workorder currently in progress. Click to mark work center as blocked."
aria-label="No workorder currently in progress. Click to mark work center as blocked."
attrs="{'invisible': [('working_state','in',('blocked','done'))]}"/>
<a name="unblock" type="object" class=" o_status o_status_red float-end"
title="Workcenter blocked, click to unblock."
aria-label="Workcenter blocked, click to unblock."
attrs="{'invisible': [('working_state','in',('normal','done'))]}"/>
<a name="%(mrp.act_mrp_block_workcenter)d" type="action" class="o_status o_status_green float-end"
title="Work orders in progress. Click to block work center."
aria-label="Work orders in progress. Click to block work center."
attrs="{'invisible': [('working_state','in',('normal','blocked'))]}"/>
title="Workcenter blocked, click to unblock."
aria-label="Workcenter blocked, click to unblock."
attrs="{'invisible': [('working_state','in',('normal','done'))]}"/>
<a name="%(mrp.act_mrp_block_workcenter)d" type="action"
class="o_status o_status_green float-end"
title="Work orders in progress. Click to block work center."
aria-label="Work orders in progress. Click to block work center."
attrs="{'invisible': [('working_state','in',('normal','blocked'))]}"/>
</div>
</div>
</div><div class="container o_kanban_card_manage_pane dropdown-menu" role="menu">
</div>
<div class="container o_kanban_card_manage_pane dropdown-menu" role="menu">
<div class="row">
<div class="col-6 o_kanban_card_manage_section o_kanban_manage_view">
<div role="menuitem" class="o_kanban_card_manage_title">
@@ -231,24 +248,31 @@
<div role="menuitem" name="plan_order">
<a name="action_work_order" type="object">Plan Orders</a>
</div>
<div>
<a name="%(maintenance.hr_equipment_request_action)d" type="action">Maintenance</a>
</div>
<div>
<a name="%(maintenance.hr_equipment_request_action)d" type="action">
Maintenance
</a>
</div>
</div>
<div class="col-6 o_kanban_card_manage_section o_kanban_manage_new">
<div role="menuitem" class="o_kanban_card_manage_title">
<span>Reporting</span>
</div>
<div role="menuitem">
<a name="%(mrp.mrp_workcenter_productivity_report_oee)d" type="action">OEE</a>
<a name="%(mrp.mrp_workcenter_productivity_report_oee)d" type="action">
OEE
</a>
</div>
<div role="menuitem">
<a name="%(mrp.mrp_workorder_workcenter_report)d" type="action" context="{'search_default_thisyear':True}">
<a name="%(mrp.mrp_workorder_workcenter_report)d" type="action"
context="{'search_default_thisyear':True}">
Performance
</a>
</div>
<div role="menuitem">
<a name="action_work_order" type="object" context="{'search_default_waiting': 1}">Waiting Availability</a>
<a name="action_work_order" type="object"
context="{'search_default_waiting': 1}">Waiting Availability
</a>
</div>
</div>
</div>
@@ -266,9 +290,9 @@
</t>
</templates>
</kanban>
</xpath>
</field>
</record>
</xpath>
</field>
</record>
<!-- MRP.PRODUCTION -->
<record id="mrp_production_view_form_inherit_maintenance" model="ir.ui.view">
@@ -296,4 +320,23 @@
</field>
</field>
</record>
<!--&lt;!&ndash; 测试searchpanel &ndash;&gt;-->
<!-- <record id="view_location_search_sf11111_inherit" model="ir.ui.view">-->
<!-- <field name="name">mrp.workcenter.inherit</field>-->
<!-- <field name="model">mrp.workcenter</field>-->
<!-- <field name="inherit_id" ref="mrp.view_mrp_workcenter_search"/>-->
<!-- <field name="arch" type="xml">-->
<!-- <xpath expr="//search[1]" position="inside">-->
<!-- <searchpanel class="account_root">-->
<!--&lt;!&ndash; <field name="location_type" icon="fa-filter"/> &ndash;&gt;-->
<!-- <field name="production_line_id" select="multi"/>-->
<!-- </searchpanel>-->
<!-- </xpath>-->
<!-- </field>-->
<!-- </record>-->
=======
>>>>>>> develop
</odoo>

22
sf_mrs_connect/models/res_config_setting.py
View File

@@ -36,8 +36,7 @@ class ResConfigSettings(models.TransientModel):
_logger.info("同步资源库品牌")
self.env['sf.machine.control_system'].sync_all_machine_tool_type_control_system()
_logger.info("同步资源库控制系统")
self.env['sf.machine_tool.type'].sync_all_machine_tool_type()
_logger.info("同步资源库机床型号")
self.env['sf.machine_tool.category'].sync_all_machine_tool_category()
_logger.info("同步资源库机床类型")
# self.env['sf.production.process.parameter'].sync_all_production_process_parameter()
@@ -57,16 +56,19 @@ class ResConfigSettings(models.TransientModel):
_logger.info("同步所有功能刀具列表...")
self.env['sf.functional.cutting.tool'].sync_all_functional_cutting_tool()
_logger.info("同步所有功能刀具列表完成")
self.env['sf.fixture.material'].sync_all_fixture_material()
_logger.info("同步夹具物料")
self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type()
_logger.info("同步联装类型")
self.env['sf.fixture.model'].sync_all_fixture_model()
_logger.info("同步夹具型号")
self.env['sf.functional.fixture.type'].sync_all_functional_fixture_type()
_logger.info("同步功能夹具类型")
self.env['sf.functional.fixture'].sync_all_functional_fixture()
_logger.info("同步功能夹具")
# self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type()
# _logger.info("同步联装类型")
# self.env['sf.fixture.model'].sync_all_fixture_model()
# _logger.info("同步夹具型号")
# self.env['sf.functional.fixture.type'].sync_all_functional_fixture_type()
# _logger.info("同步功能夹具类型")
# self.env['sf.functional.fixture'].sync_all_functional_fixture()
# _logger.info("同步功能夹具")
self.env['sf.machine_tool.type'].sync_all_machine_tool_type()
_logger.info("同步资源库机床型号")
except Exception as e:
_logger.info("捕获错误信息:%s" % e)
raise ValidationError("数据错误导致同步失败,请联系管理员")

152
sf_mrs_connect/models/sync_common.py
View File

@@ -570,121 +570,6 @@ class MachineBrand(models.Model):
raise ValidationError("认证未通过")
class MachineTool(models.Model):
_inherit = 'sf.machine_tool'
_description = '机床'
url = '/api/machine_tool/list'
crea_url = '/api/machine_tool/create'
# 定时同步机床
def sync_machine_tool(self):
sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key']
headers = Common.get_headers(self, token, sf_secret_key)
strUrl = sf_sync_config['sf_url'] + self.url
r = requests.post(strUrl, json={}, data=None, headers=headers)
r = r.json()
result = json.loads(r['result'])
if result['status'] == 1:
for item in result['machine_tool_all_yesterday_list']:
brand = self.env['sf.machine_tool'].search(
[("code", '=', item['code'])])
if brand:
brand.id = item['id'],
brand.name = item['name'],
brand.code = item['code'],
brand.precision = item['precision'],
brand.knife_type = item['knife_type'],
brand.registration_date = item['registration_date'],
brand.number_of_knife_library = item['number_of_knife_library'],
brand.rotate_speed = item['rotate_speed'],
brand.number_of_axles = item['number_of_axles'],
# brand.control_system_id = item['control_system_id'],
brand.type_id = item['type_id'],
brand.brand_id = item['brand_id'],
brand.x_axis = item['x_axis'],
brand.y_axis = item['y_axis'],
brand.z_axis = item['z_axis'],
brand.b_axis = item['b_axis'],
brand.c_axis = item['c_axis'],
brand.state = item['state'],
brand.active = item['active']
else:
self.env['sf.machine_tool'].create({
"id": item['id'],
"name": item['name'],
"precision": item['precision'],
"code": item['code'],
"status": item['status'],
"knife_type": item['knife_type'],
"registration_date": item['registration_date'],
"number_of_knife_library": item['number_of_knife_library'],
"rotate_speed": item['rotate_speed'],
"number_of_axles": item['number_of_axles'],
# "control_system_id": item['control_system_id'],
"type_id": item['type_id'],
"brand_id": item['brand_id'],
"x_axis": item['x_axis'],
"y_axis": item['y_axis'],
"z_axis": item['z_axis'],
"b_axis": item['b_axis'],
"c_axis": item['c_axis'],
"state": item['state'],
"active": item['active'],
# "tag_ids": item['tag_ids']
})
else:
raise ValidationError("认证未通过")
# 同步所有机床
def sync_all_machine_tool(self):
sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key']
headers = Common.get_headers(self, token, sf_secret_key)
strUrl = sf_sync_config['sf_url'] + self.url
r = requests.post(strUrl, json={}, data=None, headers=headers)
r = r.json()
result = json.loads(r['result'])
if result['status'] == 1:
for item in result['machine_tool_all_list']:
brand = self.env['sf.machine_tool'].search(
[("code", '=', item['code'])])
if not brand:
self.env['sf.machine_tool'].create({
"id": item['id'],
"name": item['name'],
"precision": item['precision'],
"code": item['code'],
"status": item['status'],
"knife_type": item['knife_type'],
"registration_date": item['registration_date'],
"number_of_knife_library": item['number_of_knife_library'],
"rotate_speed": item['rotate_speed'],
"number_of_axles": item['number_of_axles'],
# "control_system_id": item['control_system_id'],
"type_id": item['type_id'],
'brand_id': self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])]).id,
"x_axis": item['x_axis'],
"y_axis": item['y_axis'],
"z_axis": item['z_axis'],
"b_axis": item['b_axis'],
"c_axis": item['c_axis'],
"state": item['state'],
"active": item['active'],
# "tag_ids": item['tag_ids']
})
else:
raise ValidationError("认证未通过")
class MachineToolType(models.Model):
_inherit = 'sf.machine_tool.type'
@@ -708,9 +593,11 @@ class MachineToolType(models.Model):
[("code", '=', item['code'])])
if brand:
brand.id = item['id'],
brand.knife_type = item['knife_type'],
brand.name = item['name'],
brand.code = item['code'],
brand.precision = item['precision'],
brand.precision_min = item['precision_min'],
brand.precision_max = item['precision_max'],
brand.number_of_knife_library = item['number_of_knife_library'],
brand.rotate_speed = item['rotate_speed'],
brand.number_of_axles = item['number_of_axles'],
@@ -725,8 +612,6 @@ class MachineToolType(models.Model):
brand.active = item['active'],
brand.remark = item['remark'],
brand.brand_id = self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])]).id,
brand.machine_tool_id = self.env['sf.machine_tool'].search(
[('code', '=', item['machine_tool_id'])]).id
else:
# print(item['machine_tool_picture'].encode('utf-8'))
@@ -734,11 +619,10 @@ class MachineToolType(models.Model):
"id": item['id'],
"name": item['name'],
"code": item['code'],
"knife_type": item['knife_type'],
"number_of_knife_library": item['number_of_knife_library'],
"rotate_speed": item['rotate_speed'],
'machine_tool_id': self.env['sf.machine_tool'].search(
[('code', '=', item['machine_tool_id'])]).id,
"number_of_axles": item['number_of_axles'],
"x_axis": item['x_axis'],
"y_axis": item['y_axis'],
@@ -746,7 +630,8 @@ class MachineToolType(models.Model):
"b_axis": item['b_axis'],
"c_axis": item['c_axis'],
"remark": item['remark'],
"precision": item['precision'],
"precision_min": item['precision_min'],
"precision_max": item['precision_max'],
'control_system_id': self.env['sf.machine.control_system'].search(
[('code', '=', item['control_system_id'])]).id,
"active": item['active'],
@@ -763,13 +648,15 @@ class MachineToolType(models.Model):
"machine_tool_H": item['machine_tool_H'],
"feed_speed": item['feed_speed'],
"tool_speed": item['tool_speed'],
"distance": item['distance'],
"distance_min": item['distance_min'],
"distance_max": item['distance_max'],
"taper": item['taper'],
"torque": item['torque'],
"motor_power": item['motor_power'],
"tool_quality_max": item['tool_quality_max'],
"tool_long_max": item['tool_long_max'],
"tool_diameter_max": item['tool_diameter_max'],
"tool_diameter_min": item['tool_diameter_min'],
"machine_tool_category": self.env['sf.machine_tool.category'].search(
[('code', '=', item['machine_tool_category'])]).id,
@@ -804,16 +691,16 @@ class MachineToolType(models.Model):
"number_of_knife_library": item['number_of_knife_library'],
"rotate_speed": item['rotate_speed'],
'machine_tool_id': self.env['sf.machine_tool'].search(
[('code', '=', item['machine_tool_id'])]).id,
"number_of_axles": item['number_of_axles'],
"x_axis": item['x_axis'],
"y_axis": item['y_axis'],
"z_axis": item['z_axis'],
"b_axis": item['b_axis'],
"c_axis": item['c_axis'],
"knife_type": item['knife_type'],
"remark": item['remark'],
"precision": item['precision'],
"precision_min": item['precision_min'],
"precision_max": item['precision_max'],
'control_system_id': self.env['sf.machine.control_system'].search(
[('code', '=', item['control_system_id'])]).id,
"active": item['active'],
@@ -830,13 +717,15 @@ class MachineToolType(models.Model):
"machine_tool_H": item['machine_tool_H'],
"feed_speed": item['feed_speed'],
"tool_speed": item['tool_speed'],
"distance": item['distance'],
"distance_min": item['distance_min'],
"distance_max": item['distance_max'],
"taper": item['taper'],
"torque": item['torque'],
"motor_power": item['motor_power'],
"tool_quality_max": item['tool_quality_max'],
"tool_long_max": item['tool_long_max'],
"tool_diameter_max": item['tool_diameter_max'],
"tool_diameter_min": item['tool_diameter_min'],
"machine_tool_category": self.env['sf.machine_tool.category'].search(
[('code', '=', item['machine_tool_category'])]).id,
@@ -846,19 +735,18 @@ class MachineToolType(models.Model):
"id": item['id'],
"name": item['name'],
"code": item['code'],
"number_of_knife_library": item['number_of_knife_library'],
"rotate_speed": item['rotate_speed'],
'machine_tool_id': self.env['sf.machine_tool'].search(
[('code', '=', item['machine_tool_id'])]).id,
"number_of_axles": item['number_of_axles'],
"x_axis": item['x_axis'],
"y_axis": item['y_axis'],
"z_axis": item['z_axis'],
"b_axis": item['b_axis'],
"knife_type": item['knife_type'],
"c_axis": item['c_axis'],
"remark": item['remark'],
"precision": item['precision'],
"precision_min": item['precision_min'],
"precision_max": item['precision_max'],
'control_system_id': self.env['sf.machine.control_system'].search(
[('code', '=', item['control_system_id'])]).id,
"active": item['active'],
@@ -875,13 +763,15 @@ class MachineToolType(models.Model):
"machine_tool_H": item['machine_tool_H'],
"feed_speed": item['feed_speed'],
"tool_speed": item['tool_speed'],
"distance": item['distance'],
"distance_min": item['distance_min'],
"distance_max": item['distance_max'],
"taper": item['taper'],
"torque": item['torque'],
"motor_power": item['motor_power'],
"tool_quality_max": item['tool_quality_max'],
"tool_long_max": item['tool_long_max'],
"tool_diameter_max": item['tool_diameter_max'],
"tool_diameter_min": item['tool_diameter_min'],
"machine_tool_category": self.env['sf.machine_tool.category'].search(
[('code', '=', item['machine_tool_category'])]).id,

437
sf_tool_management/models/base.py
View File

@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
from odoo import fields, models, api
from odoo import SUPERUSER_ID
# class FunctionalCuttingToolEntity(models.Model):
@@ -125,68 +126,84 @@ class FunctionalToolWarning(models.Model):
_name = 'sf.functional.tool.warning'
_description = '功能刀具预警'
functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True)
code = fields.Char('编码', readonly=True)
name = fields.Char('名称', invisible=True, readonly=True)
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True)
functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装', readonly=True)
code = fields.Char('编码', readonly=True, related='functional_cutting_tool_id.code')
name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name')
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
related='functional_cutting_tool_id.mrs_cutting_tool_type_id')
# 整体式刀具型号
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_warning_id',
string='整体式刀具型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '整体式刀具')])
string='整体式刀具型号', readonly=True,
domain= [('mrs_cutting_tool_material_name', '=', '整体式刀具')],
related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids')
# 刀片型号
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_warning_id',
string='刀片型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀片')])
string='刀片型号', readonly=True,
domain= [('mrs_cutting_tool_material_name', '=', '刀片')],
related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids')
# 刀杆型号
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_warning_id',
string='刀杆型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀杆')])
string='刀杆型号', readonly=True,
domain= [('mrs_cutting_tool_material_name', '=', '刀杆')],
related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids')
# 刀盘型号
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_warning_id',
string='刀盘型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀盘')])
string='刀盘型号', readonly=True,
domain=[('mrs_cutting_tool_material_name', '=', '刀盘')],
related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids')
# 刀柄型号
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_warning_id',
string='刀柄型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀柄')])
string='刀柄型号', readonly=True,
domain=[('mrs_cutting_tool_material_name', '=', '刀柄')],
related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids')
# 夹头型号
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_warning_id',
string='夹头型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '夹头')])
string='夹头型号', readonly=True,
domain=[('mrs_cutting_tool_material_name', '=', '夹头')],
related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids')
diameter = fields.Float('直径(mm)', readonly=True)
diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter')
tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
string='刀具等级', readonly=True)
machining_accuracy = fields.Float('加工精度(mm)', readonly=True)
tool_length = fields.Float('装刀长', readonly=True)
blade_number = fields.Integer('刃数', readonly=True)
integral_blade_length = fields.Float('整体刃长(mm)', readonly=True)
effective_blade_length = fields.Float('有效刃长(mm)', readonly=True)
max_life = fields.Float('最大寿命值', readonly=True)
is_standard = fields.Boolean('是否标准刀', readonly=True)
applicable_range = fields.Char('适用范围', readonly=True)
image = fields.Binary('图片', readonly=True)
string='刀具等级', readonly=True, related='functional_cutting_tool_id.tool_grade')
machining_accuracy = fields.Float('加工精度(mm)', readonly=True, related='functional_cutting_tool_id.machining_accuracy')
tool_length = fields.Float('装刀长', readonly=True, related='functional_cutting_tool_id.tool_length')
blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number')
integral_blade_length = fields.Float('整体刃长(mm)', readonly=True, related='functional_cutting_tool_id.integral_blade_length')
effective_blade_length = fields.Float('有效刃长(mm)', readonly=True, related='functional_cutting_tool_id.effective_blade_length')
max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life')
is_standard = fields.Boolean('是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard')
applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range')
image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image')
# 功能刀具预警 特有字段
install_tool_time = fields.Char("装刀时间", readonly=False)
outbound_time = fields.Char('出库时间', readonly=False)
on_board_time = fields.Char('上机时间', readonly=False)
machine_tool_code = fields.Char('机台号', readonly=False)
cutting_tool_code = fields.Char('刀位号', readonly=False)
install_tool_time = fields.Datetime("装刀时间", readonly=True,related='functional_tool_assembly_id.tool_loading_time')
outbound_time = fields.Datetime('出库时间', readonly=True,related='functional_tool_assembly_id.receive_time')
on_board_time = fields.Datetime('上机时间', readonly=False)
machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True, tracking=True,
group_expand='_read_group_machine_table_name_ids')
@api.model
def _read_group_machine_table_name_ids(self, categories, domain, order):
machine_table_name_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
return categories.browse(machine_table_name_ids)
machine_tool_code = fields.Char('机台号', readonly=True,related='functional_tool_assembly_id.machine_tool_code')
cutting_tool_code = fields.Char('刀位号', readonly=True,related='functional_tool_assembly_id.cutter_spacing_code')
idle_time = fields.Char('闲置时长', readonly=False)
alarm_value = fields.Char('报警值', readonly=False)
used_value = fields.Char('已使用值', readonly=False)
alarm_type = fields.Char('报警类型', readonly=False)
alarm_time = fields.Char('报警时间', readonly=False)
dispose_user = fields.Char('处理人', readonly=False)
alarm_time = fields.Char('报警时间', readonly=False)
dispose_time = fields.Char('处理时间', readonly=False)
dispose_func = fields.Char('处理方法/措施', readonly=False)
remark = fields.Char('备注', readonly=False)
@@ -201,119 +218,189 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
_description = '功能刀具实时分布'
functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True)
code = fields.Char('编码', readonly=True)
name = fields.Char('名称', invisible=True, readonly=True)
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
tracking=True, group_expand='_read_mrs_cutting_tool_type_ids',store=True,
compute='_compute_functional_cutting_tool_id')
@api.model
def _read_mrs_cutting_tool_type_ids(self, categories, domain, order):
mrs_cutting_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
return categories.browse(mrs_cutting_tool_type_ids)
@api.depends('functional_cutting_tool_id')
def _compute_functional_cutting_tool_id(self):
for record in self:
if record:
record.mrs_cutting_tool_type_id = record.functional_cutting_tool_id.mrs_cutting_tool_type_id.id
code = fields.Char('编码', readonly=True, related='functional_cutting_tool_id.code')
name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name')
# mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
# related='functional_cutting_tool_id.mrs_cutting_tool_type_id')
# 整体式刀具型号
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_real_time_distribution_of_functional_tools_id',
string='整体式刀具型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '整体式刀具')])
'sf_functional_tool_warning_id',
string='整体式刀具型号', readonly=True,
domain=[
('mrs_cutting_tool_material_name', '=', '整体式刀具')],
related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids')
# 刀片型号
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_real_time_distribution_of_functional_tools_id',
string='刀片型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀片')])
'sf_functional_tool_warning_id',
string='刀片型号', readonly=True,
domain=[('mrs_cutting_tool_material_name', '=', '刀片')],
related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids')
# 刀杆型号
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_real_time_distribution_of_functional_tools_id',
string='刀杆型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀杆')])
'sf_functional_tool_warning_id',
string='刀杆型号', readonly=True,
domain=[('mrs_cutting_tool_material_name', '=', '刀杆')],
related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids')
# 刀盘型号
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_real_time_distribution_of_functional_tools_id',
string='刀盘型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀盘')])
'sf_functional_tool_warning_id',
string='刀盘型号', readonly=True,
domain=[('mrs_cutting_tool_material_name', '=', '刀盘')],
related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids')
# 刀柄型号
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_real_time_distribution_of_functional_tools_id',
string='刀柄型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀柄')])
'sf_functional_tool_warning_id',
string='刀柄型号', readonly=True,
domain=[('mrs_cutting_tool_material_name', '=', '刀柄')],
related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids')
# 夹头型号
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_real_time_distribution_of_functional_tools_id',
string='夹头型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '夹头')])
'sf_functional_tool_warning_id',
string='夹头型号', readonly=True,
domain=[('mrs_cutting_tool_material_name', '=', '夹头')],
related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids')
diameter = fields.Float('直径(mm)', readonly=True)
diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter')
tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
string='刀具等级', readonly=True)
machining_accuracy = fields.Float('加工精度(mm)', readonly=True)
tool_length = fields.Float('装刀长', readonly=True)
blade_number = fields.Integer('刃数', readonly=True)
integral_blade_length = fields.Float('整体刃长(mm)', readonly=True)
effective_blade_length = fields.Float('有效刃长(mm)', readonly=True)
max_life = fields.Float('最大寿命值', readonly=True)
is_standard = fields.Boolean('是否标准刀', readonly=True)
applicable_range = fields.Char('适用范围', readonly=True)
image = fields.Binary('图片', readonly=True)
string='刀具等级', readonly=True, related='functional_cutting_tool_id.tool_grade')
machining_accuracy = fields.Float('加工精度(mm)', readonly=True,
related='functional_cutting_tool_id.machining_accuracy')
tool_length = fields.Float('装刀长', readonly=True, related='functional_cutting_tool_id.tool_length')
blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number')
integral_blade_length = fields.Float('整体刃长(mm)', readonly=True,
related='functional_cutting_tool_id.integral_blade_length')
effective_blade_length = fields.Float('有效刃长(mm)', readonly=True,
related='functional_cutting_tool_id.effective_blade_length')
max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life')
is_standard = fields.Boolean('是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard')
applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range')
image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image')
# 功能刀具实时分布
tool_stock_num = fields.Char(string='刀具房库存数量', readonly=False)
side_shelf_num = fields.Char(string='线边货架货架数量', readonly=False)
on_tool_stock_num = fields.Char(string='机内刀库库存数量', readonly=False)
tool_stock_total = fields.Char(string='合计', readonly=False)
return_reuse_num_re = fields.Char(string='归还再用数量(精)', readonly=False)
return_reuse_num_co = fields.Char(string='归还再用数量(粗)', readonly=False)
return_processing_num = fields.Char(string='归还需磨削数量', readonly=False)
return_total = fields.Char(string='合计', readonly=False)
total = fields.Char(string='总计', readonly=False)
tool_stock_num = fields.Integer(string='刀具房库存数量', readonly=False)
side_shelf_num = fields.Integer(string='线边货架货架数量', readonly=False)
on_tool_stock_num = fields.Integer(string='机内刀库库存数量', readonly=False)
tool_stock_total = fields.Integer(string='合计(库存)', readonly=True, compute='_compute_tool_stock_total')
return_reuse_num_re = fields.Integer(string='归还再用数量(精)', readonly=False)
return_reuse_num_co = fields.Integer(string='归还再用数量(粗)', readonly=False)
return_processing_num = fields.Integer(string='归还需磨削数量', readonly=False)
return_total = fields.Integer(string='合计(归还)', readonly=True, compute='_compute_return_total')
total = fields.Integer(string='总计', readonly=True, compute='_compute_total')
remark = fields.Char(string='备注/说明', readonly=False)
@api.depends('tool_stock_num', 'side_shelf_num', 'on_tool_stock_num')
def _compute_tool_stock_total(self):
for record in self:
if record:
self.tool_stock_total = record.tool_stock_num + record.side_shelf_num + record.on_tool_stock_num
@api.depends('return_reuse_num_re', 'return_reuse_num_co', 'return_processing_num')
def _compute_return_total(self):
for record in self:
if record:
self.return_total = record.return_reuse_num_re + record.return_reuse_num_co + record.return_processing_num
@api.depends('tool_stock_total', 'return_total')
def _compute_total(self):
for record in self:
if record:
self.total = record.tool_stock_total + record.return_total
class InboundAndOutboundRecordsOfFunctionalTools(models.Model):
_name = 'sf.inbound.and.outbound.records.of.functional.tools'
_description = '功能刀具出入库记录'
functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True)
code = fields.Char('编码', readonly=True)
name = fields.Char('名称', invisible=True, readonly=True)
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
tracking=True, group_expand='_read_mrs_cutting_tool_type_ids',
store=True,
compute='_compute_functional_cutting_tool_id')
@api.model
def _read_mrs_cutting_tool_type_ids(self, categories, domain, order):
mrs_cutting_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
return categories.browse(mrs_cutting_tool_type_ids)
@api.depends('functional_cutting_tool_id')
def _compute_functional_cutting_tool_id(self):
for record in self:
if record:
record.mrs_cutting_tool_type_id = record.functional_cutting_tool_id.mrs_cutting_tool_type_id.id
code = fields.Char('编码', readonly=True, related='functional_cutting_tool_id.code')
name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name')
# 整体式刀具型号
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_inbound_and_outbound_records_of_functional_tools_id',
string='整体式刀具型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '整体式刀具')])
'sf_functional_tool_warning_id',
string='整体式刀具型号', readonly=True,
domain=[
('mrs_cutting_tool_material_name', '=', '整体式刀具')],
related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids')
# 刀片型号
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_inbound_and_outbound_records_of_functional_tools_id',
string='刀片型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀片')])
'sf_functional_tool_warning_id',
string='刀片型号', readonly=True,
domain=[('mrs_cutting_tool_material_name', '=', '刀片')],
related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids')
# 刀杆型号
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_inbound_and_outbound_records_of_functional_tools_id',
string='刀杆型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀杆')])
'sf_functional_tool_warning_id',
string='刀杆型号', readonly=True,
domain=[('mrs_cutting_tool_material_name', '=', '刀杆')],
related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids')
# 刀盘型号
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_inbound_and_outbound_records_of_functional_tools_id',
string='刀盘型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀盘')])
'sf_functional_tool_warning_id',
string='刀盘型号', readonly=True,
domain=[('mrs_cutting_tool_material_name', '=', '刀盘')],
related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids')
# 刀柄型号
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_inbound_and_outbound_records_of_functional_tools_id',
string='刀柄型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀柄')])
'sf_functional_tool_warning_id',
string='刀柄型号', readonly=True,
domain=[('mrs_cutting_tool_material_name', '=', '刀柄')],
related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids')
# 夹头型号
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_inbound_and_outbound_records_of_functional_tools_id',
string='夹头型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '夹头')])
'sf_functional_tool_warning_id',
string='夹头型号', readonly=True,
domain=[('mrs_cutting_tool_material_name', '=', '夹头')],
related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids')
diameter = fields.Float('直径(mm)', readonly=True)
diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter')
tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
string='刀具等级', readonly=True)
machining_accuracy = fields.Float('加工精度(mm)', readonly=True)
tool_length = fields.Float('装刀长', readonly=True)
blade_number = fields.Integer('刃数', readonly=True)
integral_blade_length = fields.Float('整体刃长(mm)', readonly=True)
effective_blade_length = fields.Float('有效刃长(mm)', readonly=True)
max_life = fields.Float('最大寿命值', readonly=True)
is_standard = fields.Boolean('是否标准刀', readonly=True)
applicable_range = fields.Char('适用范围', readonly=True)
image = fields.Binary('图片', readonly=True)
string='刀具等级', readonly=True, related='functional_cutting_tool_id.tool_grade')
machining_accuracy = fields.Float('加工精度(mm)', readonly=True,
related='functional_cutting_tool_id.machining_accuracy')
tool_length = fields.Float('装刀长', readonly=True, related='functional_cutting_tool_id.tool_length')
blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number')
integral_blade_length = fields.Float('整体刃长(mm)', readonly=True,
related='functional_cutting_tool_id.integral_blade_length')
effective_blade_length = fields.Float('有效刃长(mm)', readonly=True,
related='functional_cutting_tool_id.effective_blade_length')
max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life')
is_standard = fields.Boolean('是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard')
applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range')
image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image')
# 功能刀具出入库记录 特有字段
thickness = fields.Selection([('1', '粗'), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False)
@@ -347,9 +434,9 @@ class MachineTableToolChangingApply(models.Model):
# string='换刀需求信息',
# attrs="{'invisible': 1}")
name = fields.Many2one('sf.machine_tool', string='CNC机床', readonly=False)
machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=False)
machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}")
name = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=False,tracking=True, group_expand='_read_group_names')
machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=True, compute='_compute_name')
machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}", readonly=True, compute='_compute_name')
cutter_spacing_code = fields.Char(string='刀位号', readonly=False)
functional_tool_code = fields.Char(string='功能刀具编码', readonly=True, compute='_compute_functional_tool_name_id')
functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False)
@@ -363,9 +450,9 @@ class MachineTableToolChangingApply(models.Model):
used_value = fields.Char(string='已使用值', readonly=False)
functional_tool_status = fields.Selection([('正常', '正常'), ('异常', '异常')], string='功能刀具状态', default='正常', readonly=False)
replacement_tool_code = fields.Char(string='待换刀具编码', readonly=True)
replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换刀具名称', readonly=True)
replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换刀具类型', readonly=True)
replacement_tool_code = fields.Char(string='待换功能刀具编码', readonly=True)
replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换功能刀具名称', readonly=True)
replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型', readonly=True)
replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
string='粗/中/精', readonly=True)
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
@@ -376,6 +463,20 @@ class MachineTableToolChangingApply(models.Model):
status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移')], string='操作状态', default='0')
sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装')
@api.model
def _read_group_names(self, categories, domain, order):
names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
return categories.browse(names)
@api.depends('name')
def _compute_name(self):
for record in self:
if record:
record.machine_table_type_id = record.name.machine_tool_category.id
record.machine_tool_code = record.name.code
@api.depends('functional_tool_name_id')
def _compute_functional_tool_name_id(self):
for record in self:
@@ -383,7 +484,6 @@ class MachineTableToolChangingApply(models.Model):
record.functional_tool_code = record.functional_tool_name_id.code
record.functional_tool_type_id = record.functional_tool_name_id.mrs_cutting_tool_type_id.id
@api.onchange('functional_tool_status')
def automation_apply_for_tool_change(self):
"""
@@ -459,7 +559,8 @@ class MachineTableToolChangingApply(models.Model):
'used_tool_time': None,
'reason_for_applying': None,
'remark': None,
'status': '0'
'status': '0',
'sf_functional_tool_assembly_id': None,
})
@@ -473,6 +574,16 @@ class MachineTableToolChangingApply(models.Model):
'status': '0'
})
def open_sf_functional_tool_assembly(self):
"""
跳转到功能刀具组装界面按键功能
:return:
"""
action = self.env.ref('sf_tool_management.sf_functional_tool_assembly_view_act')
result = action.read()[0]
result['domain'] = [('sf_machine_table_tool_changing_apply_id', '=', self.id)]
return result
class CAMWorkOrderProgramKnifePlan(models.Model):
_name = 'sf.cam.work.order.program.knife.plan'
@@ -484,16 +595,22 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
functional_tool_code = fields.Char(string='功能刀具编码', readonly=False)
functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False)
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False)
machine_table_name_id = fields.Many2one('sf.machine_tool', string='机床名称', readonly=False)
machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=False, tracking=True, group_expand='_read_group_machine_table_name_ids')
@api.model
def _read_group_machine_table_name_ids(self, categories, domain, order):
machine_table_name_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
return categories.browse(machine_table_name_ids)
machine_tool_cutter_spacing_code = fields.Char(string='机床刀位号', readonly=False)
diameter = fields.Char(string='直径（程式）', readonly=False)
tool_loading_length = fields.Char(string='装刀长', readonly=False)
clearance_length = fields.Char(string='避空长', readonly=False)
tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=False)
L_D = fields.Char(string='L/D', readonly=False)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False)
required_cutting_time = fields.Char(string='需要切割时间', readonly=False)
whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=False)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False, default='2')
required_cutting_time = fields.Char(string='需切削时长', readonly=False)
whether_standard_tool = fields.Selection([('1', '是'), ('0', '否')],string='是否标准刀', readonly=False, default='1')
need_knife_time = fields.Datetime(string='需要用刀时间', readonly=False)
plan_execute_status = fields.Selection([('0', '待下发'), ('1', '执行中'), ('2', '已完成')],
string='计划执行状态', default='0', readonly=False)
@@ -501,12 +618,14 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
reason_for_applying = fields.Char(string='申请原因', readonly=False)
remark = fields.Char(string='备注说明', readonly=False)
sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装')
def apply_for_tooling(self):
"""
申请装刀
:return:
"""
self.env['sf.functional.tool.assembly'].create({
record = self.env['sf.functional.tool.assembly'].create({
'functional_tool_code': self.functional_tool_code,
'name': self.functional_tool_name_id.id,
'functional_tool_type_id': self.functional_tool_type_id.id,
@@ -520,33 +639,43 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
'use_tool_time': self.need_knife_time,
'machine_tool_name_id': self.machine_table_name_id.id,
'machine_tool_code': self.cam_procedure_code,
'cutter_spacing_code': self.cam_cutter_spacing_code
'cutter_spacing_code': self.cam_cutter_spacing_code,
'sf_cam_work_order_program_knife_plan_id': self.id
})
self.sf_functional_tool_assembly_id = record.id
# 将计划执行状态改为执行中
self.env['sf.cam.work.order.program.knife.plan'].search(
[('functional_tool_code', '=', self.functional_tool_code)]).write({'plan_execute_status': '1',
'applicant': self.env.user.name})
[('functional_tool_code', '=', self.functional_tool_code)]).write({
'plan_execute_status': '1',
'applicant': self.env.user.name})
def revocation(self):
"""
撤回装刀申请
:return:
"""
self.env['sf.functional.tool.assembly'].search(
[('functional_tool_code', '=', self.functional_tool_code),
('loading_task_source', '=', '0')]).unlink()
# 将计划执行状态改为待执行
# 将计划执行状态改为待执行，同时清除申请人、功能刀具组装字段数据
self.env['sf.cam.work.order.program.knife.plan'].search(
[('functional_tool_code', '=', self.functional_tool_code)]).write({'plan_execute_status': '0',
'applicant': None})
[('functional_tool_code', '=', self.functional_tool_code)]).write({
'plan_execute_status': '0',
'applicant': None,
'sf_functional_tool_assembly_id': None,
})
def open_sf_functional_tool_assembly(self):
"""
跳转到功能刀具组装界面按键功能
:return:
"""
action = self.env.ref('sf_tool_management.sf_functional_tool_assembly_view_act')
result = action.read()[0]
result['domain'] = [('sf_cam_work_order_program_knife_plan_id', '=', self.id)]
return result
class FunctionalToolAssembly(models.Model):
@@ -554,9 +683,17 @@ class FunctionalToolAssembly(models.Model):
_description = '功能刀具组装'
_order = 'use_tool_time asc'
functional_tool_code = fields.Char(string='功能刀具编码', readonly=True)
name = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True)
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
tracking=True, group_expand='_read_group_functional_tool_type_ids')
@api.model
def _read_group_functional_tool_type_ids(self, categories, domain, order):
"""读取分组自定义以便在看板视图中显示所有的类别，即使它们为空"""
functional_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
return categories.browse(functional_tool_type_ids)
functional_tool_diameter = fields.Char(string='功能刀具直径', readonly=True)
functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True)
functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
@@ -605,7 +742,6 @@ class FunctionalToolAssembly(models.Model):
chuck_name = fields.Char('夹头名称', readonly=True)
sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
tool_loading_length = fields.Char(string='装刀长', readonly=True)
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
@@ -621,7 +757,7 @@ class FunctionalToolAssembly(models.Model):
assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装'), ('2', '已出库')],string='组装状态', default='0', readonly=True)
use_tool_time = fields.Datetime(string='用刀时间', readonly=True)
production_line_name_id = fields.Many2one('sf.production.line', string='产线名称', readonly=False)
machine_tool_name_id = fields.Many2one('sf.machine_tool', string='机床名称', readonly=True)
machine_tool_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True)
machine_tool_code = fields.Char(string='机台号', readonly=True)
cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
@@ -632,12 +768,26 @@ class FunctionalToolAssembly(models.Model):
remark = fields.Char(string='备注说明', readonly=True)
check_box_1 = fields.Boolean(string='复选框', default=False, readonly=False)
sf_machine_table_tool_changing_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', '机床换刀申请')
sf_cam_work_order_program_knife_plan_id = fields.Many2one('sf.cam.work.order.program.knife.plan', 'CAM工单程序用刀计划')
@api.onchange('assemble_status')
def check_box(self):
if self.assemble_status != '1':
self.check_box_1 = False
def open_sf_cam_work_order_program_knife_plan(self):
"""
跳转到CAM工单程序用刀计划界面按钮功能
"""
action = self.env.ref('sf_tool_management.sf_cam_work_order_program_knife_plan_view_act')
result = action.read()[0]
result['domain'] = [('sf_functional_tool_assembly_id', '=', self.id)]
return result
def open_sf_machine_table_tool_changing_apply(self):
"""
跳转到机床换刀申请界面按钮功能
"""
action = self.env.ref('sf_tool_management.sf_machine_table_tool_changing_apply_view_act')
result = action.read()[0]
result['domain'] = [('sf_functional_tool_assembly_id', '=', self.id)]
return result
def cancel_functional_tool_assembly(self):
"""
@@ -645,9 +795,16 @@ class FunctionalToolAssembly(models.Model):
:return:
"""
if self.new_former == '0':
# 如果是新刀，则删除功能刀具列表、
self.env['sf.functional.cutting.tool.entity'].search([
('code', '=', self.functional_tool_code)]).unlink()
# 如果是新刀，则删除功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录的记录
record = self.env['sf.functional.cutting.tool.entity'].search([
('code', '=', self.functional_tool_code)])
self.env['sf.functional.tool.warning'].search(
[('functional_cutting_tool_id', '=', record.id)]).unlink()
self.env['sf.real.time.distribution.of.functional.tools'].search(
[('functional_cutting_tool_id', '=', record.id)]).unlink()
self.env['sf.inbound.and.outbound.records.of.functional.tools'].search(
[('functional_cutting_tool_id', '=', record.id)]).unlink()
record.unlink()
else:
# 获取功能刀具缓存信息
record = self.env['sf.functional.cutting.tool.entity.cache'].search([

142
sf_tool_management/views/tool_base_views.xml
View File

@@ -235,7 +235,7 @@
<field name="dispose_func" optional="show"/>
<field name="remark" optional="show"/>
<searchpanel>
<field name="mrs_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
<field name="machine_table_name_id" string="CNC机床列表" icon="fa-building" enable_counters="1"/>
</searchpanel>
</search>
</field>
@@ -313,17 +313,34 @@
<page string="实时分布信息">
<group>
<group>
<field name="tool_stock_num"/>
<field name="side_shelf_num"/>
<field name="on_tool_stock_num"/>
<field name="tool_stock_total"/>
<group>
<field name="tool_stock_num"/>
<field name="return_reuse_num_re"/>
</group>
<group>
<field name="side_shelf_num"/>
<field name="return_reuse_num_co"/>
</group>
<!-- <field name="tool_stock_num"/>-->
<!-- <field name="side_shelf_num"/>-->
<!-- <field name="on_tool_stock_num"/>-->
<!-- <field name="tool_stock_total"/>-->
</group>
<group>
<field name="return_reuse_num_re"/>
<field name="return_reuse_num_co"/>
<field name="return_processing_num"/>
<field name="return_total"/>
<field name="total"/>
<group>
<field name="on_tool_stock_num"/>
<field name="return_processing_num"/>
</group>
<group>
<field name="tool_stock_total"/>
<field name="return_total"/>
<field name="total"/>
</group>
<!-- <field name="return_reuse_num_re"/>-->
<!-- <field name="return_reuse_num_co"/>-->
<!-- <field name="return_processing_num"/>-->
<!-- <field name="return_total"/>-->
<!-- <field name="total"/>-->
</group>
</group>
</page>
@@ -551,6 +568,9 @@
type="action"
context="{ 'default_name':name,
'default_machine_tool_code': machine_tool_code,
'default_functional_tool_code': functional_tool_code,
'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id,
'default_cutter_spacing_code': cutter_spacing_code,
'default_replacement_tool_code': functional_tool_code,
'default_replacement_tool_name_id': functional_tool_name_id,
@@ -571,8 +591,10 @@
class="btn-primary"
attrs="{'invisible': [('status', '!=', '0')]}"
/>
<button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}"/>
<button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}"/>
<button string="查看组装单" type="object" name="open_sf_functional_tool_assembly"
class="oe_highlight" attrs="{'invisible': [('status', '!=', '1')]}"/>
<button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}" confirm="是否确认撤回换刀申请"/>
<button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/>
</tree>
</field>
</record>
@@ -588,6 +610,9 @@
type="action"
context="{ 'default_name':name,
'default_machine_tool_code': machine_tool_code,
'default_functional_tool_code': functional_tool_code,
'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id,
'default_cutter_spacing_code': cutter_spacing_code,
'default_replacement_tool_code': functional_tool_code,
'default_replacement_tool_name_id': functional_tool_name_id,
@@ -606,11 +631,12 @@
'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id}"
class="btn-primary"
attrs="{'invisible': [('status', '!=', '0')]}"
/>
<button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}"/>
<button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}"/>
</header>
attrs="{'invisible': [('status', '!=', '0')]}"/>
<button string="查看组装单" type="object" name="open_sf_functional_tool_assembly"
class="oe_highlight" attrs="{'invisible': [('status', '!=', '1')]}"/>
<button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}" confirm="是否确认撤回换刀申请"/>
<button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/>
</header>
<sheet>
<group string="基础信息">
<group>
@@ -639,7 +665,7 @@
<field name="used_value"/>
</group>
</group>
<group string="待换刀具信息">
<group string="待换功能刀具信息">
<group>
<field name="replacement_tool_name_id"/>
<field name="replacement_tool_type_id"/>
@@ -678,7 +704,7 @@
<field name="replacement_tool_name_id"/>
<field name="applicant"/>
<searchpanel>
<field name="name" string="CNC机床" enable_counters="1" icon="fa-filter"/>
<field name="name" enable_counters="1" icon="fa-building"/>
</searchpanel>
</search>
</field>
@@ -710,7 +736,9 @@
<field name="remark" optional="hide"/>
<field name="plan_execute_status" invisible="True"/>
<button string="申请装刀" name="apply_for_tooling" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/>
<button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
<button string="查看组装单" type="object" name="open_sf_functional_tool_assembly"
class="oe_highlight" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
<button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}" confirm="是否确认撤回装刀"/>
</tree>
</field>
</record>
@@ -722,7 +750,9 @@
<form>
<header>
<button string="申请装刀" name="apply_for_tooling" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/>
<button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
<button string="查看组装单" type="object" name="open_sf_functional_tool_assembly"
class="oe_highlight" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
<button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}" confirm="是否确认撤回装刀"/>
</header>
<sheet>
@@ -813,6 +843,7 @@
<field name="remark" optional="hide"/>
<field name="machine_tool_name_id" invisible="True"/>
<field name="machine_tool_code" invisible="True"/>
<field name="cutter_spacing_code" invisible="True"/>
<field name="functional_tool_length" invisible="True"/>
<field name="functional_tool_diameter" invisible="True"/>
@@ -823,6 +854,7 @@
type="action"
context="{
'default_machine_tool_name_id': machine_tool_name_id,
'default_machine_tool_code': machine_tool_code,
'default_code': functional_tool_code,
'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_name_id': name,
@@ -836,8 +868,13 @@
'default_whether_standard_tool': None}"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
<button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary" confirm="是否确认取消组装"/>
<button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="组装单打印" name="assemble_single_print" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印组装单"/>
<button string="查看CAM工单程序用刀计划" type="object" name="open_sf_cam_work_order_program_knife_plan"
class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '0')]}" />
<button string="查看机床换刀申请" type="object" name="open_sf_machine_table_tool_changing_apply"
class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '1')]}" />
</tree>
</field>
</record>
@@ -853,6 +890,7 @@
type="action"
context="{
'default_machine_tool_name_id': machine_tool_name_id,
'default_machine_tool_code': machine_tool_code,
'default_code': functional_tool_code,
'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_name_id': name,
@@ -867,13 +905,17 @@
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
<button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary" confirm="是否确认取消组装"/>
<button string="自动打印二维码" name="automatic_printing_of_QR_code" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" />
<button string="打印二维码" name="automatic_printing_of_QR_code" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印二维码"/>
<button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="组装单打印" name="assemble_single_print" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"/>
<button string="组装单打印" name="assemble_single_print" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印组装单"/>
<button string="查看CAM工单程序用刀计划" type="object" name="open_sf_cam_work_order_program_knife_plan"
class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '0')]}" />
<button string="查看机床换刀申请" type="object" name="open_sf_machine_table_tool_changing_apply"
class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '1')]}" />
</header>
<sheet>
<group string="功能刀具信息">
@@ -890,32 +932,32 @@
</group>
<group string="组装物料信息">
<group>
<field name="integral_code"/>
<field name="mrs_cutting_tool_integral_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="blade_code"/>
<field name="mrs_cutting_tool_blade_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="bar_code"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="pad_code"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="handle_code"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="chuck_code"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="mrs_cutting_tool_integral_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_integral_model_ids', '=', [])]}"/>
<field name="integral_code" attrs="{'invisible':[('mrs_cutting_tool_integral_model_ids', '=', [])]}"/>
<field name="mrs_cutting_tool_blade_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_blade_model_ids', '=', [])]}"/>
<field name="blade_code" attrs="{'invisible':[('mrs_cutting_tool_blade_model_ids', '=', [])]}"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_cutterbar_model_ids', '=', [])]}"/>
<field name="bar_code" attrs="{'invisible':[('mrs_cutting_tool_cutterbar_model_ids', '=', [])]}"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_cutterpad_model_ids', '=', [])]}"/>
<field name="pad_code" attrs="{'invisible':[('mrs_cutting_tool_cutterpad_model_ids', '=', [])]}"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_cutterhandle_model_ids', '=', [])]}"/>
<field name="handle_code" attrs="{'invisible':[('mrs_cutting_tool_cutterhandle_model_ids', '=', [])]}"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_cutterhead_model_ids', '=', [])]}"/>
<field name="chuck_code" attrs="{'invisible':[('mrs_cutting_tool_cutterhead_model_ids', '=', [])]}"/>
</group>
<group>
<field name="integral_name"/>
<field name="sf_tool_brand_id_1"/>
<field name="blade_name"/>
<field name="sf_tool_brand_id_2"/>
<field name="bar_name"/>
<field name="sf_tool_brand_id_3"/>
<field name="pad_name"/>
<field name="sf_tool_brand_id_4"/>
<field name="handle_name"/>
<field name="sf_tool_brand_id_5"/>
<field name="chuck_name"/>
<field name="sf_tool_brand_id_6"/>
<field name="integral_name" attrs="{'invisible':[('mrs_cutting_tool_integral_model_ids', '=', [])]}"/>
<field name="sf_tool_brand_id_1" attrs="{'invisible':[('mrs_cutting_tool_integral_model_ids', '=', [])]}"/>
<field name="blade_name" attrs="{'invisible':[('mrs_cutting_tool_blade_model_ids', '=', [])]}"/>
<field name="sf_tool_brand_id_2" attrs="{'invisible':[('mrs_cutting_tool_blade_model_ids', '=', [])]}"/>
<field name="bar_name" attrs="{'invisible':[('mrs_cutting_tool_cutterbar_model_ids', '=', [])]}"/>
<field name="sf_tool_brand_id_3" attrs="{'invisible':[('mrs_cutting_tool_cutterbar_model_ids', '=', [])]}"/>
<field name="pad_name" attrs="{'invisible':[('mrs_cutting_tool_cutterpad_model_ids', '=', [])]}"/>
<field name="sf_tool_brand_id_4" attrs="{'invisible':[('mrs_cutting_tool_cutterpad_model_ids', '=', [])]}"/>
<field name="handle_name" attrs="{'invisible':[('mrs_cutting_tool_cutterhandle_model_ids', '=', [])]}"/>
<field name="sf_tool_brand_id_5" attrs="{'invisible':[('mrs_cutting_tool_cutterhandle_model_ids', '=', [])]}"/>
<field name="chuck_name" attrs="{'invisible':[('mrs_cutting_tool_cutterhead_model_ids', '=', [])]}"/>
<field name="sf_tool_brand_id_6" attrs="{'invisible':[('mrs_cutting_tool_cutterhead_model_ids', '=', [])]}"/>
</group>
</group>
<group string="组装参数信息">

216
sf_tool_management/wizard/wizard.py
View File

@@ -1,4 +1,4 @@
from odoo import fields, models
from odoo import fields, models, api
class ToolChangeRequirementInformation(models.TransientModel):
@@ -7,13 +7,17 @@ class ToolChangeRequirementInformation(models.TransientModel):
# tool_change_to_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', string='机床换刀申请')
name = fields.Many2one('sf.machine_tool', string='CNC机床', readonly=True)
name = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=True)
machine_tool_code = fields.Char(string='机台号', readonly=True)
cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
functional_tool_code = fields.Char(string='功能刀具编码', readonly=True)
functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True)
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
replacement_tool_code = fields.Char(string='待换刀具编码')
replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换刀具名称')
replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换刀具类型')
replacement_tool_code = fields.Char(string='待换功能刀具编码', readonly=True)
replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换功能刀具名称')
replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型',
readonly=True)
replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
string='粗/中/精')
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧')
@@ -22,11 +26,39 @@ class ToolChangeRequirementInformation(models.TransientModel):
reason_for_applying = fields.Char(string='申请原因')
remark = fields.Char(string='备注说明')
@api.onchange('replacement_tool_name_id')
def _onchange_replacement_tool_name_id(self):
for record in self:
if record:
record.replacement_tool_code = record.replacement_tool_name_id.code
record.replacement_tool_type_id = record.replacement_tool_name_id.mrs_cutting_tool_type_id.id
def tool_changing_apply(self):
"""
确认换刀申请（按键）
:return:
"""
# 将数据更新到机台换刀申请界面
record = self.env['sf.machine.table.tool.changing.apply'].search(
[('name', '=', self.name.id),
('machine_tool_code', '=', self.machine_tool_code),
('cutter_spacing_code', '=', self.cutter_spacing_code),
])
# 功能刀具组装创建新任务(new_assembly_task)
record_1 = self.env['sf.functional.tool.assembly'].sudo().create({
'functional_tool_code': self.replacement_tool_code,
'name': self.replacement_tool_name_id.id,
'functional_tool_type_id': self.replacement_tool_type_id.id,
'loading_task_source': '1',
'applicant': self.applicant,
'reason_for_applying': self.reason_for_applying,
'use_tool_time': self.used_tool_time,
'machine_tool_name_id': self.name.id,
'machine_tool_code': self.machine_tool_code,
'cutter_spacing_code': self.cutter_spacing_code,
'sf_machine_table_tool_changing_apply_id': record.id,
})
# 封装数据
desc = {
'name': self.name.id,
@@ -41,26 +73,10 @@ class ToolChangeRequirementInformation(models.TransientModel):
'used_tool_time': self.used_tool_time,
'reason_for_applying': self.reason_for_applying,
'remark': self.new_former,
'status': '1'
'status': '1',
'sf_functional_tool_assembly_id': record_1.id,
}
print('desc:', desc)
# 将数据更新到机台换刀申请界面
self.env['sf.machine.table.tool.changing.apply'].search(
[('name', '=', desc.get('name'))]).write(desc)
# 功能刀具组装创建新任务
self.env['sf.machine.table.tool.changing.apply'].new_assembly_task({
'functional_tool_code': self.replacement_tool_code,
'name': self.replacement_tool_name_id.id,
'functional_tool_type_id': self.replacement_tool_type_id.id,
'loading_task_source': '1',
'applicant': self.applicant,
'reason_for_applying': self.reason_for_applying,
'use_tool_time': self.used_tool_time,
'machine_tool_name_id': self.name.id,
'machine_tool_code': self.machine_tool_code,
'cutter_spacing_code': self.cutter_spacing_code
})
record.write(desc)
# 关闭弹出窗口
return {'type': 'ir.actions.act_window_close'}
@@ -105,9 +121,10 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
_description = '功能刀具组装单'
# 功能刀具申请信息
machine_tool_name_id = fields.Many2one('sf.machine_tool', string='机床名称', readonly=True)
code = fields.Char(string='功能刀具编码', readonly=True)
machine_tool_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True)
machine_tool_code = fields.Char(string='机台号', readonly=True)
cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
code = fields.Char(string='功能刀具编码', readonly=True)
functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True)
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True)
@@ -115,62 +132,128 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
functional_tool_diameter = fields.Char(string='功能刀具直径', readonly=True)
tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=True)
functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=True)
required_cutting_time = fields.Char(string='需要切割时间', readonly=True)
required_cutting_time = fields.Char(string='需切削时长', readonly=True)
whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=True)
# 功能刀具组装信息
# 整体式刀具型号
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_assembly_order_id',
string='整体式刀具型号', readonly=False, domain=
[('mrs_cutting_tool_material_name', '=', '整体式刀具')])
integral_code = fields.Char('整体式刀具序列号')
integral_name = fields.Char('整体式刀具名称')
sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', '整体式刀具品牌')
integral_code = fields.Char('整体式刀具序列号', readonly=True,
compute='_compute_mrs_cutting_tool_integral_model_ids')
integral_name = fields.Char('整体式刀具名称', readonly=True)
sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', '整体式刀具品牌', readonly=True)
# 刀片型号
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
string='刀片型号', readonly=False, domain=
[('mrs_cutting_tool_material_name', '=', '刀片')])
blade_code = fields.Char('刀片序列号')
blade_name = fields.Char('刀片名称')
sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌')
blade_code = fields.Char('刀片序列号', readonly=True, compute='_compute_mrs_cutting_tool_blade_model_ids')
blade_name = fields.Char('刀片名称', readonly=True)
sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True)
# 刀杆型号
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_assembly_order_id',
string='刀杆型号', readonly=False, domain=
[('mrs_cutting_tool_material_name', '=', '刀杆')])
bar_code = fields.Char('刀杆序列号')
bar_name = fields.Char('刀杆名称')
sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌')
bar_code = fields.Char('刀杆序列号', readonly=True, compute='_compute_mrs_cutting_tool_cutterbar_model_ids')
bar_name = fields.Char('刀杆名称', readonly=True)
sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True)
# 刀盘型号
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_assembly_order_id',
string='刀盘型号', readonly=False, domain=
[('mrs_cutting_tool_material_name', '=', '刀盘')])
pad_code = fields.Char('刀盘序列号')
pad_name = fields.Char('刀盘名称')
sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌')
pad_code = fields.Char('刀盘序列号', readonly=True, compute='_compute_mrs_cutting_tool_cutterpad_model_ids')
pad_name = fields.Char('刀盘名称', readonly=True)
sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True)
# 刀柄型号
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_assembly_order_id',
string='刀柄型号', readonly=False, domain=
[('mrs_cutting_tool_material_name', '=', '刀柄')])
handle_code = fields.Char('刀柄序列号')
handle_name = fields.Char('刀柄名称')
sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌')
handle_code = fields.Char('刀柄序列号', readonly=True, compute='_compute_mrs_cutting_tool_cutterhandle_model_ids')
handle_name = fields.Char('刀柄名称', readonly=True)
sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True)
# 夹头型号
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_assembly_order_id',
string='夹头型号', readonly=False, domain=
[('mrs_cutting_tool_material_name', '=', '夹头')])
chuck_code = fields.Char('夹头序列号')
chuck_name = fields.Char('夹头名称')
sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌')
chuck_code = fields.Char('夹头序列号', readonly=True, compute='_compute_mrs_cutting_tool_cutterhead_model_ids')
chuck_name = fields.Char('夹头名称', readonly=True)
sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精')
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', default='1')
tool_loading_length = fields.Char(string='装刀长')
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧')
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', required=True, default='1')
reference_length = fields.Char(string='参考伸出长')
cut_time = fields.Char(string='已切削时间')
cut_length = fields.Char(string='已切削长度')
cut_number = fields.Char(string='已切削次数')
@api.depends('mrs_cutting_tool_integral_model_ids')
def _compute_mrs_cutting_tool_integral_model_ids(self):
if not self.mrs_cutting_tool_integral_model_ids:
self.integral_code = None
for val in self.mrs_cutting_tool_integral_model_ids:
if val:
self.integral_code = val.code
self.integral_name = val.name
self.sf_tool_brand_id_1 = val.mrs_machine_brand_id.id
@api.depends('mrs_cutting_tool_blade_model_ids')
def _compute_mrs_cutting_tool_blade_model_ids(self):
if not self.mrs_cutting_tool_blade_model_ids:
self.blade_code = None
for val in self.mrs_cutting_tool_blade_model_ids:
if val:
self.blade_code = val.code
self.blade_name = val.name
self.sf_tool_brand_id_2 = val.mrs_machine_brand_id.id
@api.depends('mrs_cutting_tool_cutterbar_model_ids')
def _compute_mrs_cutting_tool_cutterbar_model_ids(self):
if not self.mrs_cutting_tool_cutterbar_model_ids:
self.bar_code = None
for val in self.mrs_cutting_tool_cutterbar_model_ids:
if val:
self.bar_code = val.code
self.bar_name = val.name
self.sf_tool_brand_id_3 = val.mrs_machine_brand_id.id
@api.depends('mrs_cutting_tool_cutterpad_model_ids')
def _compute_mrs_cutting_tool_cutterpad_model_ids(self):
if not self.mrs_cutting_tool_cutterpad_model_ids:
self.pad_code = None
for val in self.mrs_cutting_tool_cutterpad_model_ids:
if val:
self.pad_code = val.code
self.pad_name = val.name
self.sf_tool_brand_id_4 = val.mrs_machine_brand_id.id
@api.depends('mrs_cutting_tool_cutterhandle_model_ids')
def _compute_mrs_cutting_tool_cutterhandle_model_ids(self):
if not self.mrs_cutting_tool_cutterhandle_model_ids:
self.handle_code = None
for val in self.mrs_cutting_tool_cutterhandle_model_ids:
if val:
self.handle_code = val.code
self.handle_name = val.name
self.sf_tool_brand_id_5 = val.mrs_machine_brand_id.id
@api.depends('mrs_cutting_tool_cutterhead_model_ids')
def _compute_mrs_cutting_tool_cutterhead_model_ids(self):
if not self.mrs_cutting_tool_cutterhead_model_ids:
self.chuck_code = None
for val in self.mrs_cutting_tool_cutterhead_model_ids:
if val:
self.chuck_code = val.code
self.chuck_name = val.name
self.sf_tool_brand_id_6 = val.mrs_machine_brand_id.id
def functional_tool_assembly(self):
"""
功能刀具组装
@@ -212,11 +295,13 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
'tool_loading_person': self.env.user.name,
'tool_loading_time': fields.Datetime.now()
}
self.env['sf.functional.tool.assembly'].search([
functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([
('machine_tool_name_id', '=', self.machine_tool_name_id.id),
('cutter_spacing_code', '=', self.cutter_spacing_code),
('assemble_status', '=', '0'),
]).write(desc_1)
])
print('功能刀具组装id：',functional_tool_assembly.id)
# 封装功能刀具数据
desc_2 = {
@@ -242,8 +327,19 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
'image': None,
}
if self.new_former == '0':
# 如果是新刀，则创建功能刀具列表、
self.env['sf.functional.cutting.tool.entity'].create(desc_2)
# 如果是新刀，则创建功能刀具列表、功能刀具预警、功能刀具实时分布
record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2)
self.env['sf.functional.tool.warning'].create({
'functional_cutting_tool_id': record_1.id,
'functional_tool_assembly_id': functional_tool_assembly.id,
'machine_table_name_id': self.machine_tool_name_id.id,
})
self.env['sf.real.time.distribution.of.functional.tools'].create({
'functional_cutting_tool_id': record_1.id
})
self.env['sf.inbound.and.outbound.records.of.functional.tools'].create({
'functional_cutting_tool_id': record_1.id
})
else:
record = self.env['sf.functional.cutting.tool.entity'].search([('code', '=', self.code)])
# 创建功能刀具缓存信息
@@ -274,11 +370,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
self.env['sf.functional.cutting.tool.entity'].search([('code', '=', self.code)]).unlink()
# 创建功能刀具列表信息
self.env['sf.functional.cutting.tool.entity'].search([('code', '=', self.code)]).create(desc_2)
# # 创建功能刀具预警、实时分布、出入库记录的新记录
# self.env['sf.functional.tool.warning'].create(desc)
# self.env['sf.real.time.distribution.of.functional.tools'].create(desc)
# self.env['sf.inbound.and.outbound.records.of.functional.tools'].create(desc)
functional_tool_assembly.write(desc_1)
# 关闭弹出窗口
return {'type': 'ir.actions.act_window_close'}
@@ -326,6 +419,3 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
'receive_person': self.env.user.name,
'receive_time': fields.Datetime.now()
})

60
sf_tool_management/wizard/wizard_view.xml
View File

@@ -10,23 +10,26 @@
<group string="机床信息" col="3">
<group>
<field name="name"/>
<field name="functional_tool_code"/>
</group>
<group>
<field name="machine_tool_code"/>
<field name="functional_tool_name_id"/>
</group>
<group>
<field name="cutter_spacing_code"/>
<field name="functional_tool_type_id"/>
</group>
</group>
<group string="刀具信息">
<group string="功能刀具信息">
<group>
<field name="replacement_tool_name_id"/>
<field name="replacement_tool_code"/>
<field name="replacement_tool_type_id"/>
<field name="replacement_tool_coarse_middle_thin"/>
<field name="applicant"/>
</group>
<group>
<field name="replacement_tool_type_id"/>
<field name="replacement_tool_code"/>
<field name="used_tool_time"/>
<field name="new_former"/>
<field name="reason_for_applying"/>
@@ -68,13 +71,13 @@
<field name="machine_tool_code"/>
</group>
</group>
<group string="刀具信息">
<group string="功能刀具信息">
<group>
<field name="functional_tool_name_id" string="刀具名称"/>
<field name="functional_tool_type_id" string="刀具类型"/>
<field name="functional_tool_name_id" string="功能刀具名称"/>
<field name="functional_tool_type_id" string="功能刀具类型"/>
</group>
<group>
<field name="functional_tool_code" string="刀具编码"/>
<field name="functional_tool_code" string="功能刀具编码"/>
</group>
</group>
<group string="刀具转移">
@@ -188,29 +191,34 @@
<!-- </group>-->
<group string="组装物料信息">
<group>
<field name="integral_code"/>
<field name="mrs_cutting_tool_integral_model_ids" options="{'no_create': True, 'no_quick_create': True}"
widget="many2many_tags" placeholder="选择整体式刀具型号"/>
<field name="blade_code"/>
<field name="mrs_cutting_tool_blade_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="bar_code"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="pad_code"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="mrs_cutting_tool_integral_model_ids" string="整体式刀具型号"
options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible': [('mrs_cutting_tool_blade_model_ids', '!=', [])]}"/>
<field name="integral_code" attrs="{'invisible': [('mrs_cutting_tool_blade_model_ids', '!=', [])]}"/>
<field name="mrs_cutting_tool_blade_model_ids" string="刀片型号"
options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible': [('mrs_cutting_tool_integral_model_ids', '!=', [])]}"/>
<field name="blade_code" attrs="{'invisible': [('mrs_cutting_tool_integral_model_ids', '!=', [])]}"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" string="刀杆型号"
options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"
attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterpad_model_ids', '!=', [])]}"/>
<field name="bar_code" attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterpad_model_ids', '!=', [])]}"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" string="刀盘型号"
options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"
attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterbar_model_ids', '!=', [])]}"/>
<field name="pad_code" attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterbar_model_ids', '!=', [])]}"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" string="刀柄型号" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="handle_code"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" string="夹头型号" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="chuck_code"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
</group>
<group>
<field name="integral_name"/>
<field name="sf_tool_brand_id_1"/>
<field name="blade_name"/>
<field name="sf_tool_brand_id_2"/>
<field name="bar_name"/>
<field name="sf_tool_brand_id_3"/>
<field name="pad_name"/>
<field name="sf_tool_brand_id_4"/>
<field name="integral_name" attrs="{'invisible': [('mrs_cutting_tool_blade_model_ids', '!=', [])]}"/>
<field name="sf_tool_brand_id_1" attrs="{'invisible': [('mrs_cutting_tool_blade_model_ids', '!=', [])]}"/>
<field name="blade_name" attrs="{'invisible': [('mrs_cutting_tool_integral_model_ids', '!=', [])]}"/>
<field name="sf_tool_brand_id_2" attrs="{'invisible': [('mrs_cutting_tool_integral_model_ids', '!=', [])]}"/>
<field name="bar_name" attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterpad_model_ids', '!=', [])]}"/>
<field name="sf_tool_brand_id_3" attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterpad_model_ids', '!=', [])]}"/>
<field name="pad_name" attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterbar_model_ids', '!=', [])]}"/>
<field name="sf_tool_brand_id_4" attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterbar_model_ids', '!=', [])]}"/>
<field name="handle_name"/>
<field name="sf_tool_brand_id_5"/>
<field name="chuck_name"/>

38
sf_warehouse/models/model.py
View File

@@ -1,6 +1,8 @@
# -*- coding: utf-8 -*-
from odoo import fields, models, api
from odoo.exceptions import ValidationError, UserError
import logging
from odoo import SUPERUSER_ID, _, api, fields, models
from odoo.osv import expression
class SfLocation(models.Model):
@@ -204,3 +206,35 @@ class SfLocation(models.Model):
# # 这里是你生成barcode的代码
# area_type_barcode = self.location_id.barcode
# return area_type_barcode + self.channel + self.direction + '-' + self.barcode + '-' + str(i + 1) + '-' + str(j + 1)
class SfProcurementGroup(models.Model):
_inherit = 'procurement.group'
@api.model
def _search_rule(self, route_ids, packaging_id, product_id, warehouse_id, domain):
"""
修改路线多规则条件选取
"""
if warehouse_id:
domain = expression.AND([['|', ('warehouse_id', '=', warehouse_id.id), ('warehouse_id', '=', False)], domain])
Rule = self.env['stock.rule']
res = self.env['stock.rule']
if route_ids:
res = Rule.search(expression.AND([[('route_id', 'in', route_ids.ids)], domain]), order='route_sequence, sequence', limit=1)
if not res and packaging_id:
packaging_routes = packaging_id.route_ids
if packaging_routes:
res = Rule.search(expression.AND([[('route_id', 'in', packaging_routes.ids)], domain]), order='route_sequence, sequence', limit=1)
if not res:
product_routes = product_id.route_ids | product_id.categ_id.total_route_ids
if product_routes:
res = Rule.search(expression.AND([[('route_id', 'in', product_routes.ids)], domain]), order='route_sequence, sequence', limit=1)
if not res and warehouse_id:
warehouse_routes = warehouse_id.route_ids
if warehouse_routes:
res_list = Rule.search(expression.AND([[('route_id', 'in', warehouse_routes.ids)], domain]), order='route_sequence, sequence')
for res1 in res_list:
if product_id.categ_id in res1.location_dest_id.product_type:
res = res1
return res