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

智能工厂去掉工厂token等信息

Browse Source
This commit is contained in:
jinling.yang
2022-10-14 16:36:45 +08:00
parent 8611e138b3
commit b4aa6b61ed
8 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_base/__manifest__.py
View File

@@ -10,7 +10,7 @@
""",
'category': 'YZ',
'website': 'https://www.sf.jikimo.com',
'depends': ['account', 'base', 'mrp', 'sf_bpm_api'],
'depends': ['account', 'base', 'mrp'],
'data': [
'security/group_security.xml',
'security/ir.model.access.csv',

14
sf_base/views/menu_view.xml
View File

@@ -133,13 +133,13 @@
sequence="1"
action="action_mrs_machine_control_system"/>
<menuitem
id="menu_sf_partner_views"
name="工厂token"
parent="menu_mrs_base"
sequence="1"
action="token_factory_view"
/>
<!-- <menuitem-->
<!-- id="menu_sf_partner_views"-->
<!-- name="工厂token"-->
<!-- parent="menu_mrs_base"-->
<!-- sequence="1"-->
<!-- action="token_factory_view"-->
<!-- />-->
</data>

59
sf_base/views/mrs_common_view.xml
View File

@@ -313,38 +313,37 @@
<!-- </search>-->
<!-- </field>-->
<!-- </record>-->
<record id="token_factory_view" model="ir.actions.act_window">
<field name="name">合作伙伴</field>
<field name="type">ir.actions.act_window</field>
<field name="domain">[('sf_token', '!=', False),('sf_secret_key', '!=', False)]</field>
<field name="res_model">res.partner</field>
<field name="view_mode">tree,form</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
加工工厂！
</p>
</field>
</record>
<!-- <record id="token_factory_view" model="ir.actions.act_window">-->
<!-- <field name="name">合作伙伴</field>-->
<!-- <field name="type">ir.actions.act_window</field>-->
<!-- <field name="domain">[('sf_token', '!=', False),('sf_secret_key', '!=', False)]</field>-->
<!-- <field name="res_model">res.partner</field>-->
<!-- <field name="view_mode">tree,form</field>-->
<!-- <field name="help" type="html">-->
<!-- <p class="o_view_nocontent_smiling_face">-->
<!-- 加工工厂！-->
<!-- </p>-->
<!-- </field>-->
<!-- </record>-->
<record id="mrs_view_partner_form" model="ir.ui.view">
<field name="name">view_partner_form</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<!-- <record id="mrs_view_partner_form" model="ir.ui.view">-->
<!-- <field name="name">view_partner_form</field>-->
<!-- <field name="model">res.partner</field>-->
<!-- <field name="inherit_id" ref="base.view_partner_form"/>-->
<!-- <field name="arch" type="xml">-->
<!-- <field name="name" position="after" invisible="1">-->
<!-- <form>-->
<!-- <group>-->
<!-- <group>-->
<!-- <field name="sf_token" string='token' readonly="1"/>-->
<!-- <field name="sf_secret_key" string='密钥' readonly="1"/>-->
<!-- </group>-->
<!-- </group>-->
<!-- </form>-->
<!-- </field>-->
<field name="name" position="after" invisible="1">
<form>
<group>
<group>
<field name="sf_token" string='token' readonly="1"/>
<field name="sf_secret_key" string='密钥' readonly="1"/>
</group>
</group>
</form>
</field>
</field>
</record>
<!-- </field>-->
<!-- </record>-->
</data>
</odoo>

5
sf_bpm_api/__manifest__.py
View File

@@ -10,12 +10,11 @@
""",
'category': 'sf',
'website': 'https://www.sf.cs.jikimo.com',
'depends': ['sale', 'product'],
'depends': ['sale', 'sf_base'],
'data': [
'data/product_data.xml',
'views/product_template_view.xml',
'views/sale_order_view.xml',
'views/sale_order_view.xml'
],
'demo': [
],

2
sf_bpm_api/data/product_data.xml
View File

@@ -2,7 +2,7 @@
<odoo>
<data>
<record id="product_template_sf" model="product.product">
<field name="name">CNC加工產品模板</field>
<field name="name">CNC加工产品模板</field>
<field name="categ_id" ref="product.product_category_5"/>
<field name="invoice_policy">delivery</field>
<field name="detailed_type">product</field>

2
sf_bpm_api/models/product_template.py
View File

@@ -23,7 +23,7 @@ class ResProductTemplate(models.Model):
'model_height': item['model_height'],
'model_volume': item['model_volume'],
'list_price': item['price'],
'materials_id': self.env['mrs.production.materials'].sudo().search(
'materials_id': self.env['mrs.production.materials'].search(
[('materials_no', '=', item['texture_code'])]).id,
'default_code': '%s-%s' % (order_number, i),
'barcode': item['barcode'],

5
sf_bpm_api/models/sale_order.py
View File

@@ -8,8 +8,6 @@ class ReSaleOrder(models.Model):
deadline_of_delivery = fields.Date('交货截止日期')
# product_line_ids = fields.One2many('product.template', 'sale_order_id')
# 业务平台分配工厂后在智能工厂先创建销售订单
def sale_order_create(self, deadline_of_delivery, company_id):
now_time = datetime.datetime.now()
@@ -29,8 +27,7 @@ class ReSaleOrder(models.Model):
vals = {
'order_id': self.id,
'product_id': product.id,
'name': '%s/%s/%s/%s/%s' % (
item['model_long'], item['model_width'], item['model_height'], item['model_volume'], product.materials_id.name),
'name': '%s/%s/%s/%s/%s' % (item['model_long'], item['model_width'], item['model_height'], item['model_volume'], product.materials_id.name),
'price_unit': item['price'],
'product_uom_qty': item['number']
}

2
sf_bpm_api/views/product_template_view.xml
View File

@@ -17,7 +17,7 @@
</group>
<group>
<field name="model_precision"/>
<field name="materials_id"/>
<field name="materials_id" />
</group>
</group>
</page>