设备加工参数等页面修改

sf_machine_connect/models/ftp_client.py

@@ -245,32 +245,32 @@ class Machine_ftp(models.Model):
     program_status = fields.Char('程序运行状态', readonly=True)
     current_program = fields.Char('机床当前执行指令', readonly=True)
     current_program_seq = fields.Char('机床当前执行语句号', readonly=True)
-    x_abs_pos = fields.Char('机床X轴当前位置', readonly=True)
-    y_abs_pos = fields.Char('机床Y轴当前位置', readonly=True)
-    z_abs_pos = fields.Char('机床Z轴当前位置', readonly=True)
+    x_abs_pos = fields.Char('机床X轴当前位置(mm)', readonly=True)
+    y_abs_pos = fields.Char('机床Y轴当前位置(mm)', readonly=True)
+    z_abs_pos = fields.Char('机床Z轴当前位置(mm)', readonly=True)
 
     # 机床设定进给速度, 机床实际进给速度, 机床设定主轴转速, 机床实际主轴转速, 机床主轴负载, 机床X轴伺服轴负载, 机床Y轴伺服轴负载
     # 机床Z轴伺服轴负载, 机床快速移动倍率, 机床进给倍率, 机床X轴机械坐标, 机床Y轴机械坐标, 机床Z轴机械坐标, 机床X轴相对工件坐标
     # 机床Y轴相对工件坐标, 机床Z轴相对工件坐标, 机床X轴目标距离, 机床Y轴目标距离, 机床Z轴目标距离
-    feed_speed_set = fields.Char('机床设定进给速度', readonly=True)
-    act_feed_speed = fields.Char('机床实际进给速度', readonly=True)
-    spindle_speed_set = fields.Char('机床设定主轴转速', readonly=True)
-    act_spindle_speed = fields.Char('机床实际主轴转速', readonly=True)
-    spindle_load = fields.Char('机床主轴负载', readonly=True)
-    x_axis_load = fields.Char('机床X轴伺服轴负载', readonly=True)
-    y_axis_load = fields.Char('机床Y轴伺服轴负载', readonly=True)
-    z_axis_load = fields.Char('机床Z轴伺服轴负载', readonly=True)
-    rapid_feed = fields.Char('机床快速移动倍率', readonly=True)
-    feed_rate = fields.Char('机床进给倍率', readonly=True)
-    x_mach_coord = fields.Char('机床X轴机械坐标', readonly=True)
-    y_mach_coord = fields.Char('机床Y轴机械坐标', readonly=True)
-    z_mach_coord = fields.Char('机床Z轴机械坐标', readonly=True)
-    x_rel_coord = fields.Char('机床X轴相对工件坐标', readonly=True)
-    y_rel_coord = fields.Char('机床Y轴相对工件坐标', readonly=True)
-    z_rel_coord = fields.Char('机床Z轴相对工件坐标', readonly=True)
-    x_dis_coord = fields.Char('机床X轴目标距离', readonly=True)
-    y_dis_coord = fields.Char('机床Y轴目标距离', readonly=True)
-    z_dis_coord = fields.Char('机床Z轴目标距离', readonly=True)
+    feed_speed_set = fields.Char('机床设定进给速度(mm/min)', readonly=True)
+    act_feed_speed = fields.Char('机床实际进给速度(mm/min)', readonly=True)
+    spindle_speed_set = fields.Char('机床设定主轴转速(r/min)', readonly=True)
+    act_spindle_speed = fields.Char('机床实际主轴转速(r/min)', readonly=True)
+    spindle_load = fields.Char('机床主轴负载(%)', readonly=True)
+    x_axis_load = fields.Char('机床X轴伺服轴负载(%)', readonly=True)
+    y_axis_load = fields.Char('机床Y轴伺服轴负载(%)', readonly=True)
+    z_axis_load = fields.Char('机床Z轴伺服轴负载(%)', readonly=True)
+    rapid_feed = fields.Char('机床快速移动倍率(%)', readonly=True)
+    feed_rate = fields.Char('机床进给倍率(%)', readonly=True)
+    x_mach_coord = fields.Char('机床X轴机械坐标(mm)', readonly=True)
+    y_mach_coord = fields.Char('机床Y轴机械坐标(mm)', readonly=True)
+    z_mach_coord = fields.Char('机床Z轴机械坐标(mm)', readonly=True)
+    x_rel_coord = fields.Char('机床X轴相对工件坐标(mm)', readonly=True)
+    y_rel_coord = fields.Char('机床Y轴相对工件坐标(mm)', readonly=True)
+    z_rel_coord = fields.Char('机床Z轴相对工件坐标(mm)', readonly=True)
+    x_dis_coord = fields.Char('机床X轴目标距离(mm)', readonly=True)
+    y_dis_coord = fields.Char('机床Y轴目标距离(mm)', readonly=True)
+    z_dis_coord = fields.Char('机床Z轴目标距离(mm)', readonly=True)
 
     # 故障报警时间, 故障报警信息, 故障消除时间(复原时间)
     alarm_time = fields.Char('故障报警时间', readonly=True)

sf_maintenance/models/sf_maintenance_logs.py

@@ -10,21 +10,21 @@ class SfMaintenanceLogs(models.Model):
     name = fields.Char(string='名称')
     type = fields.Selection([('type1', '类型1'), ('type2', '类型2')], string='类型')
     brand = fields.Many2one('sf.machine.brand', related='maintenance_equipment_id.brand_id', string='品牌')
-    maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='设备')
+    maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='机台号')
     maintenance_equipment_oee_id = fields.Many2one('maintenance.equipment.oee', string='设备oee')
     code_location = fields.Char(string='编码位置')
     fault_type = fields.Selection(
         [('电气类', '电气类'), ('机械类', '机械类'), ('程序类', '程序类'), ('系统类', '系统类')], string='故障类型')
     fault_code = fields.Char(string='故障代码')
-    fault_alarm_info = fields.Char(string='故障报警信息')
+    fault_alarm_info = fields.Text(string='故障报警信息')
     alarm_level = fields.Selection([('一级', '一级(严重)'), ('二级', '二级(中等)'), ('三级', '三级(轻微)')],
                                    string='报警级别')
-    alarm_time = fields.Datetime(string='报警时间')
+    alarm_time = fields.Datetime(string='故障报警时间')
     alarm_way = fields.Selection([('文本提示报警', '文本提示报警'), ('声光报警', '声光报警'), ('图文报警', '图文报警')],
                                  string='报警方式')
     fault_process = fields.Text(string='故障处理方法')
     operator = fields.Many2one('res.users', string='处理人')
-    recovery_time = fields.Datetime(string='复原时间')
+    recovery_time = fields.Datetime(string='故障消除时间')
     fault_duration = fields.Float(string='故障时长')
     note = fields.Text(string='备注')
     active = fields.Boolean('Active', default=True)

sf_maintenance/views/maintenance_logs_views.xml

@@ -7,22 +7,20 @@
             <field name="model">sf.maintenance.logs</field>
             <field name="arch" type="xml">
                 <tree>
-                    <field name="code"/>
                     <field name="type" optional="hide"/>
                     <field name="brand"/>
                     <field name="maintenance_equipment_id"/>
                     <field name="code_location" optional="hide"/>
-                    <field name="fault_type"/>
                     <field name="fault_code" optional="hide"/>
+                    <field name="alarm_time"/>
                     <field name="fault_alarm_info"/>
                     <field name="alarm_level" optional="hide"/>
-                    <field name="alarm_time"/>
                     <field name="alarm_way" optional="hide"/>
-                    <field name="fault_process"/>
-                    <field name="operator"/>
+                    <field name="fault_process" optional="hide"/>
+                    <field name="operator" optional="hide"/>
                     <field name="recovery_time"/>
                     <field name="fault_duration"/>
-                    <field name="note"/>
+                    <field name="note" optional="hide"/>
                 </tree>
             </field>
         </record>
@@ -45,25 +43,32 @@
                         <group>
                             <group>
 
-                                <field name="name"/>
-                                <field name="type" required="1" widget="radio" options="{'horizontal': true}"/>
-                                <field name="brand"/>
+<!--                                 <field name="name"/> -->
+<!--                                 <field name="type" required="1" widget="radio" options="{'horizontal': true}"/> -->
                                 <field name="maintenance_equipment_id"/>
-                                <field name="code_location"/>
-                                <field name="fault_type" required="1" widget="radio" options="{'horizontal': true}"/>
-                                <field name="fault_code"/>
-                                <field name="fault_process"/>
-                            </group>
-                            <group>
-                                <field name="fault_alarm_info"/>
+                                <field name="brand"/>
                                 <field name="alarm_time"/>
-                                <field name="alarm_way" required="1" widget="radio" options="{'horizontal': true}"/>
-                                <field name="operator"/>
-                                <field name="recovery_time"/>
-                                <field name="fault_duration"/>
-                                <field name="note"/>
+                                <field name="fault_alarm_info"/>
+
+<!--                                 <field name="code_location"/> -->
+<!--                                 <field name="fault_type" required="1" widget="radio" options="{'horizontal': true}"/> -->
+<!--                                 <field name="fault_code"/> -->
 
                             </group>
+                            <group>
+                                <field name="operator"/>
+
+                                <field name="fault_process"/>
+<!--                                 <field name="alarm_way" required="1" widget="radio" options="{'horizontal': true}"/> -->
+                                <field name="recovery_time"/>
+                                <field name="fault_duration"/>
+
+
+                            </group>
+
+                        </group>
+                        <group>
+                        <field name="note"/>
                         </group>
                     </sheet>
                 </form>

sf_manufacturing/views/production_line_view.xml

@@ -100,7 +100,7 @@
         <field name="model">sf.maintenance.logs</field>
         <field name="inherit_id" ref="sf_maintenance.view_maintenance_logs_tree"/>
          <field name="arch" type="xml">
-             <xpath expr="//field[@name='code']" position="after">
+             <xpath expr="//field[@name='type']" position="after">
                  <field name="production_line_id" optional="hide"/>
              </xpath>
          </field>