jikimo/test
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/优化最新版返工

Browse Source 
# Conflicts:
#	sf_manufacturing/views/mrp_workorder_view.xml
This commit is contained in:
jinling.yang
2024-07-11 17:38:38 +08:00
parent 0fef714d61 6a2ff72dce
commit 7152b54017
173 changed files with 14467 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -160,9 +160,19 @@
<!-- attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked'),('state','=','done')]}"/> -->
<button name="button_workpiece_delivery" type="object" string="工件配送" class="btn-primary"
attrs="{'invisible': ['|','|',('routing_type','!=','装夹预调'),('is_delivery','=',True),('state','!=','done')]}"/>
<<<<<<< HEAD
<button name="button_rework_pre" type="object" string="返工"
class="btn-primary"
attrs="{'invisible': ['|','|',('routing_type','!=','装夹预调'),('state','!=','progress'),('is_rework','=',True)]}"/>
=======
<!-- <button name="button_send_program_again" type="object" string="重新下发NC程序" class="btn-primary"-->
<!-- confirm="是否确认重新下发NC程序？"-->
<!-- groups="sf_base.group_sf_order_user,sf_base.group_sf_equipment_user"-->
<!-- attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','in',['done', 'cancel',-->
<!-- 'progress']),('cnc_worksheet','=',False),('is_send_program_again','=',True)]}"/>-->
<button name="print_method" type="object" string="打印二维码" class="btn-primary"
attrs="{'invisible': ['|',('routing_type','!=','解除装夹'),('state','!=','done')]}"/>
>>>>>>> 6a2ff72dce60612aeb6c6f2e1851081840f46322
</xpath>
<xpath expr="//page[1]" position="before">
<page string="开料要求" attrs='{"invisible": [("routing_type","!=","切割")]}'>