jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge Request: 设备改成维保

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/332?initial=true
This commit is contained in:
龚启豪
2023-08-21 10:28:46 +08:00
committed by Coding
parent 78ddf4e52f ff60824291
commit 2cb84c5f55
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sf_base/views/base_view.xml
View File

@@ -92,6 +92,7 @@
<tree string="机床型号" create="0" delete="1" edit="0"> <tree string="机床型号" create="0" delete="1" edit="0">
<field name="code"/> <field name="code"/>
<field name="name" string="名称"/> <field name="name" string="名称"/>
<field name="machine_tool_category"/>
<field name="brand_id"/> <field name="brand_id"/>
<field name="remark"/> <field name="remark"/>
<field name="machine_tool_picture" widget="image"/> <field name="machine_tool_picture" widget="image"/>

7
sf_maintenance/views/maintenance_views.xml
View File

@@ -25,6 +25,13 @@
<field name="state" widget="statusbar" options="{'clickable': '1'}"/> <field name="state" widget="statusbar" options="{'clickable': '1'}"/>
</header> </header>
</xpath> </xpath>
<xpath expr="//page[@name='maintenance']" position="attributes">
<attribute name="string">维保</attribute>
</xpath>
<xpath expr="//field[@name='maintenance_count']" position="attributes">
<attribute name="string">维保</attribute>
</xpath>
<!-- <field string="Maintenance" name="maintenance_count" widget="statinfo"/>-->
<xpath expr="//div[@name='button_box']" position="inside"> <xpath expr="//div[@name='button_box']" position="inside">
<button name="%(action_maintenance_logs)d" <button name="%(action_maintenance_logs)d"

3
sf_mrs_connect/models/sync_common.py
View File

@@ -528,7 +528,6 @@ class MachineBrand(models.Model):
brand.name = item['name'], brand.name = item['name'],
brand.code = item['code'], brand.code = item['code'],
brand.image_brand = '' if not item['image_brand'] else base64.b64encode(item.image_brand), brand.image_brand = '' if not item['image_brand'] else base64.b64encode(item.image_brand),
brand.manufacturer_model_number = item['manufacturer_model_number'],
brand.active = item['active'], brand.active = item['active'],
brand.remark = item['remark'], brand.remark = item['remark'],
else: else:
@@ -537,7 +536,6 @@ class MachineBrand(models.Model):
"name": item['name'], "name": item['name'],
"code": item['code'], "code": item['code'],
"image_brand": '' if not item['image_brand'] else base64.b64encode(item.image_brand), "image_brand": '' if not item['image_brand'] else base64.b64encode(item.image_brand),
"manufacturer_model_number": item['manufacturer_model_number'],
"active": item['active'], "active": item['active'],
"remark": item['remark'], "remark": item['remark'],
@@ -567,7 +565,6 @@ class MachineBrand(models.Model):
"name": item['name'], "name": item['name'],
"code": item['code'], "code": item['code'],
"remark": item['remark'], "remark": item['remark'],
"manufacturer_model_number": item['manufacturer_model_number'],
"image_brand": '' if not item['image_brand'] else base64.b64encode(item.image_brand), "image_brand": '' if not item['image_brand'] else base64.b64encode(item.image_brand),
"tag_ids": self.env['sf.machine.brand.tags'].search( "tag_ids": self.env['sf.machine.brand.tags'].search(
[("name", 'in', item['tag_ids'])]).ids [("name", 'in', item['tag_ids'])]).ids