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

Accept Merge Request #210: (feature/sf刀具功能分支 -> develop)

Browse Source 
Merge Request: 新增批量出库功能（功能已完成，按键未增加），新增自动组装方法（todo），新增出库按键弹窗样式修改


Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/210?initial=true
This commit is contained in:
禹翔辉
2023-06-29 09:37:09 +08:00
parent 05e69d21fa ec95e09553
commit 79dfa10d4e
6 changed files with 114 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sf_tool_management/views/tool_base_views.xml
View File

@@ -417,31 +417,20 @@
class="btn-primary"/>
<button string="组装" name="" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"/>
<button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"/>
<button string="取消组装" name="" attrs="{'invisible': [('assemble_status', '!=', '0')]}" class="btn-primary"/>
<button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="取消组装" name="" attrs="{'invisible': [('assemble_status', '=', '1')]}" class="btn-primary"/>
<button string="自动打印二维码" name="" class="btn-primary"/>
<button string="自动打印二维码" name="automatic_printing_of_QR_code" type="object" class="btn-primary"/>
<button string="出库"
name="%(sf_tool_management.sf_delivery_of_cargo_from_storager_act)d"
type="action"
context="{
'default_functional_tool_code': functional_tool_code,
'default_machine_tool_name': machine_tool_name,
'default_functional_tool_type': functional_tool_type,
'default_production_line_name': production_line_name,
'default_machine_tool_code': machine_tool_code,
'default_receive_person': receive_person,
'default_receive_time': receive_time
}"
attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="出库" name="" attrs="{'invisible': [('assemble_status', '=', '1')]}" class="btn-primary"/>
<button string="组装单打印" name="" class="btn-primary"/>
<button string="组装单打印" name="assemble_single_print" type="object" class="btn-primary"/>
<field name="check_box"/>
<field name="assemble_status"/>
<field name="use_tool_time"/>
<field name="use_tool_time" />
<field name="production_line_name"/>
<field name="machine_tool_name"/>
<field name="machine_tool_code"/>