Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废

# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py

sf_manufacturing/models/__init__.py

@@ -10,3 +10,4 @@ from . import res_user
 from . import production_line_base
 from . import agv_setting
 from . import agv_scheduling
+from . import res_config_setting

sf_manufacturing/models/agv_scheduling.py

@@ -231,7 +231,9 @@ class AgvScheduling(models.Model):
             rec.site_state = '空闲'
             rec.end_site_id = agv_task_route.end_site_id.id
             rec.agv_route_id = agv_task_route.id
-            # rec._delivery_avg()
+            is_agv_task_dispatch = self.env['ir.config_parameter'].sudo().get_param('is_agv_task_dispatch')
+            if is_agv_task_dispatch:
+                rec._delivery_avg()
             # 更新接驳站状态
             rec.env['sf.agv.site'].update_site_state({rec.end_site_id.name: '占用'}, False)
 

sf_manufacturing/models/mrp_production.py

@@ -123,7 +123,12 @@ class MrpProduction(models.Model):
     # 上传零件图纸
     part_drawing = fields.Binary('零件图纸')
 
-    manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
+    @api.depends('product_id.manual_quotation')
+    def _compute_manual_quotation(self):
+        for item in self:
+            item.manual_quotation = item.product_id.manual_quotation
+
+    manual_quotation = fields.Boolean('人工编程', default=False, compute=_compute_manual_quotation, store=True)
     is_scrap = fields.Boolean('是否报废', default=False)
     is_remanufacture = fields.Boolean('是否重新制造', default=False)
     remanufacture_count = fields.Integer("重新制造订单数量", compute='_compute_remanufacture_production_ids')

sf_manufacturing/models/mrp_workcenter.py

@@ -41,6 +41,7 @@ class ResWorkcenter(models.Model):
 
     oee_target = fields.Float(
         string='OEE Target', help="Overall Effective Efficiency Target in percentage", default=90, tracking=True)
+    oee = fields.Float(compute='_compute_oee', help='Overall Equipment Effectiveness, based on the last month', store=True)
 
     time_start = fields.Float('Setup Time', tracking=True)
     time_stop = fields.Float('Cleanup Time', tracking=True)

sf_manufacturing/models/mrp_workorder.py

@@ -60,7 +60,12 @@ class ResMrpWorkOrder(models.Model):
         default='pending', copy=False, readonly=True, recursive=True, index=True, tracking=True)
     # state = fields.Selection(selection_add=[('to be detected', "待检测"), ('rework', '返工')], tracking=True)
 
-    manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
+    @api.depends('production_id.manual_quotation')
+    def _compute_manual_quotation(self):
+        for item in self:
+            item.manual_quotation = item.production_id.manual_quotation
+
+    manual_quotation = fields.Boolean('人工编程', default=False, compute=_compute_manual_quotation, store=True)
 
     def _compute_working_users(self):
         super()._compute_working_users()
@@ -1154,10 +1159,12 @@ class ResMrpWorkOrder(models.Model):
     def button_finish(self):
         for record in self:
             if record.routing_type == '装夹预调':
-                # if not record.material_center_point or record.X_deviation_angle <= 0:
-                #     raise UserError("请对前置三元检测定位参数进行计算定位")
+                if not record.material_center_point or record.X_deviation_angle <= 0:
+                    raise UserError("请对前置三元检测定位参数进行计算定位")
                 if not record.rfid_code and record.is_rework is False:
                     raise UserError("请扫RFID码进行绑定")
+                if not record.material_center_point or record.X_deviation_angle <= 0:
+                    raise UserError("请对前置三元检测定位参数进行计算定位")
                 record.process_state = '待加工'
                 # record.write({'process_state': '待加工'})
                 record.production_id.process_state = '待加工'

sf_manufacturing/models/res_config_setting.py

@@ -0,0 +1,22 @@
+from odoo import models, fields, api
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    is_agv_task_dispatch = fields.Boolean('是否下发AGV任务', default=False)
+
+    @api.model
+    def get_values(self):
+        values = super(ResConfigSettings, self).get_values()
+        config = self.env['ir.config_parameter'].sudo()
+        is_agv_task_dispatch = config.get_param('is_agv_task_dispatch')
+        values.update(
+            is_agv_task_dispatch=is_agv_task_dispatch,
+        )
+        return values
+
+    def set_values(self):
+        super(ResConfigSettings, self).set_values()
+        config = self.env['ir.config_parameter'].sudo()
+        config.set_param("is_agv_task_dispatch", self.is_agv_task_dispatch or False)