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

Merge Request: 修改工作中心看板，设备清单看板

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

sf_maintenance/views/maintenance_views.xml

@@ -284,7 +284,9 @@
                 <field name="machine_tool_picture"/>
 
             </xpath>
-            <xpath expr="//templates" position="inside">
+
+
+          <xpath expr="//templates" position="inside">
                 <t t-name="kanban-box">
                     <div t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click">
 
@@ -300,6 +302,9 @@
                             <!-- 内容 -->
                             <div class="o_kanban_record_bottom state_zc">
                                 <field name="state_zc"/>
+                            </div>
+                              <div class="o_kanban_record_bottom state_zc">
+                                <field name="technician_user_id"/>
                             </div>
                             <div class="o_kanban_record_bottom state_zc"
                                  t-attf-class="#{record.state.raw_value == '正常' ? 'font_color_1' : ''}

sf_manufacturing/models/mrp_workcenter.py

@@ -9,7 +9,6 @@ class ResWorkcenter(models.Model):
 
     # 生产线显示
     production_line_show = fields.Char(string='生产线')
-    equipment_id = fields.Many2one('maintenance.equipment', string='设备')
     machine_tool_id = fields.Many2one('sf.machine_tool', string='机床')
     production_line_id = fields.Many2one('sf.production.line', string='生产线')
     is_process_outsourcing = fields.Boolean('工艺外协')
@@ -19,6 +18,12 @@ class ResWorkcenter(models.Model):
         'maintenance.equipment', string="设备",
         check_company=True)
 
+    equipment_status = fields.Selection(
+        [("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")],
+        string="设备状态", related='equipment_id.state')
+
+    equipment_image = fields.Binary('设备图片', related='equipment_id.machine_tool_picture')
+
     # 查询工艺外协加工中心
     def get_process_outsourcing_workcenter(self):
         outsourcing_workcenter = self.env['mrp.workcenter'].search([('is_process_outsourcing', '=', True)])

sf_manufacturing/views/mrp_workcenter_views.xml

@@ -24,19 +24,28 @@
         </field>
     </record>
 
-    <!--    <record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">-->
+        <record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">
-    <!--        <field name="name">mrp.workcenter.view.kanban.inherit.mrp.workorder</field>-->
+            <field name="name">mrp.workcenter.view.kanban.inherit.mrp.workorder</field>
-    <!--        <field name="model">mrp.workcenter</field>-->
+            <field name="model">mrp.workcenter</field>
-    <!--        <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>-->
+            <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
-    <!--        <field name="arch" type="xml">-->
+            <field name="arch" type="xml">
-    <!--            &lt;!&ndash; Desktop view &ndash;&gt;-->
+                <!-- Desktop view -->
-    <!--            <xpath expr="//div[@name='o_wo']" position="inside">-->
+                <xpath expr='(//field[@name="name"])[1]' position="after">
-    <!--                <button class="btn btn-secondary fa fa-desktop" name="action_work_order" type="object"-->
+
-    <!--                        context="{'search_default_ready': 1, 'search_default_progress': 1, 'search_default_pending': 1, 'desktop_list_view': 1, 'search_default_workcenter_id': active_id}"-->
+                        <field name="equipment_status" />
-    <!--                        title="Work orders" aria-label="Work orders"/>-->
+                        <field name="equipment_image" />
-    <!--            </xpath>-->
+
-    <!--        </field>-->
+
-    <!--    </record>-->
+                </xpath>
+                 <xpath expr='(//field[@name="name"])[2]' position="after">
+
+                        <field name="equipment_status" />
+                        <field name="equipment_image" widget="image" />
+
+
+                </xpath>
+            </field>
+        </record>
 
     <!-- override to change the no content image -->
     <record id="mrp.action_work_orders" model="ir.actions.act_window">
@@ -90,6 +99,7 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='company_id']" position="after">
                 <field name="users_ids" widget="many2many_tags" string="可操作用户"/>
+                <field name="equipment_status"/>
             </xpath>
             <xpath expr="//field[@name='alternative_workcenter_ids']" position="after">
                 <field name="production_line_id"/>