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

还原代码

Browse Source
This commit is contained in:
jinling.yang
2024-10-15 09:06:13 +08:00
parent 2a067778bc
commit 8f2d5129b1
6 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_manufacturing/models/product_template.py
View File

@@ -9,8 +9,8 @@ from odoo.exceptions import ValidationError, UserError
from odoo.modules import get_resource_path
# from OCC.Extend.DataExchange import read_step_file
# from OCC.Extend.DataExchange import write_stl_file
from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file
class ResProductMo(models.Model):

2
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -229,7 +229,7 @@
decoration-danger="tag_type == '重新加工'"/>
<field name="rfid_code" force_save="1" readonly="0" cache="True"
attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
<field name="rfid_code_old" readonly="0" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
<field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
</xpath>
<xpath expr="//label[1]" position="attributes">

78
sf_message/data/template_data.xml
View File

@@ -186,47 +186,47 @@
<!-- <record id="template_transfer_inventory_remind" model="jikimo.message.template">-->
<!-- <field name="menu_id" ref="stock.menu_stock_root"/>-->
<!-- <field name="action_id" ref="stock.action_picking_tree_ready"/>-->
<!-- <field name="name">调拨入库</field>-->
<!-- <field name="model_id" ref="stock.model_stock_picking"/>-->
<!-- <field name="model">stock.picking</field>-->
<!-- <field name="bussiness_node_id" ref="transfer_inventory"/>-->
<!-- <field name="msgtype">markdown</field>-->
<!-- <field name="urgency">normal</field>-->
<!-- <field name="content">### 调拨入库通知：-->
<!--单号：调拨入库单[{{name}}]({{request_url}})-->
<!--事项：完成刀具物料上架入库</field>-->
<!-- </record>-->
<record id="template_transfer_inventory_remind" model="jikimo.message.template">
<field name="menu_id" ref="stock.menu_stock_root"/>
<field name="action_id" ref="stock.action_picking_tree_ready"/>
<field name="name">调拨入库</field>
<field name="model_id" ref="stock.model_stock_picking"/>
<field name="model">stock.picking</field>
<field name="bussiness_node_id" ref="transfer_inventory"/>
<field name="msgtype">markdown</field>
<field name="urgency">normal</field>
<field name="content">### 调拨入库通知：
单号：调拨入库单[{{name}}]({{request_url}})
事项：完成刀具物料上架入库</field>
</record>
<!-- <record id="template_tool_expired_remind" model="jikimo.message.template">-->
<!-- <field name="menu_id" ref="mrp.menu_mrp_root"/>-->
<!-- <field name="action_id" ref="sf_tool_management.sf_functional_tool_dismantle_view_act"/>-->
<!-- <field name="name">功能刀具寿命到期</field>-->
<!-- <field name="model_id" ref="sf_tool_management.model_sf_functional_tool_dismantle"/>-->
<!-- <field name="model">sf.functional.tool.dismantle</field>-->
<!-- <field name="bussiness_node_id" ref="tool_dismantle"/>-->
<!-- <field name="msgtype">markdown</field>-->
<!-- <field name="urgency">normal</field>-->
<!-- <field name="content">### 功能刀具寿命到期提醒：-->
<!--单号：拆解单[{{code}}]({{request_url}})-->
<!--事项：{{functional_tool_id.tool_name_id.name}}寿命已到期，需拆解</field>-->
<!-- </record>-->
<record id="template_tool_expired_remind" model="jikimo.message.template">
<field name="menu_id" ref="mrp.menu_mrp_root"/>
<field name="action_id" ref="sf_tool_management.sf_functional_tool_dismantle_view_act"/>
<field name="name">功能刀具寿命到期</field>
<field name="model_id" ref="sf_tool_management.model_sf_functional_tool_dismantle"/>
<field name="model">sf.functional.tool.dismantle</field>
<field name="bussiness_node_id" ref="tool_dismantle"/>
<field name="msgtype">markdown</field>
<field name="urgency">normal</field>
<field name="content">### 功能刀具寿命到期提醒：
单号：拆解单[{{code}}]({{request_url}})
事项：{{functional_tool_id.tool_name_id.name}}寿命已到期，需拆解</field>
</record>
<!-- <record id="template_tool_assembly_remind" model="jikimo.message.template">-->
<!-- <field name="menu_id" ref="mrp.menu_mrp_root"/>-->
<!-- <field name="action_id" ref="sf_tool_management.sf_functional_tool_assembly_view_act"/>-->
<!-- <field name="name">功能刀具组装</field>-->
<!-- <field name="model_id" ref="sf_tool_management.model_sf_functional_tool_assembly"/>-->
<!-- <field name="model">sf.functional.tool.assembly</field>-->
<!-- <field name="bussiness_node_id" ref="tool_assembly"/>-->
<!-- <field name="msgtype">markdown</field>-->
<!-- <field name="urgency">normal</field>-->
<!-- <field name="content">### 功能刀具组装通知：-->
<!--单号：组装任务单[{{name}}]({{request_url}})-->
<!--事项：{{use_tool_time}}前完成组装</field>-->
<!-- </record>-->
<record id="template_tool_assembly_remind" model="jikimo.message.template">
<field name="menu_id" ref="mrp.menu_mrp_root"/>
<field name="action_id" ref="sf_tool_management.sf_functional_tool_assembly_view_act"/>
<field name="name">功能刀具组装</field>
<field name="model_id" ref="sf_tool_management.model_sf_functional_tool_assembly"/>
<field name="model">sf.functional.tool.assembly</field>
<field name="bussiness_node_id" ref="tool_assembly"/>
<field name="msgtype">markdown</field>
<field name="urgency">normal</field>
<field name="content">### 功能刀具组装通知：
单号：组装任务单[{{name}}]({{request_url}})
事项：{{use_tool_time}}前完成组装</field>
</record>
<record id="template_quality_cnc_test" model="jikimo.message.template">
<field name="name">待质量判定</field>

2
sf_message/models/sf_message_workorder.py
View File

@@ -151,5 +151,5 @@ class SFMessageWork(models.Model):
def _recover_time_warning_func(self):
workorder_done = self.env['mrp.workorder'].search([("state", "=", "done")])
workorder_overdue = workorder_done.filtered(lambda x: x.delivery_warning == 'overdue')
workorder_overdue = workorder_done.filtered(lambda x: x.delivery_warning in ['overdue', 'warning'])
workorder_overdue.write({'delivery_warning': 'normal'})

4
sf_sale/models/quick_easy_order.py
View File

@@ -8,8 +8,8 @@ from datetime import datetime
import requests
from odoo import http
from odoo.http import request
# from OCC.Extend.DataExchange import read_step_file
# from OCC.Extend.DataExchange import write_stl_file
from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file
from odoo import models, fields, api
from odoo.modules import get_resource_path
from odoo.exceptions import ValidationError, UserError

4
sf_sale/models/quick_easy_order_old.py
View File

@@ -6,8 +6,8 @@ import os
from datetime import datetime
from stl import mesh
# from OCC.Core.GProp import GProp_GProps
# from OCC.Extend.DataExchange import read_step_file
# from OCC.Extend.DataExchange import write_stl_file
from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file
from odoo.addons.sf_base.commons.common import Common
from odoo import models, fields, api
from odoo.modules import get_resource_path