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

sf_manufacturing/models/agv_scheduling.py

@@ -226,12 +226,12 @@ class AgvScheduling(models.Model):
             if rec.state != '待下发':
                 return False
             _logger.info('AGV任务调度：下发调度任务，路线为%s' % agv_task_route)
-            rec._delivery_avg()
             rec.state = '配送中'
             rec.task_delivery_time = fields.Datetime.now()
             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()
             # 更新接驳站状态
             rec.env['sf.agv.site'].update_site_state({rec.end_site_id.name: '占用'}, False)
 

sf_manufacturing/models/mrp_workorder.py

@@ -1167,6 +1167,10 @@ class ResMrpWorkOrder(models.Model):
                 record.process_state = '待解除装夹'
                 # record.write({'process_state': '待加工'})
                 record.production_id.process_state = '待解除装夹'
+                self.env['sf.production.plan'].sudo().search([('name', '=', record.production_id.name)]).write({
+                    'state': 'finished',
+                    'actual_end_time': datetime.now()
+                })
                 record.production_id.write({'detection_result_ids': [(0, 0, {
                     'rework_reason': record.reason,
                     'detailed_reason': record.detailed_reason,