diff --git a/hb_server/apps/inm/models.py b/hb_server/apps/inm/models.py index d8235ee..a9a2226 100644 --- a/hb_server/apps/inm/models.py +++ b/hb_server/apps/inm/models.py @@ -69,12 +69,14 @@ class FIFO(CommonADModel): FIFO_TYPE_PUR_IN = 3 FIFO_TYPE_DO_IN = 4 FIFO_TYPE_OTHER_IN = 5 + FIFO_TYPE_OTHER_OUT = 6 type_choices = ( (FIFO_TYPE_DO_OUT, '生产领料'), (FIFO_TYPE_SALE_OUT, '销售提货'), (FIFO_TYPE_PUR_IN, '采购入库'), (FIFO_TYPE_DO_IN, '生产入库'), - (FIFO_TYPE_OTHER_IN, '其他入库') + (FIFO_TYPE_OTHER_IN, '其他入库'), + (FIFO_TYPE_OTHER_OUT, '其他出库') ) number = models.CharField('记录编号', max_length=100) type = models.IntegerField('出入库类型', default=1) diff --git a/hb_server/apps/system/permission.py b/hb_server/apps/system/permission.py index 7b218d3..397d906 100644 --- a/hb_server/apps/system/permission.py +++ b/hb_server/apps/system/permission.py @@ -44,7 +44,6 @@ class RbacPermission(BasePermission): perms = cache.get(request.user.username + '__perms') if not perms: perms = get_permission_list(request.user) - if 'admin' in perms: return True elif not hasattr(view, 'perms_map'):