diff --git a/hb_server/apps/inm/filters.py b/hb_server/apps/inm/filters.py index cd03941..c6beb53 100644 --- a/hb_server/apps/inm/filters.py +++ b/hb_server/apps/inm/filters.py @@ -2,11 +2,18 @@ from django_filters import rest_framework as filters from apps.mtm.models import Material from .models import IProduct, MaterialBatch +from django.utils import timezone class MbFilterSet(filters.FilterSet): material = filters.ModelMultipleChoiceFilter(field_name="material", queryset=Material.objects.all()) + tag = filters.CharFilter(method="filter_tag") class Meta: model = MaterialBatch fields = ['material', 'warehouse'] + + def filter_tag(self, queryset, name, value): + if value == 'expired': + queryset = queryset.exclude(expiration_date=None).filter(expiration_date__lte = timezone.now()) + return queryset class IProductFilterSet(filters.FilterSet): diff --git a/hb_server/apps/mns/__init__.py b/hb_server/apps/mns/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/hb_server/apps/mns/admin.py b/hb_server/apps/mns/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/hb_server/apps/mns/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/hb_server/apps/mns/apps.py b/hb_server/apps/mns/apps.py deleted file mode 100644 index 66dd6da..0000000 --- a/hb_server/apps/mns/apps.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.apps import AppConfig - - -class MnsConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.mns' - verbose_name = '消息通知系统' diff --git a/hb_server/apps/mns/migrations/__init__.py b/hb_server/apps/mns/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/hb_server/apps/mns/models.py b/hb_server/apps/mns/models.py deleted file mode 100644 index f214cad..0000000 --- a/hb_server/apps/mns/models.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.db import models -from utils.model import BaseModel -# Create your models here. - -class Notify(BaseModel) -pass \ No newline at end of file diff --git a/hb_server/apps/mns/tests.py b/hb_server/apps/mns/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/hb_server/apps/mns/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/hb_server/apps/mns/views.py b/hb_server/apps/mns/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/hb_server/apps/mns/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index 217b4fa..f3aa832 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -620,6 +620,8 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd pass else: raise exceptions.APIException('消耗与产出不一致') + # 实际消耗物料校验 + # 检查自定义表单填写 if OperationRecord.objects.filter(operation=op, is_filled=False).exists(): raise exceptions.APIException('存在自定义表单未填写')