Merge remote-tracking branch 'origin/develop' into feature/仓库发货下发bfm

2024-09-05 09:38:40 +08:00
parent 54d9902ae4 afc1701150
commit 18b0cc6ea0
36 changed files with 819 additions and 539 deletions
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -164,7 +164,7 @@
            <field name="model">sf.production.process</field>
            <field name="arch" type="xml">
                <tree string="表面工艺" create="0" edit="0" delete="0">
-                    <field name="sequence" widget="handle" string="序号"  readonly="1"/>
+                    <field name="sequence"  string="加工顺序"  readonly="1"/>
                    <field name="code"/>
                    <field name="name" string="名称"/>
                    <field name="remark"/>