Начало Разгледай Помощ
Регистриране Влизане
Tamron
/
jdjos
Следи 2
Харесвам 0
Разклонение 0

Преглед на кода
Translate

Kimi.Huang преди 6 години
родител
b50be74919
ревизия
12027135f7
променени са 4 файла, в които са добавени 96 реда и са изтрити 15 реда
Покажи статистика за разликите
  1. 1 1
      requirements.txt
  2. 1 0
      requirements_dj.txt
  3. 80 0
      stock/migrations/0004_auto_20190304_1337.py
  4. 14 14
      stock/models.py

+ 1 - 1
requirements.txt
Преглед на файла 

@@ -1,7 +1,7 @@
1 1 
 StatusCode==1.0.0
2 2 
 furl==2.0.0
3 3 
 jsonfield==2.0.2
4 
-mysqlclient==1.3.13
4 
+mysqlclient==1.4.2
5 5 
 -r requirements_dj.txt
6 6 
 -r requirements_pywe.txt
7 7 
 -r requirements_redis.txt

+ 1 - 0
requirements_dj.txt
Преглед на файла 

@@ -10,6 +10,7 @@ django-redis-connector==1.0.1
10 10 
 django-response==1.1.1
11 11 
 django-rlog==1.0.7
12 12 
 django-short-url==1.1.3
13 
+django-shortuuidfield==0.1.3
13 14 
 django-six==1.0.4
14 15 
 django-uniapi==1.0.5
15 16 
 django-we==1.4.2

+ 80 - 0
stock/migrations/0004_auto_20190304_1337.py
Преглед на файла 

@@ -0,0 +1,80 @@
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.20 on 2019-03-04 05:37
3 
+from __future__ import unicode_literals
4 
+
5 
+from django.db import migrations, models
6 
+
7 
+
8 
+class Migration(migrations.Migration):
9 
+
10 
+    dependencies = [
11 
+        ('stock', '0003_auto_20190304_0549'),
12 
+    ]
13 
+
14 
+    operations = [
15 
+        migrations.AlterField(
16 
+            model_name='stockinfo',
17 
+            name='costPrice',
18 
+            field=models.IntegerField(default=0, help_text='\u8fdb\u4ef7', verbose_name='\u8fdb\u4ef7'),
19 
+        ),
20 
+        migrations.AlterField(
21 
+            model_name='stockinfo',
22 
+            name='estimateDate',
23 
+            field=models.DateTimeField(blank=True, help_text='\u9884\u8ba1\u5e93\u5b58\u65e5\u671f', null=True, verbose_name='\u9884\u8ba1\u5e93\u5b58\u65e5\u671f'),
24 
+        ),
25 
+        migrations.AlterField(
26 
+            model_name='stockinfo',
27 
+            name='estimateQuantity',
28 
+            field=models.IntegerField(default=0, help_text='\u9884\u8ba1\u5e93\u5b58\u6570\u91cf', verbose_name='\u9884\u8ba1\u5e93\u5b58\u6570\u91cf'),
29 
+        ),
30 
+        migrations.AlterField(
31 
+            model_name='stockinfo',
32 
+            name='inventoryDate',
33 
+            field=models.DateTimeField(blank=True, help_text='\u5e93\u5b58\u65e5\u671f', null=True, verbose_name='\u5e93\u5b58\u65e5\u671f'),
34 
+        ),
35 
+        migrations.AlterField(
36 
+            model_name='stockinfo',
37 
+            name='quantity',
38 
+            field=models.IntegerField(default=0, help_text='\u5206\u4ed3\u5e93\u5b58\u6570\u91cf', verbose_name='\u5206\u4ed3\u5e93\u5b58\u6570\u91cf'),
39 
+        ),
40 
+        migrations.AlterField(
41 
+            model_name='stockinfo',
42 
+            name='storeId',
43 
+            field=models.CharField(blank=True, help_text='\u4f9b\u5e94\u5546\u4ed3\u5e93ID', max_length=8, null=True, verbose_name='\u4f9b\u5e94\u5546\u4ed3\u5e93ID'),
44 
+        ),
45 
+        migrations.AlterField(
46 
+            model_name='stockinfo',
47 
+            name='storeName',
48 
+            field=models.CharField(blank=True, help_text='\u4f9b\u5e94\u5546\u4ed3\u5e93\u540d\u79f0', max_length=32, null=True, verbose_name='\u4f9b\u5e94\u5546\u4ed3\u5e93\u540d\u79f0'),
49 
+        ),
50 
+        migrations.AlterField(
51 
+            model_name='stockinfo',
52 
+            name='totalEstimateQuantity',
53 
+            field=models.IntegerField(default=0, help_text='\u9884\u8ba1\u5e93\u5b58\u603b\u91cf', verbose_name='\u9884\u8ba1\u5e93\u5b58\u603b\u91cf'),
54 
+        ),
55 
+        migrations.AlterField(
56 
+            model_name='stockinfo',
57 
+            name='totalQuantity',
58 
+            field=models.IntegerField(default=0, help_text='\u5e93\u5b58\u603b\u91cf', verbose_name='\u5e93\u5b58\u603b\u91cf'),
59 
+        ),
60 
+        migrations.AlterField(
61 
+            model_name='stockinfo',
62 
+            name='vendorCode',
63 
+            field=models.CharField(blank=True, help_text='\u4f9b\u5e94\u5546\u7b80\u7801', max_length=8, null=True, verbose_name='\u4f9b\u5e94\u5546\u7b80\u7801'),
64 
+        ),
65 
+        migrations.AlterField(
66 
+            model_name='stockinfo',
67 
+            name='vendorName',
68 
+            field=models.CharField(blank=True, help_text='\u4f9b\u5e94\u5546\u540d\u79f0', max_length=32, null=True, verbose_name='\u4f9b\u5e94\u5546\u540d\u79f0'),
69 
+        ),
70 
+        migrations.AlterField(
71 
+            model_name='stockinfo',
72 
+            name='vendorProductId',
73 
+            field=models.CharField(blank=True, db_index=True, help_text='\u4f9b\u5e94\u5546\u5546\u54c1ID', max_length=32, null=True, verbose_name='\u4f9b\u5e94\u5546\u5546\u54c1ID'),
74 
+        ),
75 
+        migrations.AlterField(
76 
+            model_name='stockinfo',
77 
+            name='vendorProductName',
78 
+            field=models.CharField(blank=True, help_text='\u4f9b\u5e94\u5546\u5546\u54c1\u540d\u79f0', max_length=255, null=True, verbose_name='\u4f9b\u5e94\u5546\u5546\u54c1\u540d\u79f0'),
79 
+        ),
80 
+    ]

+ 14 - 14
stock/models.py
Преглед на файла 

@@ -7,25 +7,25 @@ from shortuuidfield import ShortUUIDField
7 7
8 8
9 9 
 class StockInfo(BaseModelMixin):
10 
-    stock_id = ShortUUIDField(_(u'stock_id'), max_length=32, blank=True, null=True, help_text=u'Stock唯一标识', db_index=True)
10 
+    stock_id = ShortUUIDField(_(u'Stock唯一标识'), max_length=32, blank=True, null=True, help_text=u'Stock唯一标识', db_index=True)
11 11
12 
-    vendorCode = models.CharField(_(u'vendorCode'), max_length=8, blank=True, null=True, help_text=u'供应商简码')
13 
-    vendorName = models.CharField(_(u'vendorName'), max_length=32, blank=True, null=True, help_text=u'供应商名称')
14 
-    vendorProductId = models.CharField(_(u'vendorProductId'), max_length=32, blank=True, null=True, help_text=u'供应商商品ID', db_index=True)
15 
-    vendorProductName = models.CharField(_(u'vendorProductName'), max_length=255, blank=True, null=True, help_text=u'供应商商品名称')
12 
+    vendorCode = models.CharField(_(u'供应商简码'), max_length=8, blank=True, null=True, help_text=u'供应商简码')
13 
+    vendorName = models.CharField(_(u'供应商名称'), max_length=32, blank=True, null=True, help_text=u'供应商名称')
14 
+    vendorProductId = models.CharField(_(u'供应商商品ID'), max_length=32, blank=True, null=True, help_text=u'供应商商品ID', db_index=True)
15 
+    vendorProductName = models.CharField(_(u'供应商商品名称'), max_length=255, blank=True, null=True, help_text=u'供应商商品名称')
16 16
17 
-    storeId = models.CharField(_(u'storeId'), max_length=8, blank=True, null=True, help_text=u'供应商仓库ID')
18 
-    storeName = models.CharField(_(u'storeName'), max_length=32, blank=True, null=True, help_text=u'供应商仓库名称')
17 
+    storeId = models.CharField(_(u'供应商仓库ID'), max_length=8, blank=True, null=True, help_text=u'供应商仓库ID')
18 
+    storeName = models.CharField(_(u'供应商仓库名称'), max_length=32, blank=True, null=True, help_text=u'供应商仓库名称')
19 19 
     # 分仓库存数量=库存总量，预计库存数量=预计库存总量
20 
-    quantity = models.IntegerField(_(u'quantity'), default=0, help_text=u'分仓库存数量')
21 
-    estimateQuantity = models.IntegerField(_(u'estimateQuantity'), default=0, help_text=u'预计库存数量')
20 
+    quantity = models.IntegerField(_(u'分仓库存数量'), default=0, help_text=u'分仓库存数量')
21 
+    estimateQuantity = models.IntegerField(_(u'预计库存数量'), default=0, help_text=u'预计库存数量')
22 22
23 23 
     # Tamron 填写
24 
-    inventoryDate = models.DateTimeField(_(u'inventoryDate'), blank=True, null=True, help_text=_(u'库存日期'))
25 
-    totalQuantity = models.IntegerField(_(u'totalQuantity'), default=0, help_text=u'库存总量')
26 
-    estimateDate = models.DateTimeField(_(u'estimateDate'), blank=True, null=True, help_text=_(u'预计库存日期'))
27 
-    totalEstimateQuantity = models.IntegerField(_(u'totalEstimateQuantity'), default=0, help_text=u'预计库存总量')
28 
-    costPrice = models.IntegerField(_(u'costPrice'), default=0, help_text=u'进价')
24 
+    inventoryDate = models.DateTimeField(_(u'库存日期'), blank=True, null=True, help_text=_(u'库存日期'))
25 
+    totalQuantity = models.IntegerField(_(u'库存总量'), default=0, help_text=u'库存总量')
26 
+    estimateDate = models.DateTimeField(_(u'预计库存日期'), blank=True, null=True, help_text=_(u'预计库存日期'))
27 
+    totalEstimateQuantity = models.IntegerField(_(u'预计库存总量'), default=0, help_text=u'预计库存总量')
28 
+    costPrice = models.IntegerField(_(u'进价'), default=0, help_text=u'进价')
29 29
30 30 
     class Meta:
31 31 
         verbose_name = _(u'StockInfo')