Accept Merge Request #130: (feature/优化进度反馈 -> develop)

Merge Request: 优化工单界面展示

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/130

sf_machine_connect/__manifest__.py

@@ -2,14 +2,16 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': '机企猫智能工厂 对接机床',
-    'version': '2.0',
+    'version': '1.0',
     'summary': 'sf_machine_connect',
     'sequence': 10,
     'description': """
-这是一个模块
+这是一个连接机床的模块
 ====================
     """,
     'category': 'sf',
+    'author': 'jikimo',
+    'website': 'https://sf.cs.jikimo.com',
     'depends': ['sf_base', 'sf_manufacturing', 'barcodes', ],
     'data': [
         # 定义权限组放在最上面

sf_manufacturing/views/mrp_workorder_view.xml

@@ -13,8 +13,14 @@
                 <field name="processing_panel"/>
             </field>
             <field name="state" position="after">
-                <field name="work_state"/>
+                <field name="work_state" optional="hide"/>
             </field>
+            <xpath expr="//field[@name='date_planned_start']" position="replace">
+                <field name="date_planned_start" string="计划开始日期" optional="show"/>
+            </xpath>
+            <xpath expr="//field[@name='date_planned_finished']" position="replace">
+                <field name="date_planned_finished" string="计划结束日期" optional="show"/>
+            </xpath>
             <xpath expr="//button[@name='button_start']" position="attributes">
                 <attribute name="attrs">{'invisible': ['|', '|', '|','|', ('production_state','in', ('draft', 'done',
                     'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')),
@@ -123,7 +129,7 @@
                     <field name="duration" widget="mrp_timer"
                            attrs="{'invisible': [('production_state','=', 'draft')], 'readonly': [('is_user_working', '=', True)]}"
                            sum="real duration"/>
-                    <field name="processing_panel" readonly="1"/>
+                    <field name="processing_panel" readonly="1" attrs='{"invisible": [("routing_type","=","切割")]}'/>
                 </group>
 
                 <field name="processing_panel" readonly="1" attrs="{'invisible': [('routing_type', 'in', ('获取CNC加工程序','装夹','解除装夹',