Accept Merge Request #483: (feature/修改机床参数bug -> develop)

Merge Request: 设备其他table增加参数

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/483?initial=true

sf_maintenance/models/sf_maintenance.py

@@ -316,6 +316,14 @@ class SfMaintenanceEquipment(models.Model):
     robot_operating_temperature = fields.Char('环境温度')
     robot_operating_humidity = fields.Char('环境湿度')
 
+    # 其他参数(所有设备)
+    date_of_purchase = fields.Date('采购日期')
+    date_of_manufacture = fields.Date('出厂日期')
+    date_of_warranty = fields.Date('质保截至日期')
+    original_value = fields.Char('原值')
+    incomplete_value = fields.Char('残值')
+
+
 
 
 

sf_maintenance/views/maintenance_views.xml

@@ -972,6 +972,11 @@
                 <xpath expr="//page[@name='maintenance']" position="after">
                     <page string="其他" attrs="{'invisible': [('type_id', '=', False)]}">
                         <group string="其他">
+                            <field name="date_of_purchase"/>
+                            <field name="date_of_manufacture"/>
+                            <field name="date_of_warranty"/>
+                            <field name="original_value"/>
+                            <field name="incomplete_value"/>
                             <field name="remark"/>
                         </group>