给仓储岗增加修改工单的权限

sf_manufacturing/models/agv_scheduling.py

@@ -87,11 +87,12 @@ class AgvScheduling(models.Model):
                 agv_route_type: AGV任务类型
                 workorders: 工单
         """
+        scheduling = None
         _logger.info('创建AGV调度任务\r\n起点为【%s】，任务类型为【%s】，工单为【%s】' % (agv_start_site_name, agv_route_type, workorders))
         if not workorders:
             raise UserError(_('工单不能为空'))
-        agv_start_site = self.env['sf.agv.site'].sudo().search([('name', '=', agv_start_site_name)], limit=1)
-        if not agv_start_site:
+        agv_start_sites = self.env['sf.agv.site'].sudo().search([('name', '=', agv_start_site_name)])
+        if not agv_start_sites:
             raise UserError(_('不存在名称为【%s】的接驳站，请先创建！' % agv_start_site_name))
         # 如果存在相同任务类型工单的AGV调度任务，则提示错误
         agv_scheduling = self.sudo().search([
@@ -107,24 +108,32 @@ class AgvScheduling(models.Model):
                 (','.join(repetitive_workorders.mapped('production_id.name')), agv_scheduling.name)
             )
 
+        # 如果只有唯一任务路线，则自动赋予终点接驳站跟任务名称
+        agv_routes = self.env['sf.agv.task.route'].sudo().search([
+            ('route_type', '=', agv_route_type),
+            ('start_site_id', 'in', agv_start_sites.ids)
+        ])
         vals = {
-            'start_site_id': agv_start_site.id,
             'agv_route_type': agv_route_type,
             'workorder_ids': workorders.ids,
             # 'workpiece_delivery_ids': deliveries.mapped('id') if deliveries else [],
             'task_create_time': fields.Datetime.now()
         }
-        # 如果只有唯一任务路线，则自动赋予终点接驳站跟任务名称
-        agv_routes = self.env['sf.agv.task.route'].sudo().search([
-            ('route_type', '=', agv_route_type),
-            ('start_site_id', '=', agv_start_site.id)
-        ])
         if not agv_routes:
             raise UserError(_('不存在起点为【%s】的【%s】任务路线，请先创建！' % (agv_start_site_name, agv_route_type)))
+        # 如果路线中包含起点与终点相同的接驳站，则不创建AGV调度任务
+        if agv_routes.filtered(lambda r: r.start_site_id.name == r.end_site_id.name):
+            return True
+        # 配送类型相同的接驳站为同一个，取第一个即可
+        vals.update({
+            'start_site_id': agv_routes[0].start_site_id.id,
+        })
         idle_route = None
         if len(agv_routes) == 1:
             idle_route = agv_routes[0]
-            vals.update({'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id})
+            vals.update({
+                'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id
+            })
         else:
             # 判断终点接驳站是否为空闲
             idle_routes = agv_routes.filtered(lambda r: r.end_site_id.state == '空闲')
@@ -132,7 +141,10 @@ class AgvScheduling(models.Model):
                 # 将空闲的路线按照终点接驳站名称排序
                 idle_routes = sorted(idle_routes, key=lambda r: r.end_site_id.name)
                 idle_route = idle_routes[0]
-                vals.update({'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id})
+                vals.update({
+                    'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id
+                })
+
         try:
             scheduling = self.env['sf.agv.scheduling'].sudo().create(vals)
             # 触发空闲接驳站状态更新，触发新任务下发

sf_manufacturing/models/agv_setting.py

@@ -24,7 +24,7 @@ class AgvSetting(models.Model):
 
     # name必须唯一
     _sql_constraints = [
-        ('name_uniq', 'unique (name)', '站点编号必须唯一!'),
+        ('name_uniq', 'unique (name, workcenter_id)', '同一工作中心的站点编号必须唯一!'),
     ]
 
     # def update_site_state(self):
@@ -68,10 +68,11 @@ class AgvSetting(models.Model):
         """
         if isinstance(agv_site_state_arr, dict):
             for agv_site_name, is_occupy in agv_site_state_arr.items():
-                agv_site = self.env['sf.agv.site'].sudo().search([('name', '=', agv_site_name)])
-                if agv_site:
-                    agv_site.state = is_occupy
+                agv_sites = self.env['sf.agv.site'].sudo().search([('name', '=', agv_site_name)])
+                if agv_sites:
+                    agv_sites.state = is_occupy
                     if notify:
+                        for agv_site in agv_sites:
                             self.env['sf.agv.scheduling'].on_site_state_change(agv_site.id, agv_site.state)
                 else:
                     _logger.error("更新失败：接驳站站点错误！%s" % agv_site_name)

sf_manufacturing/wizard/workpiece_delivery_wizard.py

@@ -117,6 +117,19 @@ class WorkpieceDeliveryWizard(models.TransientModel):
                     item.button_finish()
 
             # return scheduling.read()[0]
+            if isinstance(scheduling, bool) and scheduling is True:
+                return{
+                    'type': 'ir.actions.client',
+                    'tag': 'display_notification',
+                    'target': 'new',
+                    'params': {
+                        'message': f'解除装夹成功',
+                        'type': 'success',
+                        'sticky': False,
+                        'next': {'type': 'ir.actions.act_window_close'},
+                    }
+                }
+            else:
                 return {
                     'type': 'ir.actions.client',
                     'tag': 'display_notification',

sf_warehouse/security/ir.model.access.csv

@@ -150,4 +150,4 @@ access_sf_shelf_lot_group_user,sf.shelf.location.lot.group_user,model_sf_shelf_l
 
 
 access_ir_model_group_sf_stock_user,ir_model_group_sf_stock_user,base.model_ir_model,sf_base.group_sf_stock_user,1,1,0,0
-access_mrp_workorder_group_sf_stock_user,mrp_workorder_group_sf_stock_user,mrp.model_mrp_workorder,sf_base.group_sf_stock_user,1,0,0,0
+access_mrp_workorder_group_sf_stock_user,mrp_workorder_group_sf_stock_user,mrp.model_mrp_workorder,sf_base.group_sf_stock_user,1,1,0,0