diff --git a/sf_manufacturing/models/agv_scheduling.py b/sf_manufacturing/models/agv_scheduling.py index f2ac517b..7902b469 100644 --- a/sf_manufacturing/models/agv_scheduling.py +++ b/sf_manufacturing/models/agv_scheduling.py @@ -242,13 +242,13 @@ class AgvScheduling(models.Model): elif vals['state'] == '已配送': self.env['sf.workpiece.delivery'].search([('agv_scheduling_id', '=', self.id)]).write({ 'status': '已配送', - 'feeder_station_destination_id': self.end_site_id, + 'feeder_station_destination_id': self.end_site_id.id, 'route_id': self.agv_route_id.id, 'task_completion_time': fields.Datetime.now() }) elif vals['state'] == '配送中': self.env['sf.workpiece.delivery'].search([('agv_scheduling_id', '=', self.id)]).write({ - 'feeder_station_destination_id': self.end_site_id, + 'feeder_station_destination_id': self.end_site_id.id, 'route_id': self.agv_route_id.id, 'task_delivery_time': fields.Datetime.now() }) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 6f6a4be9..e19887ac 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -1671,14 +1671,14 @@ class WorkPieceDelivery(models.Model): obj.feeder_station_start_id.name, obj.feeder_station_destination_id.name) return obj - @api.constrains('route_id') - def _check_route_id(self): - if self.type == '运送空料架': - if self.route_id and self.name is False: - route = self.sudo().search( - [('route_id', '=', self.route_id.id), ('id', '!=', self.id), ('name', 'ilike', '运送空料架路线')]) - if route: - raise UserError("该任务路线已存在,请重新选择") + # @api.constrains('route_id') + # def _check_route_id(self): + # if self.type == '运送空料架': + # if self.route_id and self.name is False: + # route = self.sudo().search( + # [('route_id', '=', self.route_id.id), ('id', '!=', self.id), ('name', 'ilike', '运送空料架路线')]) + # if route: + # raise UserError("该任务路线已存在,请重新选择") # @api.constrains('name') # def _check_name(self):