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/刀具产品调取Cloud刀具标准库（10.11）

Browse Source
This commit is contained in:
jinling.yang
2023-10-25 15:07:52 +08:00
parent 39f97131a2 802bd4285c
commit 65dd8372dd
8 changed files with 69 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jikimo_frontend/static/src/scss/custom_style.scss
View File

@@ -317,10 +317,10 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
.o_horizontal_separator { .o_horizontal_separator {
font-size: 1.5rem; font-size: 1.5rem;
} }
//
.o_field_widget input[class='o_input'] { //.o_field_widget input[class='o_input'] {
text-align: center //text-align: center
} //}
div:has(.o_required_modifier) > label::before { div:has(.o_required_modifier) > label::before {
position: absolute; position: absolute;

15
sf_dlm/views/product_template_view.xml
View File

@@ -399,11 +399,10 @@
</group> </group>
</page> </page>
<page string="夹具物料参数" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"> <page string="夹具物料参数" attrs="{'invisible': [('categ_type', '!=', '夹具')]}">
<group attrs='{"invisible": [("fixture_material_type","not in",("气动夹具","转接板(锁板)夹具","磁吸夹具","虎钳夹具","零点卡盘"))]}'> <group attrs='{"invisible": [("fixture_material_type","not in",("气动夹具","转接板(锁板)夹具","磁吸夹具","虎钳夹具","零点卡盘","零点托盘"))]}'>
<group> <group>
<field name="brand_id"/> <field name="brand_id"/>
<field name="fixture_multi_mounting_type_id" options="{'no_create': True}" <field name="fixture_multi_mounting_type_id" options="{'no_create': True}"/>
attrs="{'required': [('categ_type', '=', '夹具')]}"/>
<label for="tool_length" string="尺寸(mm)"/> <label for="tool_length" string="尺寸(mm)"/>
<div class="o_address_format"> <div class="o_address_format">
<label for="tool_length" string="长"/> <label for="tool_length" string="长"/>
@@ -420,9 +419,9 @@
</div> </div>
<field name="tool_weight"></field> <field name="tool_weight"></field>
<label for="fixture_clamp_workpiece_length_max" string="夹持工件最大尺寸(mm)" <label for="fixture_clamp_workpiece_length_max" string="夹持工件最大尺寸(mm)"
attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'/> attrs='{"invisible": [("fixture_material_type","in",("零点卡盘","零点托盘"))]}'/>
<div class="o_address_format" <div class="o_address_format"
attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'> attrs='{"invisible": [("fixture_material_type","in",("零点卡盘","零点托盘"))]}'>
<label for="fixture_clamp_workpiece_length_max" string="长"/> <label for="fixture_clamp_workpiece_length_max" string="长"/>
<field name="fixture_clamp_workpiece_length_max" class="o_address_zip" <field name="fixture_clamp_workpiece_length_max" class="o_address_zip"
options="{'format': false}" options="{'format': false}"
@@ -439,7 +438,7 @@
attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/> attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/>
</div> </div>
<field name="fixture_clamp_workpiece_diameter_max" <field name="fixture_clamp_workpiece_diameter_max"
attrs="{'invisible': [('fixture_material_type','=','零点卡盘')],'required': [('fixture_material_type', 'in',('气动夹具','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/> attrs="{'invisible': [('fixture_material_type','in',('零点卡盘','零点托盘'))],'required': [('fixture_material_type', 'in',('气动夹具','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/>
<field name="fixture_maximum_carrying_weight"></field> <field name="fixture_maximum_carrying_weight"></field>
<field name="fixture_maximum_clamping_force"></field> <field name="fixture_maximum_clamping_force"></field>
</group> </group>
@@ -454,10 +453,10 @@
<field name="fixture_screw_size" <field name="fixture_screw_size"
attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)夹具"))]}'/> attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)夹具"))]}'/>
<field name="fixture_driving_way" <field name="fixture_driving_way"
attrs='{"invisible": [("fixture_material_type","not in",("虎钳夹具","零点卡盘"))]}'/> attrs='{"invisible": [("fixture_material_type","not in",("虎钳夹具","零点卡盘","零点托盘"))]}'/>
<field name="fixture_apply_machine_tool_type_ids" options="{'no_create': True}" <field name="fixture_apply_machine_tool_type_ids" options="{'no_create': True}"
widget="many2many_tags" widget="many2many_tags"
attrs='{"invisible": [("fixture_material_type","!=",("零点卡盘"))]}'/> attrs='{"invisible": [("fixture_material_type","not in",("零点卡盘","零点托盘"))]}'/>
</group> </group>
</group> </group>

10
sf_maintenance/views/maintenance_logs_views.xml
View File

@@ -9,16 +9,16 @@
<tree> <tree>
<field name="code"/> <field name="code"/>
<field name="name"/> <field name="name"/>
<field name="type"/> <field name="type" optional="hide"/>
<field name="brand"/> <field name="brand"/>
<field name="maintenance_equipment_id"/> <field name="maintenance_equipment_id"/>
<field name="code_location"/> <field name="code_location" optional="hide"/>
<field name="fault_type"/> <field name="fault_type"/>
<field name="fault_code"/> <field name="fault_code" optional="hide"/>
<field name="fault_alarm_info"/> <field name="fault_alarm_info"/>
<field name="alarm_level"/> <field name="alarm_level" optional="hide"/>
<field name="alarm_time"/> <field name="alarm_time"/>
<field name="alarm_way"/> <field name="alarm_way" optional="hide"/>
<field name="fault_process"/> <field name="fault_process"/>
<field name="operator"/> <field name="operator"/>
<field name="recovery_time"/> <field name="recovery_time"/>

2
sf_manufacturing/views/production_line_view.xml
View File

@@ -101,7 +101,7 @@
<field name="inherit_id" ref="sf_maintenance.view_maintenance_logs_tree"/> <field name="inherit_id" ref="sf_maintenance.view_maintenance_logs_tree"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='code']" position="after"> <xpath expr="//field[@name='code']" position="after">
<field name="production_line_id"/> <field name="production_line_id" optional="hide"/>
</xpath> </xpath>
</field> </field>
</record> </record>

23
sf_manufacturing/views/sf_maintenance_equipment.xml
View File

@@ -1,27 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<!-- 设备新增生产线-->
<record id="sf_hr_equipment_view_form_manufacturing" model="ir.ui.view">
<field name="name">sf_equipment.form</field>
<field name="model">maintenance.equipment</field>
<field name="inherit_id" ref="sf_maintenance.sf_hr_equipment_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='brand_id']" position="after">
<field name="production_line_id"/>
</xpath>
</field>
</record>
<!-- 故障日志增加产线对象-->
<record id="sf_view_maintenance_logs_tree" model="ir.ui.view">
<field name="name">sf.maintenance.logs.tree</field>
<field name="model">sf.maintenance.logs</field>
<field name="inherit_id" ref="sf_maintenance.view_maintenance_logs_tree"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='code']" position="after">
<field name="production_line_id"/>
</xpath>
</field>
</record>
<!-- 设备增加刀具库位table--> <!-- 设备增加刀具库位table-->
<record id="sf_manufacturing_hr_equipment_view_form" model="ir.ui.view"> <record id="sf_manufacturing_hr_equipment_view_form" model="ir.ui.view">
<field name="name">sf_manufacturing_equipment.form</field> <field name="name">sf_manufacturing_equipment.form</field>

5
sf_sale/models/quick_easy_order.py
View File

@@ -183,7 +183,7 @@ class QuickEasyOrder(models.Model):
company_id = self.env.ref('base.main_company').sudo() company_id = self.env.ref('base.main_company').sudo()
# user_id = request.env.ref('base.user_admin').sudo() # user_id = request.env.ref('base.user_admin').sudo()
order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX', order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX',
str(datetime.now())) str(datetime.now()), '现结', '支付宝')
i = 1 i = 1
# 给sale_order的default_code字段赋值 # 给sale_order的default_code字段赋值
aa = self.env['sale.order'].sudo().search([('name', '=', order_id.name)]) aa = self.env['sale.order'].sudo().search([('name', '=', order_id.name)])
@@ -243,8 +243,7 @@ class QuickEasyOrder(models.Model):
# self.cr.rollback() # self.cr.rollback()
return UserError('工厂创建销售订单和产品失败，请联系管理员') return UserError('工厂创建销售订单和产品失败，请联系管理员')
# 特征识别
# 特征识别
def feature_recognition(self, report_path, model_code): def feature_recognition(self, report_path, model_code):
feature_path = self.env['sf.auto_quatotion.common'].sudo().get_feature_full_path() feature_path = self.env['sf.auto_quatotion.common'].sudo().get_feature_full_path()
process_time_db_path = self.env['sf.auto_quatotion.common'].sudo().get_process_time_db_path() process_time_db_path = self.env['sf.auto_quatotion.common'].sudo().get_process_time_db_path()

2
sf_sale/models/sale_order.py
View File

@@ -1,6 +1,7 @@
from odoo import models, fields from odoo import models, fields
import datetime import datetime
import base64 import base64
import logging
class ReSaleOrder(models.Model): class ReSaleOrder(models.Model):
@@ -16,6 +17,7 @@ class ReSaleOrder(models.Model):
# 业务平台分配工厂后在智能工厂先创建销售订单 # 业务平台分配工厂后在智能工厂先创建销售订单
def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address, def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address,
deadline_of_delivery, payments_way, pay_way): deadline_of_delivery, payments_way, pay_way):
logging.info('---------sale_order_create------')
now_time = datetime.datetime.now() now_time = datetime.datetime.now()
partner = self.get_customer() partner = self.get_customer()
order_id = self.env['sale.order'].sudo().create({ order_id = self.env['sale.order'].sudo().create({

149
sf_tool_management/views/tool_base_views.xml
View File

@@ -1101,6 +1101,8 @@
<field name="functional_tool_diameter"/> <field name="functional_tool_diameter"/>
<field name="functional_tool_length"/> <field name="functional_tool_length"/>
<field name="functional_tool_cutting_type"/> <field name="functional_tool_cutting_type"/>
<!-- <field name="barcode"/>-->
<!-- <field name="barcode_image"/>-->
</group> </group>
</group> </group>
@@ -1125,78 +1127,58 @@
</group> </group>
<group> <group>
<group col="1"> <group col="1">
<group col="1" attrs="{'invisible': [('integral_code_id', '=', False)]}">
<div>
<separator string="整体式刀具:" style="font-size: 13px;"/>
</div>
<group>
<group>
<field name="integral_code_id" placeholder="请选择" string="序列号"
options="{'no_create': True, 'no_quick_create': True}"/>
</group>
</group>
<group col="3">
<group>
<field name="integral_name" string="名称"/>
</group>
<group>
<field name="cutting_tool_integral_model_id" string="型号"/>
</group>
<group>
<field name="sf_tool_brand_id_1" string="品牌"/>
</group>
</group>
</group>
</group>
</group>
<group>
<group col="1">
<group col="1" attrs="{'invisible': [('blade_code_id', '=', False)]}">
<div>
<separator string="刀片:" style="font-size: 13px;"/>
</div>
<group>
<group>
<field name="blade_code_id" placeholder="请选择" string="序列号"
options="{'no_create': True, 'no_quick_create': True}"/>
</group>
</group>
<group col="3">
<group>
<field name="blade_name" string="名称"/>
</group>
<group>
<field name="cutting_tool_blade_model_id" string="型号"/>
</group>
<group>
<field name="sf_tool_brand_id_2" string="品牌"/>
</group>
</group>
</group>
<group col="1"> <group col="1">
<div> <div>
<separator string="刀柄:" style="font-size: 13px;"/> <separator string="刀柄:" style="font-size: 13px;"/>
</div> </div>
<group> <group>
<group> <field name="handle_code_id" string="序列号" placeholder="请选择"
<field name="handle_code_id" string="序列号" placeholder="请选择" options="{'no_create': True, 'no_quick_create': True}"/>
options="{'no_create': True, 'no_quick_create': True}"/> <field name="handle_name" string="名称"/>
</group> <field name="cutting_tool_cutterhandle_model_id" string="型号"/>
<field name="sf_tool_brand_id_5" string="品牌"/>
</group> </group>
<group col="3"> </group>
<group> <group col="1" attrs="{'invisible': [('integral_code_id', '=', False)]}">
<field name="handle_name" string="名称"/> <div>
</group> <separator string="整体式刀具:" style="font-size: 13px;"/>
<group> </div>
<field name="cutting_tool_cutterhandle_model_id" string="型号"/> <group>
</group> <field name="integral_code_id" placeholder="请选择" string="序列号"
<group> options="{'no_create': True, 'no_quick_create': True}"/>
<field name="sf_tool_brand_id_5" string="品牌"/> <field name="integral_name" string="名称"/>
</group> <field name="cutting_tool_integral_model_id" string="型号"/>
<field name="sf_tool_brand_id_1" string="品牌"/>
</group>
</group>
<group col="1" attrs="{'invisible': [('blade_code_id', '=', False)]}">
<div>
<separator string="刀片:" style="font-size: 13px;"/>
</div>
<group>
<field name="blade_code_id" placeholder="请选择" string="序列号"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="blade_name" string="名称"/>
<field name="cutting_tool_blade_model_id" string="型号"/>
<field name="sf_tool_brand_id_2" string="品牌"/>
</group> </group>
</group> </group>
</group> </group>
<group col="1"> <group col="1">
<group col="1">
<div>
<separator string="夹头:" style="font-size: 13px;"/>
</div>
<group>
<group>
<field name="chuck_code_id" string="序列号" placeholder="请选择"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="chuck_name" string="名称"/>
<field name="cutting_tool_cutterhead_model_id" string="型号"/>
<field name="sf_tool_brand_id_6" string="品牌"/>
</group>
</group>
</group>
<group col="1" attrs="{'invisible': [('bar_code_id', '=', False)]}"> <group col="1" attrs="{'invisible': [('bar_code_id', '=', False)]}">
<div> <div>
<separator string="刀杆:" style="font-size: 13px;"/> <separator string="刀杆:" style="font-size: 13px;"/>
@@ -1205,17 +1187,9 @@
<group> <group>
<field name="bar_code_id" placeholder="请选择" string="序列号" <field name="bar_code_id" placeholder="请选择" string="序列号"
options="{'no_create': True, 'no_quick_create': True}"/> options="{'no_create': True, 'no_quick_create': True}"/>
</group>
</group>
<group col="3">
<group>
<field name="bar_name" string="名称"/> <field name="bar_name" string="名称"/>
</group>
<group>
<field name="cutting_tool_cutterbar_model_id" string="型号"/> <field name="cutting_tool_cutterbar_model_id" string="型号"/>
</group> <field name="sf_tool_brand_id_3" string="品牌"/>
<group>
<field name="sf_tool_brand_id_3" string="品牌"/>
</group> </group>
</group> </group>
</group> </group>
@@ -1227,43 +1201,14 @@
<group> <group>
<field name="pad_code_id" placeholder="请选择" string="序列号" <field name="pad_code_id" placeholder="请选择" string="序列号"
options="{'no_create': True, 'no_quick_create': True}"/> options="{'no_create': True, 'no_quick_create': True}"/>
</group>
</group>
<group col="3">
<group>
<field name="pad_name" string="名称"/> <field name="pad_name" string="名称"/>
</group>
<group>
<field name="cutting_tool_cutterpad_model_id" string="型号"/> <field name="cutting_tool_cutterpad_model_id" string="型号"/>
</group> <field name="sf_tool_brand_id_4" string="品牌"/>
<group>
<field name="sf_tool_brand_id_4" string="品牌"/>
</group>
</group>
</group>
<group col="1">
<div>
<separator string="夹头:" style="font-size: 13px;"/>
</div>
<group>
<group>
<field name="chuck_code_id" string="序列号" placeholder="请选择"
options="{'no_create': True, 'no_quick_create': True}"/>
</group>
</group>
<group col="3">
<group>
<field name="chuck_name" string="名称"/>
</group>
<group>
<field name="cutting_tool_cutterhead_model_id" string="型号"/>
</group>
<group>
<field name="sf_tool_brand_id_6" string="品牌"/>
</group> </group>
</group> </group>
</group> </group>
</group> </group>
<!-- <group>--> <!-- <group>-->
<!-- <field name="integral_code_id"/>--> <!-- <field name="integral_code_id"/>-->
<!-- <field name="cutting_tool_integral_model_id"/>--> <!-- <field name="cutting_tool_integral_model_id"/>-->