Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11）

sf_maintenance/models/sf_equipment_maintenance_standards.py

@@ -48,8 +48,8 @@ class SfEquipmentSaintenanceStandards(models.Model):
         string='适用设备',
         domain="[('category_id', '=', maintenance_equipment_category_id)]"
     )
-
-    maintenance_standards_ids = fields.One2many('maintenance.standards', 'equipment_maintenance_standards_id', string='维保项目')
+    maintenance_standards_ids = fields.One2many('maintenance.standards', 'equipment_maintenance_standards_id',
+                                                string='维保项目', widget='one2many_list')
     eq_maintenance_ids = fields.One2many('maintenance.equipment', 'eq_maintenance_id', string='保养设备')
     overhaul_ids = fields.One2many('maintenance.equipment', 'overhaul_id', string='检修设备')
 
@@ -81,6 +81,7 @@ class SfSaintenanceStandards(models.Model):
         [('电气类', '电气类'), ('机械类', '机械类'), ('程序类', '程序类'), ('系统类', '系统类')], string='类别')
     equipment_maintenance_standards_id = fields.Many2one('equipment.maintenance.standards', string='设备维保标准')
     images = fields.One2many('maintenance.standard.image', 'standard_id', string='反馈图片')
+    maintenance_request_ids = fields.Many2many('maintenance.request', string='维保计划')
     Period = fields.Integer('周期/频次(天)')
     remark = fields.Char('备注说明')
 

sf_maintenance/models/sf_maintenance.py

@@ -237,9 +237,9 @@ class SfMaintenanceEquipment(models.Model):
             item.brand_id = item.type_id.brand_id.id
 
     # AGV小车设备参数
-    AGV_L = fields.Char('设备尺寸(长)')
-    AGV_W = fields.Char('设备尺寸(宽)')
-    AGV_H = fields.Char('设备尺寸(高)')
+    AGV_L = fields.Char('AGV尺寸(长)')
+    AGV_W = fields.Char('AGV尺寸(宽)')
+    AGV_H = fields.Char('AGV尺寸(高)')
     AGV_goods_L = fields.Char('载货尺寸(长)')
     AGV_goods_W = fields.Char('载货尺寸(宽)')
     AGV_goods_H = fields.Char('载货尺寸(高)')
@@ -276,9 +276,9 @@ class SfMaintenanceEquipment(models.Model):
     detect_L = fields.Char('设备尺寸(长)')
     detect_W = fields.Char('设备尺寸(宽)')
     detect_H = fields.Char('设备尺寸(高)')
-    detect_x_axis = fields.Char('X轴')
-    detect_y_axis = fields.Char('Y轴')
-    detect_z_axis = fields.Char('Z轴')
+    detect_x_axis = fields.Char('检测X轴')
+    detect_y_axis = fields.Char('检测Y轴')
+    detect_z_axis = fields.Char('检测Z轴')
     detect_precision = fields.Char('测量精度')
     detect_measurement_mode = fields.Selection([('光栅尺', '光栅尺'), ('容栅', '容栅'), ('磁栅', '磁栅'), ('激光干涉仪', '激光干涉仪')], string='测量方式')
     detect_resolution = fields.Char('分辨率')
@@ -295,8 +295,8 @@ class SfMaintenanceEquipment(models.Model):
     detect_object_field_of_view_max = fields.Char('物方视场(最大)')
     detect_object_field_of_view_min = fields.Char('物方视场(最小)')
     detect_power_requirements = fields.Char('电源要求')
-    detect_operating_temperature = fields.Char('环境温度')
-    detect_operating_humidity = fields.Char('环境湿度')
+    detect_operating_temperature = fields.Char('检测设备环境温度')
+    detect_operating_humidity = fields.Char('检测设备环境湿度')
 
     # 机器人设备参数
     robot_gripping_of_workpieces_L = fields.Char('可抓取工件(长)')
@@ -313,8 +313,8 @@ class SfMaintenanceEquipment(models.Model):
     robot_track_dimensions_H = fields.Char('轨道尺寸(高)')
     robot_drive_mode = fields.Char('驱动方式')
     robot_installation_method = fields.Selection([('置地式', '置地式'), ('壁挂式', '壁挂式'), ('倒挂式', '倒挂式')], string='安装方式')
-    robot_operating_temperature = fields.Char('环境温度')
-    robot_operating_humidity = fields.Char('环境湿度')
+    robot_operating_temperature = fields.Char('机器人环境温度')
+    robot_operating_humidity = fields.Char('机器人环境湿度')
 
     # 其他参数(所有设备)
     date_of_purchase = fields.Date('采购日期')

sf_maintenance/models/sf_maintenance_requests.py

@@ -25,7 +25,7 @@ class SfMaintenanceEquipmentCategory(models.Model):
             if not record.equipment_maintenance_id:
                 record.equipment_maintenance_id = False
 
-    maintenance_standards = fields.Many2many('maintenance.standards', string='维保标准')
+    maintenance_standards = fields.Many2many('maintenance.standards', string='维保项目')
 
     @api.constrains('equipment_maintenance_id')
     def _check_equipment_maintenance_id(self):

sf_maintenance/views/maintenance_request_views.xml

@@ -1,5 +1,63 @@
 <?xml version="1.0"?>
 <odoo>
+
+    <!--    维保项目表单视图-->
+
+    <record id="view_maintenance_standards_form" model="ir.ui.view">
+        <field name="name">maintenance.standards.form</field>
+        <field name="model">maintenance.standards</field>
+        <field name="arch" type="xml">
+            <form string="设备维保项目">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="maintenance_standards"/>
+                        </group>
+                        <group>
+                            <field name="remark"/>
+                            <field name="maintenance_request_ids" invisible="1"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="上传图片" autofocus="autofocus">
+                            <field name="images" mode="kanban">
+                                <kanban quick_create="1" create="1">
+                                    <field name="image"/>
+                                    <templates>
+                                        <t t-name="kanban-box">
+                                            <div class="oe_kanban_global_click">
+                                                <!-- 在这里定义每个卡片的内容 -->
+                                                <span>
+                                                    <image>
+                                                        <field name="image" preview_image="image_128" widget="image"/>
+                                                    </image>
+                                                </span>
+                                            </div>
+                                        </t>
+                                    </templates>
+                                </kanban>
+                                <form>
+                                    <sheet>
+                                        <field name="image" preview_image="image_128" widget="image"/>
+                                        <field name="standard_id"/>
+                                    </sheet>
+                                </form>
+                            </field>
+                        </page>
+
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_view_maintenance_standards_tree" model="ir.actions.act_window">
+        <field name="name">Maintenance Standards</field>
+        <field name="res_model">maintenance.standards</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_maintenance_standards_form"/>
+    </record>
     <!-- equiment.request : actions -->
 
     <record model="ir.ui.view" id="sf_hr_equipment_request_view_form">
@@ -21,17 +79,16 @@
             <sheet>
 
                 <notebook>
-                    <page string="维保标准" attrs="{'invisible': [('equipment_maintenance_id', '=', False)]}">
-                        <field name="maintenance_standards" widget="ony2many">
-                            <tree>
-                                <field name="sequence"/>
-                                <field name="name"/>
+                    <page string="维保标准" attrs="{'invisible': [('equipment_maintenance_id', '=', False)]}" context="{'default_standard_id': 'id'}">
+                        <field name="maintenance_standards" widget="one2many_list">
+                            <tree multi_edit="" editable="">
+                                <field name="name" />
                                 <field name="maintenance_standards"/>
-                                <field name="images"/>
+                                <field name="images" force_save="1" required="1">
+                                </field>
                                 <field name="remark"/>
                             </tree>
                         </field>
-
                     </page>
                 </notebook>
 
@@ -71,40 +128,5 @@
         <field name="active" eval="False"/>
     </record>
 
-    <!--    维保项目表单视图-->
-
-    <record id="view_maintenance_standards_form" model="ir.ui.view">
-        <field name="name">maintenance.standards.form</field>
-        <field name="model">maintenance.standards</field>
-        <field name="arch" type="xml">
-            <form string="设备维保项目">
-                <sheet>
-                    <group>
-                        <group>
-                             <field name="sequence"/>
-                             <field name="name"/>
-                        </group>
-                        <group>
-                            <field name="maintenance_standards"/>
-                            <field name="remark"/>
-                        </group>
-
-
-                    </group>
-                    <notebook>
-                        <page string="上传图片">
-                             <field name="images" widget="one2many">
-                        <tree editable="bottom">
-                            <field name="image" widget="image" options="{'size': [100, 100], 'click enlarge': True}"/>
-                        </tree>
-                    </field>
-                        </page>
-                    </notebook>
-
-                </sheet>
-            </form>
-        </field>
-    </record>
-
 
 </odoo>