jikimo/jikimo_sf
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-11-01 17:46:24 +08:00
parent 108cb96ca5 03efa01a85
commit 0b7dc6d09a
23 changed files with 665 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sf_manufacturing/data/stock_data.xml
View File

@@ -22,6 +22,24 @@
<field name="company_id" ref="base.main_company"/>
</record>
<record id="stock_location_locations_virtual_after_assembly" model="stock.location">
<field name="name">组装后</field>
<field name="location_id" ref="stock.stock_location_locations_virtual"/>
<field name="usage">internal</field>
<field name="barcode">DJ-ZZ</field>
<field name="active">true</field>
<field name="company_id" ref="base.main_company"/>
</record>
<!-- <record id="stock_location_locations_WH_tool_stock_area" model="stock.location">-->
<!-- <field name="name">刀具存货区</field>-->
<!-- <field name="location_id" ref="stock.stock_location_locations_virtual"/>-->
<!-- <field name="usage">internal</field>-->
<!-- <field name="barcode">WH-DJCHQ</field>-->
<!-- <field name="active">true</field>-->
<!-- <field name="company_id" ref="base.main_company"/>-->
<!-- </record>-->
<record id="outcontract_picking_in" model="stock.picking.type">
<field name="name">外协入库</field>
<field name="code">internal</field>
@@ -46,6 +64,16 @@
<field name="default_location_dest_id" ref="stock_location_locations_virtual_outcontract"/>
</record>
<record id="after_assembly_picking_in" model="stock.picking.type">
<field name="name">刀具组装入库</field>
<field name="code">internal</field>
<field name="active">true</field>
<field name="company_id" ref="base.main_company"/>
<field name="sequence_code">ZR</field>
<field name="default_location_src_id" ref="stock_location_locations_virtual_after_assembly"/>
<field name="default_location_dest_id"
search="[('barcode','=','WH-PREPRODUCTION')]"/>
</record>
</data>
</odoo>

2
sf_manufacturing/models/model_type.py
View File

@@ -6,7 +6,7 @@ class ResProductCategory(models.Model):
type = fields.Selection(
[("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺"), ("刀具", "刀具"),
("夹具", "夹具")],
("夹具", "夹具"), ("功能刀具", "功能刀具")],
default="", string="类型")