Merge branch 'release/release_2.5'

Merge Request: 修复报废-外协入库验证

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1284

sf_maintenance/models/sf_maintenance_oee.py

@@ -62,22 +62,22 @@ class SfMaintenanceEquipmentOEE(models.Model):
          ("封存(报废)", "封存(报废)")],
         default='正常', string="机床状态", related='equipment_id.state')
 
-    online_time = fields.Char('开机时长(小时)', readonly='True')
+    online_time = fields.Char('开机时长(小时)', reaonly='True')
 
-    offline_time = fields.Char('关机时长(小时)', readonly='True')
+    offline_time = fields.Char('关机时长(小时)', reaonly='True')
-    idle_nums = fields.Integer('待机次数', readonly='True')
+    idle_nums = fields.Integer('待机次数', reaonly='True')
     # 待机时长
 
-    idle_time = fields.Char('待机时长(小时)', readonly='True')
+    idle_time = fields.Char('待机时长(小时)', reaonly='True')
 
     # 待机率
-    idle_rate = fields.Char('待机率(%)', readonly='True')
+    idle_rate = fields.Char('待机率(%)', reaonly='True')
 
-    work_time = fields.Char('加工时长(小时)', readonly='True')
+    work_time = fields.Char('加工时长(小时)', reaonly='True')
-    work_rate = fields.Char('可用率(%)', readonly='True')
+    work_rate = fields.Char('可用率(%)', reaonly='True')
-    fault_time = fields.Char('故障时长(小时)', readonly='True')
+    fault_time = fields.Char('故障时长(小时)', reaonly='True')
-    fault_rate = fields.Char('故障率(%)', readonly='True')
+    fault_rate = fields.Char('故障率(%)', reaonly='True')
-    fault_nums = fields.Integer('故障次数', readonly='True')
+    fault_nums = fields.Integer('故障次数', reaonly='True')
 
     # 设备故障日志
     sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_oee_id', '设备故障日志',
@@ -367,25 +367,25 @@ class SfMaintenanceEquipmentOEELog(models.Model):
         [("ZXJGZX", "钻铣加工中心"), ("CXJGZX", "车削加工中心"), ("FHJGZX", "复合加工中心")],
         default="", string="功能类型")
     machine_tool_picture = fields.Binary('设备图片')
-    type_id = fields.Many2one('sf.machine_tool.type', '品牌型号', readonly='True')
+    type_id = fields.Many2one('sf.machine_tool.type', '品牌型号', reaonly='True')
     state = fields.Selection([("加工", "加工"), ("关机", "关机"), ("待机", "待机"), ("故障", "故障"),
                               ("检修", "检修"), ("保养", "保养")], default="", string="实时状态")
-    online_time = fields.Char('开机时长', readonly='True')
+    online_time = fields.Char('开机时长', reaonly='True')
 
-    offline_time = fields.Char('关机时长', readonly='True')
+    offline_time = fields.Char('关机时长', reaonly='True')
-    offline_nums = fields.Integer('关机次数', readonly='True')
+    offline_nums = fields.Integer('关机次数', reaonly='True')
     # 待机时长
 
-    idle_time = fields.Char('待机时长', readonly='True')
+    idle_time = fields.Char('待机时长', reaonly='True')
 
     # 待机率
-    idle_rate = fields.Char('待机率', readonly='True')
+    idle_rate = fields.Char('待机率', reaonly='True')
 
-    work_time = fields.Char('加工时长', readonly='True')
+    work_time = fields.Char('加工时长', reaonly='True')
-    work_rate = fields.Char('可用率', readonly='True')
+    work_rate = fields.Char('可用率', reaonly='True')
-    fault_time = fields.Char('故障时长', readonly='True')
+    fault_time = fields.Char('故障时长', reaonly='True')
-    fault_rate = fields.Char('故障率', readonly='True')
+    fault_rate = fields.Char('故障率', reaonly='True')
-    fault_nums = fields.Integer('故障次数', readonly='True')
+    fault_nums = fields.Integer('故障次数', reaonly='True')
 
     detail_ids = fields.One2many('maintenance.equipment.oee.log.detail', 'log_id', string='日志详情')
 

sf_mrs_connect/models/sync_common.py

@@ -2271,9 +2271,9 @@ class Cutting_tool_standard_library(models.Model):
                              [('code', '=', item['chuck_code'].replace("JKM", result['factory_short_name']))]).id,
                          "handle_id": False if not item['handle_code'] else self.search(
                              [('code', '=', item['handle_code'].replace("JKM", result['factory_short_name']))]).id,
-                         "suitable_machining_method_ids": [(6, 0, [])] if not item.get('suitable_machining_method')
+                         "suitable_machining_method_ids": [(6, 0, [])] if not item.get(
-                         else self.env['maintenance.equipment.image']._get_ids(
+                             'suitable_machining_methods') else self.env['maintenance.equipment.image']._get_ids(
-                             item['suitable_machining_method']),
+                             item['suitable_machining_methods']),
                          "blade_tip_characteristics_id": self.env['maintenance.equipment.image'].search(
                              [('name', '=', item['blade_tip_characteristics'])]).id,
                          "handle_type_id": self.env['maintenance.equipment.image'].search(
@@ -2304,7 +2304,6 @@ class Cutting_tool_standard_library(models.Model):
                      ("active", 'in', [True, False])])
                 cutting_tool_type = self.env['sf.cutting.tool.type'].search(
                     [("code", '=', item['cutting_tool_type_code'])])
-
                 cutting_tool_material = self.env['sf.cutting.tool.material'].search(
                     [("code", '=', item['cutting_tool_material_code'])])
                 materials_model = self.env['sf.materials.model'].search(