jikimo/jikimo_sf
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-16 17:59:34 +08:00
parent 4adc3b700a
commit 9cd8d9d823
5 changed files with 16 additions and 14 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 odoo.modules import get_resource_path
from OCC.Extend.DataExchange import read_step_file # from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file # from OCC.Extend.DataExchange import write_stl_file
class ResProductMo(models.Model): class ResProductMo(models.Model):

6
sf_quality/models/quality_cnc_test.py
View File

@@ -30,11 +30,11 @@ class SfQualityCncTest(models.Model):
[("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"), ("operate computer", "操机"), [("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"), ("operate computer", "操机"),
("technology", "工艺"), ("customer redrawing", "客户改图")], string="原因") ("technology", "工艺"), ("customer redrawing", "客户改图")], string="原因")
detailed_reason = fields.Text('详细原因') detailed_reason = fields.Text('详细原因')
machining_drawings = fields.Binary(related='workorder_id.machining_drawings', string='2D加工图纸', readonly=True) # machining_drawings = fields.Binary(related='workorder_id.machining_drawings', string='2D加工图纸', readonly=True)
quality_standard = fields.Binary(related='workorder_id.quality_standard', string='质检标准', readonly=True) # quality_standard = fields.Binary(related='workorder_id.quality_standard', string='质检标准', readonly=True)
def submit_pass(self): def submit_pass(self):
self.write({'result': 'pass', 'test_results': self.test_results, 'state': 'done'}) self.write({'result': 'pass', 'test_results': '合格', 'state': 'done'})
self.workorder_id.write({'test_results': self.test_results}) self.workorder_id.write({'test_results': self.test_results})
self.workorder_id.button_finish() self.workorder_id.button_finish()

12
sf_quality/views/quality_cnc_test_view.xml
View File

@@ -5,7 +5,7 @@
<field name="name">加工质检单编码规则</field> <field name="name">加工质检单编码规则</field>
<field name="code">quality.cnc.test</field> <field name="code">quality.cnc.test</field>
<field name="prefix">QCT</field> <field name="prefix">QCT</field>
<field name="padding">4</field> <field name="padding">5</field>
<field name="company_id" eval="False"/> <field name="company_id" eval="False"/>
</record> </record>
@@ -98,15 +98,17 @@
<page string="判定结果"> <page string="判定结果">
<group> <group>
<field name="test_results" attrs="{'readonly': [('state','=', 'done')]}"/> <field name="test_results" attrs="{'readonly': [('state','=', 'done')]}"/>
<field name="reason" attrs="{'readonly': [('state','=', 'done')]}"/> <field name="reason"
<field name="detailed_reason" attrs="{'readonly': [('state','=', 'done')]}"/> attrs="{'readonly': [('state','=', 'done')],'required': [('test_results','in', ['返工','报废'])]}"/>
<field name="detailed_reason"
attrs="{'readonly': [('state','=', 'done')],'required': [('reason','!=', False)]}"/>
</group> </group>
</page> </page>
<page string="2D图纸"> <page string="2D图纸">
<field name="machining_drawings" string="" widget="pdf_viewer"/> <!-- <field name="machining_drawings" string="" widget="pdf_viewer"/>-->
</page> </page>
<page string="客户质量标准"> <page string="客户质量标准">
<field name="quality_standard" string=""/> <!-- <field name="quality_standard" string=""/>-->
</page> </page>
<page string="其他" attrs="{'readonly': [('state','=', 'done')]}"> <page string="其他" attrs="{'readonly': [('state','=', 'done')]}">
<group> <group>

4
sf_sale/models/quick_easy_order.py
View File

@@ -8,8 +8,8 @@ from datetime import datetime
import requests import requests
from odoo import http from odoo import http
from odoo.http import request from odoo.http import request
from OCC.Extend.DataExchange import read_step_file # from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file # from OCC.Extend.DataExchange import write_stl_file
from odoo import models, fields, api from odoo import models, fields, api
from odoo.modules import get_resource_path from odoo.modules import get_resource_path
from odoo.exceptions import ValidationError, UserError 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 datetime import datetime
from stl import mesh from stl import mesh
# from OCC.Core.GProp import GProp_GProps # from OCC.Core.GProp import GProp_GProps
from OCC.Extend.DataExchange import read_step_file # from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file # from OCC.Extend.DataExchange import write_stl_file
from odoo.addons.sf_base.commons.common import Common from odoo.addons.sf_base.commons.common import Common
from odoo import models, fields, api from odoo import models, fields, api
from odoo.modules import get_resource_path from odoo.modules import get_resource_path