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-02-29 14:42:10 +08:00
parent ec5297937d
commit abdc522f9f
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sf_dlm/data/product_data.xml
View File

@@ -35,14 +35,14 @@
<field name="type">功能刀具</field> <field name="type">功能刀具</field>
</record> </record>
<!-- <record id="res_partner_bfm" model="res.partner">--> <record id="res_partner_bfm" model="res.partner">
<!-- <field name="name">业务平台</field>--> <field name="name">业务平台</field>
<!-- &lt;!&ndash; <field name="company_id" ref="base.main_company"/>&ndash;&gt;--> <!-- <field name="company_id" ref="base.main_company"/>-->
<!-- </record>--> </record>
<!-- <record id="res_users_bfm" model="res.users">--> <!-- <record id="res_users_bfm" model="res.users">-->
<!-- <field name="name">业务平台</field>--> <!-- <field name="name">业务平台</field>-->
<!-- <field name="partner_id" ref="res_partner_bfm"/>--> <!--&lt;!&ndash; <field name="partner_id" ref="res_partner_bfm"/>&ndash;&gt;-->
<!-- </record>--> <!-- </record>-->
<record id="product_functional_tool_sf" model="product.product"> <record id="product_functional_tool_sf" model="product.product">

3
sf_manufacturing/models/mrp_workorder.py
View File

@@ -655,7 +655,8 @@ class ResMrpWorkOrder(models.Model):
reportPath = reportPath[1:] reportPath = reportPath[1:]
serverdir = os.path.join('/tmp', reportPath) serverdir = os.path.join('/tmp', reportPath)
logging.info('get_detection_file-serverdir:%s' % serverdir) logging.info('get_detection_file-serverdir:%s' % serverdir)
for root, dirs, files in os.walk(serverdir): serverdir_prefix = os.path.dirname(serverdir)
for root, dirs, files in os.walk(serverdir_prefix):
for filename in files: for filename in files:
if filename == os.path.basename(reportPath): if filename == os.path.basename(reportPath):
report_file_path = os.path.join(root, filename) report_file_path = os.path.join(root, filename)

2
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -434,7 +434,7 @@
<field name="results" invisible="1"/> <field name="results" invisible="1"/>
<page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'> <page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
<group> <group>
<field name="test_result" widget="selection" attrs='{"invisible":[("results","!=",False)]}'/> <field name="test_result" readonly="1" attrs='{"invisible":[("results","!=",False)]}'/>
<field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/> <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>
<field name="detection_report" attrs='{"invisible":[("results","!=",False)]}' <field name="detection_report" attrs='{"invisible":[("results","!=",False)]}'
widget="pdf_viewer"/> widget="pdf_viewer"/>

1
sf_sale/models/sale_order.py
View File

@@ -78,7 +78,6 @@ class ReSaleOrder(models.Model):
return customer return customer
else: else:
partner = self.env['res.partner'].create({'name': '业务平台'}) partner = self.env['res.partner'].create({'name': '业务平台'})
self.env['res.users'].create({'name': '业务平台', 'partner_id': partner.id})
return partner return partner
# 业务平台分配工厂时在创建完产品后再创建销售明细信息 # 业务平台分配工厂时在创建完产品后再创建销售明细信息