Accept Merge Request #311: (feature/修改设备模块 -> develop)

Merge Request: 处理控制系统参数缺失 以及name同步不全问题

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

sf_base/models/base.py

@@ -21,7 +21,8 @@ class MachineControlSystem(models.Model):
     _description = '控制系统'
 
     code = fields.Char('编码', size=10)
-    name = fields.Char('名称', size=10)
+    name = fields.Char('名称')
+    remark = fields.Char('备注')
     brand_id = fields.Many2one('sf.machine.brand', '品牌')
     active = fields.Boolean('有效', default=True)
 

sf_base/views/base_view.xml

@@ -452,6 +452,7 @@
                 <field name="code"/>
                 <field name="name"/>
                 <field name="brand_id"/>
+                <field name="remark"/>
             </tree>
         </field>
     </record>

sf_mrs_connect/models/sync_common.py

@@ -489,6 +489,7 @@ class MachineControlSystem(models.Model):
                             "id": item['id'],
                             "name": item['name'],
                             "code": item['code'],
+                            "remark": item['remark'],
                             'brand_id': self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])]).id,
 
                             "active": item['active'],