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

Merge branch 'feature/库存优化' into feature/刀具优化

Browse Source
This commit is contained in:
yuxianghui
2024-09-20 16:51:39 +08:00
parent 85fea64f49 4609ec442a
commit 4558fc0336
11 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sf_tool_management/views/stock.xml
View File

@@ -18,8 +18,7 @@
<field name="arch" type="xml">
<tree create="0" export_xlsx="0" delete="0">
<header>
<button string="确认" name="set_tool_material" type="object"
class="treeHeaderBtn"/>
<button string="确认" name="set_tool_material" type="object" class="treeHeaderBtn"/>
</header>
<field name="name"/>
<field name="cutting_tool_type_id"/>
@@ -62,6 +61,7 @@
<field name="brand_id"/>
<field name="shelf_location_id"/>
<field name="lot_id"/>
<field name="qty"/>
</tree>
</field>
</record>
@@ -86,6 +86,7 @@
<field name="brand_id"/>
<field name="shelf_location_id"/>
<field name="lot_id"/>
<field name="qty"/>
</tree>
</field>
</record>
@@ -111,6 +112,7 @@
<field name="brand_id"/>
<field name="shelf_location_id"/>
<field name="lot_id"/>
<field name="qty"/>
</tree>
</field>
</record>
@@ -135,6 +137,7 @@
<field name="brand_id"/>
<field name="shelf_location_id"/>
<field name="lot_id"/>
<field name="qty"/>
</tree>
</field>
</record>

4
sf_tool_management/views/tool_base_views.xml
View File

@@ -478,9 +478,9 @@
class="btn-primary"/>
<button string="确认组装" name="functional_tool_assembly" type="object"
attrs="{'invisible': [('assemble_status', 'not in', ['01'])]}"
class="btn-primary"/>
class="btn-primary jikimo_button_confirm"/>
<button name="get_tool_preset_parameter" string="获取测量值"
type="object" class="btn-primary"
type="object" class="btn-primary jikimo_button_flushed"
attrs="{'invisible': [('assemble_status', 'in', ['0','1','2'])]}"
/>
<field name="assemble_status" widget="statusbar" statusbar_visible="0,01,1"/>