Merge branch 'feature/中控对接接口优化' into feature/中控接口注释及工厂数据处理

# Conflicts:
#	sf_manufacturing/views/mrp_production_addional_change.xml
This commit is contained in:
yuxianghui
2024-04-25 14:10:22 +08:00
11 changed files with 74 additions and 34 deletions

View File

@@ -67,6 +67,7 @@
<attribute name="statusbar_visible">progress,pending_cam,pending_processing,pending_era_cam,completed,done
</attribute>
</xpath>
<xpath expr="//sheet//group//group[2]//label" position="before">
<!-- <field name="process_state"/> -->
<field name="state"/>