forked from erp-dev/erp
feat: app verion && some field modify (printing & shipment)
This commit is contained in:
@@ -90,6 +90,8 @@ class PrintingOrderFilterSet(django_filters.FilterSet):
|
||||
area = django_filters.CharFilter(lookup_expr="icontains")
|
||||
outgoing_date_from = django_filters.CharFilter(method="filter_outgoing_date_from")
|
||||
outgoing_date_to = django_filters.CharFilter(method="filter_outgoing_date_to")
|
||||
kd_riqi_from = django_filters.CharFilter(method="filter_kd_riqi_from")
|
||||
kd_riqi_to = django_filters.CharFilter(method="filter_kd_riqi_to")
|
||||
created_date_from = django_filters.DateFilter(
|
||||
field_name="created_at", lookup_expr="gte"
|
||||
)
|
||||
@@ -196,6 +198,21 @@ class PrintingOrderFilterSet(django_filters.FilterSet):
|
||||
# 日期时间:按“<=”包含到秒
|
||||
return queryset.filter(outgoing_date__lte=dt)
|
||||
|
||||
def filter_kd_riqi_from(self, queryset, name, value):
|
||||
dt, _has_time = self._parse_date_or_datetime(value)
|
||||
if dt is None:
|
||||
raise ValidationError("kd_riqi_from 必须是日期或日期时间")
|
||||
return queryset.filter(kd_riqi__gte=dt)
|
||||
|
||||
def filter_kd_riqi_to(self, queryset, name, value):
|
||||
dt, has_time = self._parse_date_or_datetime(value)
|
||||
if dt is None:
|
||||
raise ValidationError("kd_riqi_to 必须是日期或日期时间")
|
||||
|
||||
if not has_time:
|
||||
return queryset.filter(kd_riqi__lt=dt + timedelta(days=1))
|
||||
return queryset.filter(kd_riqi__lte=dt)
|
||||
|
||||
def filter_created_date_to(self, queryset, name, value):
|
||||
"""
|
||||
过滤 created_at <= 指定日期的 23:59:59.999999
|
||||
@@ -234,6 +251,8 @@ class PrintingOrderViewSet(CustomerVisibilityFilterMixin, LimitedModelViewSet):
|
||||
- area: 地区(模糊查询)
|
||||
- outgoing_date_from: 出货日期起始
|
||||
- outgoing_date_to: 出货日期结束
|
||||
- kd_riqi_from: 外部开单日期时间起始
|
||||
- kd_riqi_to: 外部开单日期时间结束
|
||||
- created_date_from: 创建日期起始
|
||||
- created_date_to: 创建日期结束
|
||||
- search: 全文搜索(客户名称、面料、地区、工艺)
|
||||
@@ -266,6 +285,7 @@ class PrintingOrderViewSet(CustomerVisibilityFilterMixin, LimitedModelViewSet):
|
||||
"created_at",
|
||||
"updated_at",
|
||||
"outgoing_date",
|
||||
"kd_riqi",
|
||||
"is_urgent",
|
||||
"is_fabric_received",
|
||||
"is_invalid",
|
||||
|
||||
Reference in New Issue
Block a user