V 2.1.20

Former-commit-id: b12954d95072d856d90b4e1d328ec928f8988635 [formerly 9607ffd12f6324e7183b18c455dd9cef744544d1] [formerly 26af61f6637497e817974f6767ebd8e8debc2c79 [formerly 8bff046e25f4ced22a2c627fa319b1dba954f41a]] [formerly 34830a37ed56c02563c692332e54678a6f06493b [formerly fc8908dbc7e616c36527e21d219aeba459df4d1d] [formerly a46fa80920aa9357719b867f1c7bf669c9aef44d [formerly df52800cdd8bbb2c14ceb81450928e3977bd216d]]] [formerly 5d8b12a46a9fe950c13b7a572da94582f1ecb288 [formerly 6ec8f837a1c0c81abb401cec6bbdd74c7907da40]] [formerly 13bb5aaebe24081fc412c590058d26477e5dcd7c [formerly 31645db44b64376f4c22be39e1700280ea0e4c0d] [formerly 13bb5aaebe24081fc412c590058d26477e5dcd7c [formerly 31645db44b64376f4c22be39e1700280ea0e4c0d] [formerly 43f535acfcd8f9dbe2d2d02aee86efdd783601b6 [formerly 54d90ac5965ca26599c522d57ae386e483c5b434]]] [formerly 5d8b12a46a9fe950c13b7a572da94582f1ecb288 [formerly 6ec8f837a1c0c81abb401cec6bbdd74c7907da40] [formerly 5d8b12a46a9fe950c13b7a572da94582f1ecb288 [formerly 6ec8f837a1c0c81abb401cec6bbdd74c7907da40] [formerly 9c5e088d156ed8d650caf86d1c482fea15813428 [formerly 51608fed29c790f195610f58364a72dfdcd332b1]]]]] [formerly b991327823f488b217e2c180161219c39b867aaf [formerly 2b7ef32841e223101e7a1abf616002b8bc1d6b24] [formerly b991327823f488b217e2c180161219c39b867aaf [formerly 2b7ef32841e223101e7a1abf616002b8bc1d6b24] [formerly c1f38f707cf8c8a09ff38715ffa69f14da260706 [formerly b62dd211b18e94ac43cf47f26521b925b38af510]]] [formerly d62258140b1c35b1e5fa785e3cab6420b7c8b895 [formerly 1fd76b1436d82e140afa3f51cd5eb00e2c9a2ad8] [formerly 84c63fe68a7f192c4241e3296b290190af2796bf [formerly d51d119bf7bc33ff873a9bdfa6758cea49926e08]]] [formerly 201c79e8f93518a9f26a84f5c0796dca93e6c6bd [formerly d61543e0542242681079c5dc523f1266f96d8fd5] [formerly 201c79e8f93518a9f26a84f5c0796dca93e6c6bd [formerly d61543e0542242681079c5dc523f1266f96d8fd5] [formerly b24abb559ef1b459a3f841db749c35230ba1f3de [formerly 2b495f24c830f889c82e67483055d5d041828ce3]]] [formerly 84c63fe68a7f192c4241e3296b290190af2796bf [formerly d51d119bf7bc33ff873a9bdfa6758cea49926e08] [formerly 84c63fe68a7f192c4241e3296b290190af2796bf [formerly d51d119bf7bc33ff873a9bdfa6758cea49926e08] [formerly bf3ce337106358f76852693e1edfd79c16783120 [formerly 81aef931eae91edb66029a75d39c29bbf8b63456 [formerly 2d346cfe738e1d15acb3a69d124433817401aefc] [formerly dd342df577ae6e8c707bd4a6258a584e1970c497 [formerly e0c58e549230ab36de460322380b9bbde9902268]] [formerly 2ead10378492dba155ff9e8fdf6444efed22d6aa [formerly ee7ecdb1952113eed20c1bfac9c267d0d102f56a] [formerly 6ec3983acba56b80ab6248fd969437a39a5805ec]] [formerly 6ec3983acba56b80ab6248fd969437a39a5805ec [formerly c0bfc06b2336a712cb5648c483af105d5404c293]] [formerly afef91609534f4a4ee71e9583dc652ad9458d6eb [formerly 6ec3983acba56b80ab6248fd969437a39a5805ec [formerly c0bfc06b2336a712cb5648c483af105d5404c293] [formerly afef91609534f4a4ee71e9583dc652ad9458d6eb [formerly 81d46633c91cbef20630a25198cc96ebf28ca3c7 [formerly 968a1a0154b9b5b3a02bc8e1def8ab03ef826364] [formerly afef91609534f4a4ee71e9583dc652ad9458d6eb [formerly 17095d6cc4]]]]]]]]]]]]
Former-commit-id: 0adf6b8ea773cf2cb7c97df0f437b62ce239aae0 [formerly 99e37cce60b89afc194e27c7976466513efe639d] [formerly bbb9480c22666e4656928617b1bcbe742063f67b [formerly 46ab77f0ba88f394969cf77e88842c84111a69cf]] [formerly 62b1a8c78c4ae1899138df7df4f6c393b967e907 [formerly f163bcd3a54dd26228a5eece5e11e7eaa6dab615] [formerly a9f3b223f3380ddab7d5f1b3a6271176da32a9bb [formerly a9ee5ada6c31752a27822f0c51f9611b38ab3007]]] [formerly 3da205010abc1eb64110bbfdbe289f7234e2c426 [formerly 444e93b9d87f74674c22c010c4813fa79e4f2fd6]] [formerly 09afa65b1bf3435bd3d9f08cacb60536b63f4d8d [formerly 44fa5642f5bc4785cbaf14d7c81f2da1ca563050] [formerly 09afa65b1bf3435bd3d9f08cacb60536b63f4d8d [formerly 44fa5642f5bc4785cbaf14d7c81f2da1ca563050] [formerly 87655449e7acd9f64a334e15bca0a75e51fba85b [formerly a2158397bdf8727dd0f59ef71fd05832c2416ccc]]] [formerly 3da205010abc1eb64110bbfdbe289f7234e2c426 [formerly 444e93b9d87f74674c22c010c4813fa79e4f2fd6] [formerly 3da205010abc1eb64110bbfdbe289f7234e2c426 [formerly 444e93b9d87f74674c22c010c4813fa79e4f2fd6] [formerly 9369053bec99131b84ad4ce181da4eb0992841bb [formerly 08030b969fee5a5e795f002296b3899929f84af1]]]]]
Former-commit-id: d654c7e6ba4bf4e9201d1fa196618c045ebfa34a [formerly 6e13e439a7e559e35bf369ef6cd1c702cc7ca1ff] [formerly d654c7e6ba4bf4e9201d1fa196618c045ebfa34a [formerly 6e13e439a7e559e35bf369ef6cd1c702cc7ca1ff] [formerly 71e1e5da6ca1c725d7b83930a72210472f220b82 [formerly fa1e89c2bc7a2fb957c41b2b4c56b9b9bd0cd6bb]]] [formerly fe6fe9427866ed74e3a85dfdcb004f4f7ed5d3b4 [formerly 9b7a2b40cd9ea81bcd698a1e20087a8e1802c217] [formerly fe6fe9427866ed74e3a85dfdcb004f4f7ed5d3b4 [formerly 9b7a2b40cd9ea81bcd698a1e20087a8e1802c217] [formerly 2f2211f3cedd8573b46b4b6c9a2cf8170730c2e1 [formerly e3655aa68b14df020bb6855902267af59b118312]]]]
Former-commit-id: 155ebe1621831a06bae5ff92178cdb6f11585442 [formerly 755ab00bf2b25536240f1bcdfdd7d29b1eb2753f] [formerly fe6fe9427866ed74e3a85dfdcb004f4f7ed5d3b4 [formerly 9b7a2b40cd9ea81bcd698a1e20087a8e1802c217]]
Former-commit-id: 47210ebe3eb53d7d085c76c23e217191c1dc5050 [formerly 56710c604e5faf6ef6961e5ba96218301371073f] [formerly 6787bec98e8f46d234cd9f1748e761727b23bba4 [formerly a0cafe6af51599824a763a83bc688d0be363bc15]]
Former-commit-id: d47d29882629e90ab027596b979d8b05b7624fe8 [formerly da86bb923f3078896cf12b7b353729b6b38cc23a]
Former-commit-id: 61f26ad5bd299a2e12bb03a1bf9f36ed63882938
Former-commit-id: fad87ae1cf4eaa4df2092b9cbfaf31decc430d03 [formerly f0d8c95699d7c02c6ad5556301dd8ed9de99c0fd]
Former-commit-id: 51fde9d593d833fa2bda84c5e55c309233347e15
Former-commit-id: a222e7a323 [formerly b4fdc601d55998c29331cf4194054ad91481bb0a] [formerly 1ae266aa621aa33e82cf19486de60c2d9edf3e01 [formerly 0ba2db2f9d9ef254022d7b4372c5bd66b10e8bf5]] [formerly 2068091ee22ad88cecfa94e67cef4c7b1d8ba246] [formerly 79ce38ecb3b903f89576fbb3fa6932af536fde53 [formerly 9cac0037c75ff83be48a9398292a2070d8e47c24 [formerly 69edb3993b4ecc22479e7a200d1af09d6e444337] [formerly fc770cd8ad7cb3fe458731f7da4688b3d080d9c8 [formerly 0aefe60561776ed6ce265a16fd59998b3b8cb922]]]]
Former-commit-id: 54dd6ae0366458d47067fae66ccd993d4cc8c654 [formerly 899abc323589343b1fbc4f3299105c5a213eb80f [formerly f97073d6c6f0a57ff490189c1d8e8c32bac6b1ec] [formerly b44fccd48da5e0603f9ccb8607d8d109f3745e92 [formerly 04e21e972439462233ee3848ff1adb1d7cf89e28]]]
Former-commit-id: 95b6cbb7e4ece1ce81f04bb0ac9a60422edd2590
Former-commit-id: 55659e97f8f749983c04a1309701ecc83d9ff45b [formerly 36f0e13578d53a3dcc5bac3d631ad86fae244298]
Former-commit-id: bd8a4bf7ca0469720f82670b3e9050edcbf31486

asn/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from . models import AsnListModel, AsnDetailModel
+from .models import AsnListModel, AsnDetailModel
 
 admin.site.register(AsnListModel)
 admin.site.register(AsnDetailModel)

asn/models.py

@@ -17,11 +17,11 @@ class AsnListModel(models.Model):
 
     class Meta:
         db_table = 'asnlist'
-        verbose_name = 'ASN_List'
-        verbose_name_plural = "ASN_List"
+        verbose_name = 'ASN List'
+        verbose_name_plural = "ASN List"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk
 
 class AsnDetailModel(models.Model):
@@ -46,10 +46,10 @@ class AsnDetailModel(models.Model):
 
     class Meta:
         db_table = 'asndetail'
-        verbose_name = 'ASN_Detail'
-        verbose_name_plural = "ASN_Detail"
+        verbose_name = 'ASN Detail'
+        verbose_name_plural = "ASN Detail"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk
 

binproperty/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

binproperty/models.py

@@ -11,8 +11,8 @@ class ListModel(models.Model):
     class Meta:
         db_table = 'binproperty'
         verbose_name = 'Bin Property'
-        verbose_name_plural = "Bin_Property"
+        verbose_name_plural = "Bin Property"
         ordering = ['bin_property']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

binset/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

binset/models.py

@@ -14,9 +14,9 @@ class ListModel(models.Model):
 
     class Meta:
         db_table = 'binset'
-        verbose_name = 'Bin_Set'
-        verbose_name_plural = "Bin_Set"
+        verbose_name = 'Bin Set'
+        verbose_name_plural = "Bin Set"
         ordering = ['bin_name']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

binsize/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

binsize/models.py

@@ -13,9 +13,9 @@ class ListModel(models.Model):
 
     class Meta:
         db_table = 'binsize'
-        verbose_name = 'Bin_Size'
-        verbose_name_plural = "Bin_Size"
+        verbose_name = 'Bin Size'
+        verbose_name_plural = "Bin Size"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

capital/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

capital/models.py

@@ -16,5 +16,5 @@ class ListModel(models.Model):
         verbose_name_plural = "Capital"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

chat/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

chat/models.py

@@ -15,5 +15,5 @@ class ListModel(models.Model):
         verbose_name_plural = "Chat"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

company/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

company/models.py

@@ -18,5 +18,5 @@ class ListModel(models.Model):
         verbose_name_plural = "Company"
         ordering = ['company_name']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

customer/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

customer/models.py

@@ -19,5 +19,5 @@ class ListModel(models.Model):
         verbose_name_plural = "Customer"
         ordering = ['customer_name']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

cyclecount/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import CyclecountModeDayModel
+from .models import CyclecountModeDayModel
 
 admin.site.register(CyclecountModeDayModel)

cyclecount/models.py

@@ -12,11 +12,11 @@ class QTYRecorder(models.Model):
 
     class Meta:
         db_table = 'qtyrecorder'
-        verbose_name = 'QTY_Recorder'
-        verbose_name_plural = "QTY_Recorder"
+        verbose_name = 'QTY Recorder'
+        verbose_name_plural = "QTY Recorder"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk
 
 class CyclecountModeDayModel(models.Model):
@@ -34,9 +34,9 @@ class CyclecountModeDayModel(models.Model):
 
     class Meta:
         db_table = 'cyclecountday'
-        verbose_name = 'Cyclecount_Day'
-        verbose_name_plural = "Cyclecount_Day"
+        verbose_name = 'Cyclecount Day'
+        verbose_name_plural = "Cyclecount Day"
         ordering = ['openid']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

dn/admin.py

@@ -1,5 +1,6 @@
 from django.contrib import admin
-from . models import DnListModel, DnDetailModel
+from .models import DnListModel, DnDetailModel, PickingListModel
 
 admin.site.register(DnListModel)
 admin.site.register(DnDetailModel)
+admin.site.register(PickingListModel)

dn/models.py

@@ -18,11 +18,11 @@ class DnListModel(models.Model):
 
     class Meta:
         db_table = 'dnlist'
-        verbose_name = 'DN_List'
-        verbose_name_plural = "DN_List"
+        verbose_name = 'DN List'
+        verbose_name_plural = "DN List"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk
 
 class DnDetailModel(models.Model):
@@ -50,11 +50,11 @@ class DnDetailModel(models.Model):
 
     class Meta:
         db_table = 'dndetail'
-        verbose_name = 'DN_Detail'
-        verbose_name_plural = "DN_Detail"
+        verbose_name = 'DN Detail'
+        verbose_name_plural = "DN Detail"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk
 
 class PickingListModel(models.Model):
@@ -71,9 +71,9 @@ class PickingListModel(models.Model):
 
     class Meta:
         db_table = 'pickinglist'
-        verbose_name = 'data id'
-        verbose_name_plural = "data id"
+        verbose_name = 'Picking List'
+        verbose_name_plural = "Picking List"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

driver/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

driver/models.py

@@ -16,7 +16,7 @@ class ListModel(models.Model):
         verbose_name_plural = "Driver"
         ordering = ['driver_name']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk
 
 class DispatchListModel(models.Model):
@@ -30,9 +30,9 @@ class DispatchListModel(models.Model):
 
     class Meta:
         db_table = 'dispatchlist'
-        verbose_name = 'Dispatch_List'
-        verbose_name_plural = "Dispatch_List"
+        verbose_name = 'Dispatch List'
+        verbose_name_plural = "Dispatch List"
         ordering = ['-create_time']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

goods/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

goods/models.py

@@ -1,7 +1,7 @@
 from django.db import models
 
 class ListModel(models.Model):
-    goods_code = models.CharField(max_length=255, verbose_name="Goods Name")
+    goods_code = models.CharField(max_length=255, verbose_name="Goods Code")
     goods_desc = models.CharField(max_length=255, verbose_name="Goods Description")
     goods_supplier = models.CharField(max_length=255, verbose_name="Goods Supplier")
     goods_weight = models.FloatField(default=0, verbose_name="Goods Weight")
@@ -28,9 +28,9 @@ class ListModel(models.Model):
 
     class Meta:
         db_table = 'goods'
-        verbose_name = 'Goods_List'
-        verbose_name_plural = "Goods_List"
+        verbose_name = 'Goods List'
+        verbose_name_plural = "Goods List"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

goods/serializers.py

@@ -34,7 +34,7 @@ class GoodsGetSerializer(serializers.ModelSerializer):
 
 class GoodsPostSerializer(serializers.ModelSerializer):
     openid = serializers.CharField(read_only=False, required=False, validators=[datasolve.openid_validate])
-    goods_code = serializers.CharField(read_only=False, required=True, max_length=15, min_length=1,
+    goods_code = serializers.CharField(read_only=False, required=True, min_length=1,
                                        validators=[datasolve.data_validate])
     goods_desc = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
     goods_supplier = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
@@ -66,7 +66,7 @@ class GoodsPostSerializer(serializers.ModelSerializer):
 
 class GoodsUpdateSerializer(serializers.ModelSerializer):
     goods_code = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate],
-                                       max_length=15, min_length=1)
+                                       min_length=1)
     goods_desc = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
     goods_supplier = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
     goods_weight = serializers.FloatField(read_only=False, required=True, validators=[datasolve.data_validate])
@@ -93,7 +93,7 @@ class GoodsUpdateSerializer(serializers.ModelSerializer):
 
 class GoodsPartialUpdateSerializer(serializers.ModelSerializer):
     goods_code = serializers.CharField(read_only=False, required=False, validators=[datasolve.data_validate],
-                                       max_length=15, min_length=1)
+                                       min_length=1)
     goods_desc = serializers.CharField(read_only=False, required=False, validators=[datasolve.data_validate])
     goods_supplier = serializers.CharField(read_only=False, required=False, validators=[datasolve.data_validate])
     goods_weight = serializers.FloatField(read_only=False, required=False, validators=[datasolve.data_validate])

goods/views.py

@@ -135,8 +135,6 @@ class APIViewSet(viewsets.ModelViewSet):
     def create(self, request, *args, **kwargs):
         data = self.request.data
         data['openid'] = self.request.auth.openid
-        if len(data['goods_code']) > 15:
-            raise APIException({"detail": "Goods Code No more than 15 characters"})
         data['unit_volume'] = round(
             (float(data['goods_w']) * float(data['goods_d']) * float(data['goods_h'])) / 1000000000, 4)
         if ListModel.objects.filter(openid=data['openid'], goods_code=data['goods_code'], is_delete=False).exists():
@@ -194,8 +192,6 @@ class APIViewSet(viewsets.ModelViewSet):
             raise APIException({"detail": "Cannot update data which not yours"})
         else:
             data = self.request.data
-            if len(data['goods_code']) > 15:
-                raise APIException({"detail": "Goods Code No more than 15 characters"})
             data['unit_volume'] = round(
                 (float(data['goods_w']) * float(data['goods_d']) * float(data['goods_h'])) / 1000000000, 4)
             if supplier.objects.filter(openid=self.request.auth.openid, supplier_name=data['goods_supplier'],

goodsbrand/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

goodsbrand/models.py

@@ -1,7 +1,7 @@
 from django.db import models
 
 class ListModel(models.Model):
-    goods_brand = models.CharField(max_length=32, verbose_name="Goods Brand")
+    goods_brand = models.CharField(max_length=255, verbose_name="Goods Brand")
     creater = models.CharField(max_length=255, verbose_name="Who created")
     openid = models.CharField(max_length=255, verbose_name="Openid")
     is_delete = models.BooleanField(default=False, verbose_name='Delete Label')
@@ -10,9 +10,9 @@ class ListModel(models.Model):
 
     class Meta:
         db_table = 'goodsbrand'
-        verbose_name = 'Goods_Brand'
-        verbose_name_plural = "Goods_Brand"
+        verbose_name = 'Goods Brand'
+        verbose_name_plural = "Goods Brand"
         ordering = ['goods_brand']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

goodsclass/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

goodsclass/models.py

@@ -1,7 +1,7 @@
 from django.db import models
 
 class ListModel(models.Model):
-    goods_class = models.CharField(max_length=32, verbose_name="Goods Class")
+    goods_class = models.CharField(max_length=255, verbose_name="Goods Class")
     creater = models.CharField(max_length=255, verbose_name="Who created")
     openid = models.CharField(max_length=255, verbose_name="Openid")
     is_delete = models.BooleanField(default=False, verbose_name='Delete Label')
@@ -10,9 +10,9 @@ class ListModel(models.Model):
 
     class Meta:
         db_table = 'goodsclass'
-        verbose_name = 'Goods_Class'
-        verbose_name_plural = "Goods_Class"
+        verbose_name = 'Goods Class'
+        verbose_name_plural = "Goods Class"
         ordering = ['goods_class']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

goodscolor/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

goodscolor/models.py

@@ -1,7 +1,7 @@
 from django.db import models
 
 class ListModel(models.Model):
-    goods_color = models.CharField(max_length=32, verbose_name="Goods Color")
+    goods_color = models.CharField(max_length=255, verbose_name="Goods Color")
     creater = models.CharField(max_length=255, verbose_name="Who created")
     openid = models.CharField(max_length=255, verbose_name="Openid")
     is_delete = models.BooleanField(default=False, verbose_name='Delete Label')
@@ -10,9 +10,9 @@ class ListModel(models.Model):
 
     class Meta:
         db_table = 'goodscolor'
-        verbose_name = 'Goods_Color'
-        verbose_name_plural = "Goods_Color"
+        verbose_name = 'Goods Color'
+        verbose_name_plural = "Goods Color"
         ordering = ['goods_color']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

goodsorigin/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

goodsorigin/models.py

@@ -1,7 +1,7 @@
 from django.db import models
 
 class ListModel(models.Model):
-    goods_origin = models.CharField(max_length=32, verbose_name="Goods Origin")
+    goods_origin = models.CharField(max_length=255, verbose_name="Goods Origin")
     creater = models.CharField(max_length=255, verbose_name="Who created")
     openid = models.CharField(max_length=255, verbose_name="Openid")
     is_delete = models.BooleanField(default=False, verbose_name='Delete Label')
@@ -10,9 +10,9 @@ class ListModel(models.Model):
 
     class Meta:
         db_table = 'goodsorigin'
-        verbose_name = 'Goods_Origin'
-        verbose_name_plural = "Goods_Origin"
+        verbose_name = 'Goods Origin'
+        verbose_name_plural = "Goods Origin"
         ordering = ['goods_origin']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

goodsshape/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

goodsshape/models.py

@@ -1,7 +1,7 @@
 from django.db import models
 
 class ListModel(models.Model):
-    goods_shape = models.CharField(max_length=32, verbose_name="Goods Shape")
+    goods_shape = models.CharField(max_length=255, verbose_name="Goods Shape")
     creater = models.CharField(max_length=255, verbose_name="Who created")
     openid = models.CharField(max_length=255, verbose_name="Openid")
     is_delete = models.BooleanField(default=False, verbose_name='Delete Label')
@@ -10,9 +10,9 @@ class ListModel(models.Model):
 
     class Meta:
         db_table = 'goodsshape'
-        verbose_name = 'Goods_Shape'
-        verbose_name_plural = "Goods_Shape"
+        verbose_name = 'Goods Shape'
+        verbose_name_plural = "Goods Shape"
         ordering = ['goods_shape']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

goodsspecs/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

goodsspecs/models.py

@@ -1,7 +1,7 @@
 from django.db import models
 
 class ListModel(models.Model):
-    goods_specs = models.CharField(max_length=32, verbose_name="Goods Specs")
+    goods_specs = models.CharField(max_length=255, verbose_name="Goods Specs")
     creater = models.CharField(max_length=255, verbose_name="Who created")
     openid = models.CharField(max_length=255, verbose_name="Openid")
     is_delete = models.BooleanField(default=False, verbose_name='Delete Label')
@@ -10,9 +10,9 @@ class ListModel(models.Model):
 
     class Meta:
         db_table = 'goodsspecs'
-        verbose_name = 'Goods_Specs'
-        verbose_name_plural = "Goods_Specs"
+        verbose_name = 'Goods Specs'
+        verbose_name_plural = "Goods Specs"
         ordering = ['goods_specs']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

goodsunit/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

goodsunit/models.py

@@ -1,7 +1,7 @@
 from django.db import models
 
 class ListModel(models.Model):
-    goods_unit = models.CharField(max_length=32, verbose_name="Goods Unit")
+    goods_unit = models.CharField(max_length=255, verbose_name="Goods Unit")
     creater = models.CharField(max_length=255, verbose_name="Who created")
     openid = models.CharField(max_length=255, verbose_name="Openid")
     is_delete = models.BooleanField(default=False, verbose_name='Delete Label')
@@ -10,9 +10,9 @@ class ListModel(models.Model):
 
     class Meta:
         db_table = 'goodsunit'
-        verbose_name = 'Goods_Unit'
-        verbose_name_plural = "Goods_Unit"
+        verbose_name = 'Goods Unit'
+        verbose_name_plural = "Goods Unit"
         ordering = ['goods_unit']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

greaterwms/settings.py

@@ -14,7 +14,7 @@ get_random_secret_key()
 SECRET_KEY = get_random_secret_key()
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True
 
 ALLOWED_HOSTS = ['*']
 

greaterwms/urls.py

@@ -30,7 +30,7 @@ schema_view = get_schema_view(
         """
        ,
        terms_of_service="https://www.56yhz.com/",
-       license=openapi.License(name="GPLv3"),
+       license=openapi.License(name="APLv2"),
     ),
     public=True,
     generator_class=CustomOpenAPISchemaGenerator,

greaterwms/views.py

@@ -22,7 +22,6 @@ def vcheck(request):
         return JsonResponse({"detail": "Please Choose Your Platform"})
     return JsonResponse({"upurl": upurl})
 
-
 def robots(request):
     path = settings.BASE_DIR + request.path_info
     content_type, encoding = mimetypes.guess_type(path)
@@ -30,7 +29,6 @@ def robots(request):
     resp['Cache-Control'] = "max-age=864000000000"
     return resp
 
-
 def favicon(request):
     path = str(settings.BASE_DIR) + '/static/img/logo.png'
     content_type, encoding = mimetypes.guess_type(path)
@@ -38,7 +36,6 @@ def favicon(request):
     resp['Cache-Control'] = "max-age=864000000000"
     return resp
 
-
 def css(request):
     path = str(settings.BASE_DIR) + '/templates/dist/spa' + request.path_info
     content_type, encoding = mimetypes.guess_type(path)
@@ -46,7 +43,6 @@ def css(request):
     resp['Cache-Control'] = "max-age=864000000000"
     return resp
 
-
 def js(request):
     path = str(settings.BASE_DIR) + '/templates/dist/spa' + request.path_info
     content_type, encoding = mimetypes.guess_type(path)
@@ -54,7 +50,6 @@ def js(request):
     resp['Cache-Control'] = "max-age=864000000000"
     return resp
 
-
 def statics(request):
     path = str(settings.BASE_DIR) + '/templates/dist/spa' + request.path_info
     content_type, encoding = mimetypes.guess_type(path)
@@ -62,7 +57,6 @@ def statics(request):
     resp['Cache-Control'] = "max-age=864000000000"
     return resp
 
-
 def fonts(request):
     path = str(settings.BASE_DIR) + '/templates/dist/spa' + request.path_info
     content_type, encoding = mimetypes.guess_type(path)
@@ -70,13 +64,6 @@ def fonts(request):
     resp['Cache-Control'] = "max-age=864000000000"
     return resp
 
-def pdf(request):
-    path = str(settings.BASE_DIR) + '/templates/dist/spa' + request.path_info
-    content_type, encoding = mimetypes.guess_type(path)
-    resp = StreamingHttpResponse(FileWrapper(open(path, 'rb')), content_type=content_type)
-    resp['Cache-Control'] = "max-age=864000000000"
-    return resp
-
 def myip(request):
     import socket
     s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)

payment/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import TransportationFeeListModel
+from .models import TransportationFeeListModel
 
 admin.site.register(TransportationFeeListModel)

payment/models.py

@@ -15,9 +15,9 @@ class TransportationFeeListModel(models.Model):
 
     class Meta:
         db_table = 'transportationfee'
-        verbose_name = 'Transportation_Fee'
-        verbose_name_plural = "Transportation_Fee"
+        verbose_name = 'Transportation Fee'
+        verbose_name_plural = "Transportation Fee"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

scanner/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

scanner/models.py

@@ -14,5 +14,5 @@ class ListModel(models.Model):
         verbose_name_plural = "Scanner"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

shopid/apps.py

@@ -1,5 +1,4 @@
 from django.apps import AppConfig
 
-
 class ShopidConfig(AppConfig):
     name = 'shopid'

shopid/models/douyinmodels.py

@@ -3,8 +3,8 @@ from django.db import models
 class ListModel(models.Model):
     openid = models.CharField(max_length=255, verbose_name="user appid")
     appid = models.CharField(max_length=255, verbose_name="user appid")
-    shop_name = models.CharField(max_length=32, verbose_name="店铺名称")
-    shop_mode = models.CharField(max_length=32, verbose_name="店铺平台")
+    shop_name = models.CharField(max_length=255, verbose_name="店铺名称")
+    shop_mode = models.CharField(max_length=255, verbose_name="店铺平台")
     shop_appid = models.CharField(max_length=255, verbose_name="店铺appid")
     shop_app_secret = models.CharField(max_length=255, verbose_name="店铺app secret")
     shop_id = models.CharField(max_length=255, verbose_name='店铺id')
@@ -17,9 +17,9 @@ class ListModel(models.Model):
 
     class Meta:
         db_table = 'douyinshop'
-        verbose_name = 'DouYin_Shop'
-        verbose_name_plural = "DouYin_Shop"
+        verbose_name = 'DouYin Shop'
+        verbose_name_plural = "DouYin Shop"
         ordering = ['id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

staff/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

staff/models.py

@@ -16,7 +16,7 @@ class ListModel(models.Model):
         verbose_name_plural = "Staff"
         ordering = ['staff_name']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk
 
 class TypeListModel(models.Model):
@@ -28,9 +28,9 @@ class TypeListModel(models.Model):
 
     class Meta:
         db_table = 'stafftype'
-        verbose_name = 'Staff_Type'
-        verbose_name_plural = "Staff_Type"
+        verbose_name = 'Staff Type'
+        verbose_name_plural = "Staff Type"
         ordering = ['staff_type']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

stock/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from . models import StockListModel, StockBinModel
+from .models import StockListModel, StockBinModel
 
 admin.site.register(StockListModel)
 admin.site.register(StockBinModel)

stock/models.py

@@ -1,7 +1,7 @@
 from django.db import models
 
 class StockListModel(models.Model):
-    goods_code = models.CharField(max_length=32, verbose_name="Goods Code")
+    goods_code = models.CharField(max_length=255, verbose_name="Goods Code")
     goods_desc = models.CharField(max_length=255, verbose_name="Goods Description")
     goods_qty = models.BigIntegerField(default=0, verbose_name="Total Qty")
     onhand_stock = models.BigIntegerField(default=0, verbose_name='On Hand Stock')
@@ -25,11 +25,11 @@ class StockListModel(models.Model):
 
     class Meta:
         db_table = 'stocklist'
-        verbose_name = 'Stock_List'
-        verbose_name_plural = "Stock_List"
+        verbose_name = 'Stock List'
+        verbose_name_plural = "Stock List"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk
 
 class StockBinModel(models.Model):
@@ -48,9 +48,9 @@ class StockBinModel(models.Model):
 
     class Meta:
         db_table = 'stockbin'
-        verbose_name = 'Stock_Bin'
-        verbose_name_plural = "Stock_Bin"
+        verbose_name = 'Stock Bin'
+        verbose_name_plural = "Stock Bin"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

supplier/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

supplier/models.py

@@ -19,5 +19,5 @@ class ListModel(models.Model):
         verbose_name_plural = "Supplier"
         ordering = ['supplier_name']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

templates/dist/spa/index.html

@@ -1,4 +1,4 @@
 <!DOCTYPE html><html><head><title>GreaterWMS--Open Source Warehouse Management System</title><meta charset=utf-8><meta name=description content="GreaterWMS--Open Source Warehouse Management System"><meta name=keywords content="greaterwms, 聚商汇wms,wms-system,open source wms system,开源wms,开源仓库管理软件,warehouse management system, free wms"><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png href=statics/icons/logo.png><script src=./statics/baseurl.js></script><script async src="https://www.googletagmanager.com/gtag/js?id=G-1TRGFWFWSZ"></script><script>window.dataLayer = window.dataLayer || [];
       function gtag(){dataLayer.push(arguments);}
       gtag('js', new Date());
-      gtag('config', 'G-1TRGFWFWSZ');</script><link href=css/vendor.cf386d26.css rel=stylesheet><link href=css/app.45730797.css rel=stylesheet></head><body style="overflow-x: hidden; overflow-y: hidden"><div id=q-app></div><script src=js/vendor.2d86aeb1.js></script><script src=js/app.884dfcb0.js></script></body></html>
+      gtag('config', 'G-1TRGFWFWSZ');</script><link href=css/vendor.cf386d26.css rel=stylesheet><link href=css/app.45730797.css rel=stylesheet></head><body style="overflow-x: hidden; overflow-y: hidden"><div id=q-app></div><script src=js/vendor.2d86aeb1.js></script><script src=js/app.00ea83c1.js></script></body></html>

templates/dist/spa/js/app.00ea83c1.js.REMOVED.git-id

@@ -0,0 +1 @@
+e1f4f4676de5598e5a5481dee7dd20208ce84d7a

templates/dist/spa/js/app.884dfcb0.js.REMOVED.git-id

@@ -1 +0,0 @@
-8d02dfddd95daa8c467708e9dfafcfb6e32d97c9

templates/src/pages/scan/zebrascan.vue

@@ -375,12 +375,7 @@ function barcodeScanned (scanData, timeOfScan) {
 }
 
 function playSuccAudio () {
-  var my_media = new Media(baseurl + 'media/scanned.mp3')
-  my_media.play()
-  setTimeout(function () {
-    my_media.pause()
-    my_media.stop()
-  }, 1000)
+  navigator.notification.beep(1)
 }
 
 export default {

throttle/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

throttle/models.py

@@ -14,5 +14,5 @@ class ListModel(models.Model):
         verbose_name_plural = "Throttle"
         ordering = ['-id']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk

userprofile/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import Users
+from .models import Users
 
 admin.site.register(Users)

userprofile/models.py

@@ -16,3 +16,12 @@ class Users(models.Model):
     avatar = models.CharField(max_length=100, default='/static/img/user.jpg', verbose_name='Staff Avatar')
     create_time = models.DateTimeField(auto_now_add=True, verbose_name='Create Time')
     update_time = models.DateTimeField(auto_now=True, verbose_name='Update Time')
+
+    class Meta:
+        db_table = 'user_profile'
+        verbose_name = 'User Profile'
+        verbose_name_plural = "User Profile"
+        ordering = ['-id']
+
+    def __int__(self):
+        return self.pk

utils/agv.py

@@ -1,106 +0,0 @@
-import requests, os, django, random
-from django.utils import timezone
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'greaterwms.settings')
-os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = "true"
-django.setup()
-from tasklist.models import ListModel as ls
-
-
-def orderTime():
-    return random.randint(100000,999999)
-
-def agvmove(from_bin, to_bin):
-    orderid = str(timezone.now().strftime('%Y%m%d%H%M%S')) + str(orderTime())
-    task_move = str(from_bin + ',' + to_bin)
-    data = {
-        "modelProcessCode": 'FJ',
-        "priority": 6,
-        "orderId": str(orderid),
-        "formSystem": 'WMS',
-        "taskOrderDetail": [
-            {
-                "taskPath": task_move,
-            }
-        ]
-    }
-    response = requests.post(url='http://137.12.129.143:7000/ics/taskOrder/addTask', json=data)
-    if response.status_code == '200':
-        ls.objects.create(tasklist=orderid,
-                          mode=0,
-                          from_bin=from_bin,
-                          to_bin=to_bin)
-        return 'success'
-    else:
-        return 'failed'
-
-def agvreceive(from_bin, to_bin):
-    orderid = str(timezone.now().strftime('%Y%m%d%H%M%S')) + str(orderTime())
-    task_move = str(from_bin + ',' + to_bin)
-    data = {
-        "modelProcessCode": 'CK',
-        "priority": 6,
-        "orderId": str(orderid),
-        "formSystem": 'WMS',
-        "taskOrderDetail": [
-            {
-                "taskPath": task_move,
-            }
-        ]
-    }
-    response = requests.post(url='http://137.12.129.143:7000/ics/taskOrder/addTask', json=data)
-    if response.status_code == '200':
-        ls.objects.create(tasklist=orderid,
-                          mode=1,
-                          from_bin=from_bin,
-                          to_bin=to_bin)
-        return 'success'
-    else:
-        return 'failed'
-
-def agvsend(from_bin, to_bin):
-    orderid = str(timezone.now().strftime('%Y%m%d%H%M%S')) + str(orderTime())
-    task_move = str(from_bin + ',' + to_bin)
-    data = {
-        "modelProcessCode": 'RK',
-        "priority": 6,
-        "orderId": str(orderid),
-        "formSystem": 'WMS',
-        "taskOrderDetail": [
-            {
-                "taskPath": task_move,
-            }
-        ]
-    }
-    response = requests.post(url='http://137.12.129.143:7000/ics/taskOrder/addTask', json=data)
-    if response.status_code == '200':
-        ls.objects.create(tasklist=orderid,
-                    mode=2,
-                    from_bin=from_bin,
-                    to_bin=to_bin)
-        return 'success'
-    else:
-        return 'failed'
-
-def agvback(from_bin, to_bin):
-    orderid = str(timezone.now().strftime('%Y%m%d%H%M%S')) + str(orderTime())
-    task_move = str(from_bin + ',' + to_bin)
-    data = {
-        "modelProcessCode": 'Cancel',
-        "priority": 6,
-        "orderId": str(orderid),
-        "formSystem": 'WMS',
-        "taskOrderDetail": [
-            {
-                "taskPath": task_move,
-            }
-        ]
-    }
-    response = requests.post(url='http://137.12.129.143:7000/ics/taskOrder/addTask', json=data)
-    if response.status_code == '200':
-        ls.objects.create(tasklist=orderid,
-                    mode=3,
-                    from_bin=from_bin,
-                    to_bin=to_bin)
-        return 'success'
-    else:
-        return 'failed'

warehouse/admin.py

@@ -1,4 +1,4 @@
 from django.contrib import admin
-from . models import ListModel
+from .models import ListModel
 
 admin.site.register(ListModel)

warehouse/models.py

@@ -18,5 +18,5 @@ class ListModel(models.Model):
         verbose_name_plural = "Warehouse"
         ordering = ['warehouse_name']
 
-    def __str__(self):
+    def __int__(self):
         return self.pk