Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充

sf_base/static/src/scss/test.scss

@@ -130,3 +130,20 @@ td.o_required_modifier {
 .o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector):not(.o_handle_cell):not(.o_list_button):not(.o_list_record_remove) {
   white-space: nowrap !important;
 }
+
+.o_status {
+  width: 18px;
+  height: 18px;
+}
+
+.czyg {
+  font-size: 12px;
+  margin-right: 10px;
+  color: #aaa;
+}
+
+.o_kanban_primary_left {
+  display: flex;
+  flex-direction: row-reverse;
+  justify-content: flex-start;
+}

sf_manufacturing/models/product_template.py

@@ -1,8 +1,8 @@
 from odoo import models, fields, api
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 import logging
 import base64
 import hashlib

sf_manufacturing/views/mrp_workcenter_views.xml

@@ -43,6 +43,12 @@
                         <field name="equipment_image" widget="image" />
 
 
+                </xpath>
+                <xpath expr='(//a[@name="unblock"])' position="after">
+
+                        <div class="czyg">绿色：正常，红色：故障，黄色：下线/暂停</div>
+
+
                 </xpath>
             </field>
         </record>