jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复配送完成修改工件配送单的bug

Browse Source
This commit is contained in:
胡尧
2024-08-21 20:16:41 +08:00
parent 0cdf37bb50
commit 3d2c62f5db
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_manufacturing/models/agv_scheduling.py
View File

@@ -242,13 +242,13 @@ class AgvScheduling(models.Model):
elif vals['state'] == '已配送': elif vals['state'] == '已配送':
self.env['sf.workpiece.delivery'].search([('agv_scheduling_id', '=', self.id)]).write({ self.env['sf.workpiece.delivery'].search([('agv_scheduling_id', '=', self.id)]).write({
'status': '已配送', '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, 'route_id': self.agv_route_id.id,
'task_completion_time': fields.Datetime.now() 'task_completion_time': fields.Datetime.now()
}) })
elif vals['state'] == '配送中': elif vals['state'] == '配送中':
self.env['sf.workpiece.delivery'].search([('agv_scheduling_id', '=', self.id)]).write({ 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, 'route_id': self.agv_route_id.id,
'task_delivery_time': fields.Datetime.now() 'task_delivery_time': fields.Datetime.now()
}) })

16
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1657,14 +1657,14 @@ class WorkPieceDelivery(models.Model):
obj.feeder_station_start_id.name, obj.feeder_station_destination_id.name) obj.feeder_station_start_id.name, obj.feeder_station_destination_id.name)
return obj return obj
@api.constrains('route_id') # @api.constrains('route_id')
def _check_route_id(self): # def _check_route_id(self):
if self.type == '运送空料架': # if self.type == '运送空料架':
if self.route_id and self.name is False: # if self.route_id and self.name is False:
route = self.sudo().search( # route = self.sudo().search(
[('route_id', '=', self.route_id.id), ('id', '!=', self.id), ('name', 'ilike', '运送空料架路线')]) # [('route_id', '=', self.route_id.id), ('id', '!=', self.id), ('name', 'ilike', '运送空料架路线')])
if route: # if route:
raise UserError("该任务路线已存在，请重新选择") # raise UserError("该任务路线已存在，请重新选择")
# @api.constrains('name') # @api.constrains('name')
# def _check_name(self): # def _check_name(self):