mirror/GreaterWMS
1
0
Fork 0
mirror of https://github.com/GreaterWMS/GreaterWMS.git synced 2026-06-19 07:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

V 2.1.25

Browse Source
This commit is contained in:
Elvis.Shi
2022-10-28 11:31:32 +08:00
parent 31bb114eb5
commit b328ba7389
38 changed files with 2 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asn/models.py
-6
View File
@@ -21,9 +21,6 @@ class AsnListModel(models.Model):
verbose_name_plural = "ASN List"
ordering = ['-id']
def __int__(self):
return self.pk
class AsnDetailModel(models.Model):
asn_code = models.CharField(max_length=255, verbose_name="ASN Code")
asn_status = models.BigIntegerField(default=1, verbose_name="ASN Status")
@@ -51,6 +48,3 @@ class AsnDetailModel(models.Model):
verbose_name_plural = "ASN Detail"
ordering = ['-id']
def __int__(self):
return self.pk
binproperty/models.py
-3
View File
@@ -13,6 +13,3 @@ class ListModel(models.Model):
verbose_name = 'Bin Property'
verbose_name_plural = "Bin Property"
ordering = ['bin_property']
def __int__(self):
return self.pk
binset/models.py
-3
View File
@@ -17,6 +17,3 @@ class ListModel(models.Model):
verbose_name = 'Bin Set'
verbose_name_plural = "Bin Set"
ordering = ['bin_name']
def __int__(self):
return self.pk
binsize/models.py
-3
View File
@@ -16,6 +16,3 @@ class ListModel(models.Model):
verbose_name = 'Bin Size'
verbose_name_plural = "Bin Size"
ordering = ['-id']
def __int__(self):
return self.pk
capital/models.py
-3
View File
@@ -15,6 +15,3 @@ class ListModel(models.Model):
verbose_name = 'Capital'
verbose_name_plural = "Capital"
ordering = ['-id']
def __int__(self):
return self.pk
chat/__init__.py
View File
chat/admin.py
-4
View File
@@ -1,4 +0,0 @@
from django.contrib import admin
from .models import ListModel
admin.site.register(ListModel)
chat/apps.py
-5
View File
@@ -1,5 +0,0 @@
from django.apps import AppConfig
class ChatConfig(AppConfig):
name = 'chat'
chat/filter.py
-14
View File
@@ -1,14 +0,0 @@
from django_filters import FilterSet
from .models import ListModel
class Filter(FilterSet):
class Meta:
model = ListModel
fields = {
"id": ['exact', 'iexact', 'gt', 'gte', 'lt', 'lte', 'isnull', 'in', 'range'],
"read": ['exact', 'iexact'],
"detail": ['exact', 'iexact', 'contains', 'icontains'],
"is_delete": ['exact', 'iexact'],
"create_time": ['year', 'month', 'day', 'week_day', 'gt', 'gte', 'lt', 'lte', 'range'],
"update_time": ['year', 'month', 'day', 'week_day', 'gt', 'gte', 'lt', 'lte', 'range']
}
chat/migrations/__init__.py
View File
chat/models.py
-19
View File
@@ -1,19 +0,0 @@
from django.db import models
class ListModel(models.Model):
sender = models.CharField(max_length=100, verbose_name='Sender')
receiver = models.CharField(max_length=100, verbose_name='Receiver')
read = models.BooleanField(default=False, verbose_name="Readed")
detail = models.CharField(max_length=100, verbose_name='Chat text')
is_delete = models.BooleanField(default=False, verbose_name='Delete label')
create_time = models.DateTimeField(auto_now_add=True, verbose_name='Create time')
update_time = models.DateTimeField(auto_now=True, blank=True, null=True, verbose_name='Update time')
class Meta:
db_table = 'chat'
verbose_name = 'Chat'
verbose_name_plural = "Chat"
ordering = ['-id']
def __int__(self):
return self.pk
chat/serializers.py
-14
View File
@@ -1,14 +0,0 @@
from rest_framework import serializers
from .models import ListModel
class ChatGetSerializer(serializers.ModelSerializer):
sender = serializers.CharField(read_only=True, required=False)
receiver = serializers.CharField(read_only=True, required=False)
read = serializers.BooleanField(read_only=True, required=False)
detail = serializers.CharField(read_only=True, required=False)
create_time = serializers.DateTimeField(read_only=True, format='%Y-%m-%d %H:%M:%S')
update_time = serializers.DateTimeField(read_only=True, format='%Y-%m-%d %H:%M:%S')
class Meta:
model = ListModel
exclude = ['is_delete', ]
read_only_fields = ['id', ]
chat/tests.py
View File
chat/urls.py
-7
View File
@@ -1,7 +0,0 @@
from django.urls import path
from . import views
urlpatterns = [
path(r'', views.ChatViewSet.as_view({"get": "list"}), name="chat"),
path(r'read/', views.ReadAPI.as_view({"get": "list"}), name='read')
]
chat/views.py
-57
View File
@@ -1,57 +0,0 @@
from django.db.models import Q
from rest_framework import viewsets
from .models import ListModel
from . import serializers
from utils.page import MyPageNumberPagination
from rest_framework.filters import OrderingFilter
from django_filters.rest_framework import DjangoFilterBackend
from .filter import Filter
class ChatViewSet(viewsets.ModelViewSet):
"""
list:
Response a data list（all）
"""
pagination_class = MyPageNumberPagination
filter_backends = [DjangoFilterBackend, OrderingFilter, ]
ordering_fields = ['id', "create_time", "update_time", ]
filter_class = Filter
def get_queryset(self):
if self.request.user:
sender = str(self.request.GET.get('sender', '')) + '-' + self.request.auth.openid
receiver = str(self.request.GET.get('receiver', '')) + '-' + self.request.auth.openid
if ListModel.objects.filter(sender=receiver, receiver=sender, read=False).exists():
ListModel.objects.filter(sender=receiver, receiver=sender, read=False).update(read=True)
return ListModel.objects.filter(Q(sender=sender, receiver=receiver) | Q(sender=receiver, receiver=sender))
else:
return ListModel.objects.none()
def get_serializer_class(self):
if self.action in ['list']:
return serializers.ChatGetSerializer
else:
return self.http_method_not_allowed(request=self.request)
class ReadAPI(viewsets.ModelViewSet):
"""
list:
Response a data list（all）
"""
pagination_class = MyPageNumberPagination
filter_backends = [DjangoFilterBackend, OrderingFilter, ]
ordering_fields = ['id', "create_time", "update_time", ]
filter_class = Filter
def get_queryset(self):
if self.request.user:
sender = str(self.request.GET.get('sender', '')) + '-' + self.request.auth.openid
return ListModel.objects.filter(receiver=sender, read=False)
else:
return ListModel.objects.none()
def get_serializer_class(self):
if self.action in ['list']:
return serializers.ChatGetSerializer
else:
return self.http_method_not_allowed(request=self.request)
company/models.py
-3
View File
@@ -17,6 +17,3 @@ class ListModel(models.Model):
verbose_name = 'Company'
verbose_name_plural = "Company"
ordering = ['company_name']
def __int__(self):
return self.pk
customer/models.py
-3
View File
@@ -18,6 +18,3 @@ class ListModel(models.Model):
verbose_name = 'Customer'
verbose_name_plural = "Customer"
ordering = ['customer_name']
def __int__(self):
return self.pk
cyclecount/models.py
-9
View File
@@ -17,9 +17,6 @@ class QTYRecorder(models.Model):
verbose_name_plural = "QTY Recorder"
ordering = ['-id']
def __int__(self):
return self.pk
class CyclecountModeDayModel(models.Model):
openid = models.CharField(max_length=255, verbose_name="Openid")
cyclecount_status = models.IntegerField(default=0, verbose_name="Cycle Count Status")
@@ -39,9 +36,6 @@ class CyclecountModeDayModel(models.Model):
verbose_name_plural = "Cyclecount Day"
ordering = ['openid']
def __int__(self):
return self.pk
class ManualCyclecountModeModel(models.Model):
openid = models.CharField(max_length=255, verbose_name="Openid")
cyclecount_status = models.IntegerField(default=0, verbose_name="Cycle Count Status")
@@ -60,6 +54,3 @@ class ManualCyclecountModeModel(models.Model):
verbose_name = 'Manual Cyclecount'
verbose_name_plural = "Manual Cyclecount"
ordering = ['openid']
def __int__(self):
return self.pk
dn/models.py
-9
View File
@@ -22,9 +22,6 @@ class DnListModel(models.Model):
verbose_name_plural = "DN List"
ordering = ['-id']
def __int__(self):
return self.pk
class DnDetailModel(models.Model):
dn_code = models.CharField(max_length=255, verbose_name="DN Code")
dn_status = models.BigIntegerField(default=1, verbose_name="DN Status")
@@ -55,9 +52,6 @@ class DnDetailModel(models.Model):
verbose_name_plural = "DN Detail"
ordering = ['-id']
def __int__(self):
return self.pk
class PickingListModel(models.Model):
dn_code = models.CharField(max_length=255, verbose_name="DN Code")
bin_name = models.CharField(max_length=255, verbose_name="Bin Name")
@@ -76,6 +70,3 @@ class PickingListModel(models.Model):
verbose_name = 'Picking List'
verbose_name_plural = "Picking List"
ordering = ['-id']
def __int__(self):
return self.pk
driver/models.py
-6
View File
@@ -16,9 +16,6 @@ class ListModel(models.Model):
verbose_name_plural = "Driver"
ordering = ['driver_name']
def __int__(self):
return self.pk
class DispatchListModel(models.Model):
driver_name = models.CharField(max_length=255, verbose_name="Driver Name")
dn_code = models.CharField(max_length=255, verbose_name="DN Code")
@@ -33,6 +30,3 @@ class DispatchListModel(models.Model):
verbose_name = 'Dispatch List'
verbose_name_plural = "Dispatch List"
ordering = ['-create_time']
def __int__(self):
return self.pk
goods/models.py
-3
View File
@@ -31,6 +31,3 @@ class ListModel(models.Model):
verbose_name = 'Goods List'
verbose_name_plural = "Goods List"
ordering = ['-id']
def __int__(self):
return self.pk
goodsbrand/models.py
-3
View File
@@ -13,6 +13,3 @@ class ListModel(models.Model):
verbose_name = 'Goods Brand'
verbose_name_plural = "Goods Brand"
ordering = ['goods_brand']
def __int__(self):
return self.pk
goodsclass/models.py
-3
View File
@@ -13,6 +13,3 @@ class ListModel(models.Model):
verbose_name = 'Goods Class'
verbose_name_plural = "Goods Class"
ordering = ['goods_class']
def __int__(self):
return self.pk
goodscolor/models.py
-3
View File
@@ -13,6 +13,3 @@ class ListModel(models.Model):
verbose_name = 'Goods Color'
verbose_name_plural = "Goods Color"
ordering = ['goods_color']
def __int__(self):
return self.pk
goodsorigin/models.py
-3
View File
@@ -13,6 +13,3 @@ class ListModel(models.Model):
verbose_name = 'Goods Origin'
verbose_name_plural = "Goods Origin"
ordering = ['goods_origin']
def __int__(self):
return self.pk
goodsshape/models.py
-3
View File
@@ -13,6 +13,3 @@ class ListModel(models.Model):
verbose_name = 'Goods Shape'
verbose_name_plural = "Goods Shape"
ordering = ['goods_shape']
def __int__(self):
return self.pk
goodsspecs/models.py
-3
View File
@@ -13,6 +13,3 @@ class ListModel(models.Model):
verbose_name = 'Goods Specs'
verbose_name_plural = "Goods Specs"
ordering = ['goods_specs']
def __int__(self):
return self.pk
goodsunit/models.py
-3
View File
@@ -13,6 +13,3 @@ class ListModel(models.Model):
verbose_name = 'Goods Unit'
verbose_name_plural = "Goods Unit"
ordering = ['goods_unit']
def __int__(self):
return self.pk
greaterwms/settings.py
-1
View File
@@ -28,7 +28,6 @@ INSTALLED_APPS = [
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'chat.apps.ChatConfig',
'staff.apps.StaffConfig',
'userprofile.apps.UserprofileConfig',
'userregister.apps.UserregisterConfig',
greaterwms/urls.py
-1
View File
@@ -19,7 +19,6 @@ urlpatterns = [
path('binset/', include('binset.urls')),
path('binsize/', include('binsize.urls')),
path('binproperty/', include('binproperty.urls')),
path('chat/', include('chat.urls')),
path('capital/', include('capital.urls')),
path('driver/', include('driver.urls')),
path('stock/', include('stock.urls')),
payment/models.py
-3
View File
@@ -18,6 +18,3 @@ class TransportationFeeListModel(models.Model):
verbose_name = 'Transportation Fee'
verbose_name_plural = "Transportation Fee"
ordering = ['-id']
def __int__(self):
return self.pk
scanner/models.py
-3
View File
@@ -13,6 +13,3 @@ class ListModel(models.Model):
verbose_name = 'Scanner'
verbose_name_plural = "Scanner"
ordering = ['-id']
def __int__(self):
return self.pk
staff/models.py
-6
View File
@@ -16,9 +16,6 @@ class ListModel(models.Model):
verbose_name_plural = "Staff"
ordering = ['staff_name']
def __int__(self):
return self.pk
class TypeListModel(models.Model):
staff_type = models.CharField(max_length=255, verbose_name="Staff Type")
openid = models.CharField(max_length=255, verbose_name="Openid")
@@ -31,6 +28,3 @@ class TypeListModel(models.Model):
verbose_name = 'Staff Type'
verbose_name_plural = "Staff Type"
ordering = ['staff_type']
def __int__(self):
return self.pk
stock/models.py
-6
View File
@@ -29,9 +29,6 @@ class StockListModel(models.Model):
verbose_name_plural = "Stock List"
ordering = ['-id']
def __int__(self):
return self.pk
class StockBinModel(models.Model):
bin_name = models.CharField(max_length=255, verbose_name="Bin Name")
goods_code = models.CharField(max_length=255, verbose_name="Goods Code")
@@ -51,6 +48,3 @@ class StockBinModel(models.Model):
verbose_name = 'Stock Bin'
verbose_name_plural = "Stock Bin"
ordering = ['-id']
def __int__(self):
return self.pk
supplier/models.py
-3
View File
@@ -18,6 +18,3 @@ class ListModel(models.Model):
verbose_name = 'Supplier'
verbose_name_plural = "Supplier"
ordering = ['supplier_name']
def __int__(self):
return self.pk
throttle/models.py
-3
View File
@@ -13,6 +13,3 @@ class ListModel(models.Model):
verbose_name = 'Throttle'
verbose_name_plural = "Throttle"
ordering = ['-id']
def __int__(self):
return self.pk
userprofile/models.py
+1 -4
View File
@@ -21,7 +21,4 @@ class Users(models.Model):
db_table = 'user_profile'
verbose_name = 'User Profile'
verbose_name_plural = "User Profile"
ordering = ['-id']
def __int__(self):
return self.pk
ordering = ['-id']
warehouse/models.py
+1 -4
View File
@@ -16,7 +16,4 @@ class ListModel(models.Model):
db_table = 'warehouse'
verbose_name = 'Warehouse'
verbose_name_plural = "Warehouse"
ordering = ['warehouse_name']
def __int__(self):
return self.pk
ordering = ['warehouse_name']