首页 探索 帮助
注册 登录
Tamron
/
jdjos
关注 2
点赞 0
派生 0

浏览代码
Opt

Kimi.Huang 6 年之前
父节点
667f8484be
当前提交
a9ff98ee71
共有 4 个文件被更改，包括 68 次插入 和 7 次删除
显示文件统计
  1. 1 0
      jdjos/urls.py
  2. 4 5
      stock/admin.py
  3. 53 0
      stock/migrations/0006_auto_20190305_1212.py
  4. 10 2
      stock/models.py

+ 1 - 0
jdjos/urls.py
查看文件 

@@ -55,3 +55,4 @@ urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
55 55 
 admin.site.site_title = '[腾龙]京东EDI管理系统'
56 56 
 admin.site.site_header = '[腾龙]京东EDI管理系统'
57 57 
 admin.site.site_url = None
58 
+admin.site.index_title = None

+ 4 - 5
stock/admin.py
查看文件 

@@ -1,8 +1,7 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 3 
 from django.contrib import admin
4 
-from django_admin import (AdvancedExportExcelModelAdmin, ChangeOnlyModelAdmin, ReadOnlyModelAdmin,
5 
-                          SpecifiedQuantityQuerySetModelAdmin)
4 
+from django_admin import ChangeOnlyModelAdmin, SpecifiedQuantityQuerySetModelAdmin
6 5
7 6 
 from stock.models import StockInfo, StockSendInfo
8 7 
 from utils.redis.connect import r
 
@@ -11,7 +10,6 @@ from utils.stock_utils import send_all_stock_info
11 10
12 11
13 12 
 class StockInfoAdmin(ChangeOnlyModelAdmin, admin.ModelAdmin):
14 
-    # list_display = ('stock_id', 'vendorCode', 'vendorName', 'vendorProductId', 'vendorProductName', 'storeId', 'storeName', 'quantity', 'estimateQuantity', 'inventoryDate', 'totalQuantity', 'estimateDate', 'totalEstimateQuantity', 'costPrice', 'status', 'created_at', 'updated_at')
15 13 
     list_display = ('vendorProductId', 'vendorProductName', 'inventoryDate', 'totalQuantity', 'estimateDate', 'totalEstimateQuantity', 'costPrice', 'updated_at')
16 14 
     readonly_fields = ('stock_id', 'vendorCode', 'vendorName', 'vendorProductId', 'vendorProductName', 'storeId', 'storeName', 'quantity', 'estimateQuantity', 'status')
17 15 
 
@@ -23,11 +21,12 @@ class StockInfoAdmin(ChangeOnlyModelAdmin, admin.ModelAdmin):
23 21
24 22 
 class StockSendInfoAdmin(SpecifiedQuantityQuerySetModelAdmin, ChangeOnlyModelAdmin, admin.ModelAdmin):
25 23 
     list_display = ('pk', 'submit')
26 
-    readonly_fields = ('status', )
24 
+    exclude = ('status', )
27 25
28 26 
     def save_model(self, request, obj, form, change):
29 27 
         obj.save()
30 
-        send_all_stock_info()
28 
+        if obj.submit:
29 
+            send_all_stock_info()
31 30
32 31
33 32 
 admin.site.register(StockInfo, StockInfoAdmin)

+ 53 - 0
stock/migrations/0006_auto_20190305_1212.py
查看文件 

@@ -0,0 +1,53 @@
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.20 on 2019-03-05 04:12
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', '0005_stocksendinfo'),
12 
+    ]
13 
+
14 
+    operations = [
15 
+        migrations.AlterModelOptions(
16 
+            name='stockinfo',
17 
+            options={'verbose_name': '1\u3001\u5e93\u5b58\u6570\u636e\u8c03\u6574', 'verbose_name_plural': '1\u3001\u5e93\u5b58\u6570\u636e\u8c03\u6574'},
18 
+        ),
19 
+        migrations.AlterModelOptions(
20 
+            name='stocksendinfo',
21 
+            options={'verbose_name': '2\u3001\u5e93\u5b58\u6570\u636e\u63d0\u4ea4', 'verbose_name_plural': '2\u3001\u5e93\u5b58\u6570\u636e\u63d0\u4ea4'},
22 
+        ),
23 
+        migrations.AlterField(
24 
+            model_name='stockinfo',
25 
+            name='created_at',
26 
+            field=models.DateTimeField(auto_now_add=True, help_text='\u521b\u5efa\u65f6\u95f4', verbose_name='\u521b\u5efa\u65f6\u95f4'),
27 
+        ),
28 
+        migrations.AlterField(
29 
+            model_name='stockinfo',
30 
+            name='status',
31 
+            field=models.BooleanField(db_index=True, default=True, help_text='\u72b6\u6001', verbose_name='\u72b6\u6001'),
32 
+        ),
33 
+        migrations.AlterField(
34 
+            model_name='stockinfo',
35 
+            name='updated_at',
36 
+            field=models.DateTimeField(auto_now=True, help_text='\u66f4\u65b0\u65f6\u95f4', verbose_name='\u66f4\u65b0\u65f6\u95f4'),
37 
+        ),
38 
+        migrations.AlterField(
39 
+            model_name='stocksendinfo',
40 
+            name='created_at',
41 
+            field=models.DateTimeField(auto_now_add=True, help_text='\u521b\u5efa\u65f6\u95f4', verbose_name='\u521b\u5efa\u65f6\u95f4'),
42 
+        ),
43 
+        migrations.AlterField(
44 
+            model_name='stocksendinfo',
45 
+            name='status',
46 
+            field=models.BooleanField(db_index=True, default=True, help_text='\u72b6\u6001', verbose_name='\u72b6\u6001'),
47 
+        ),
48 
+        migrations.AlterField(
49 
+            model_name='stocksendinfo',
50 
+            name='updated_at',
51 
+            field=models.DateTimeField(auto_now=True, help_text='\u66f4\u65b0\u65f6\u95f4', verbose_name='\u66f4\u65b0\u65f6\u95f4'),
52 
+        ),
53 
+    ]

+ 10 - 2
stock/models.py
查看文件 

@@ -2,10 +2,18 @@
2 2
3 3 
 from django.db import models
4 4 
 from django.utils.translation import ugettext_lazy as _
5 
-from django_models_ext import BaseModelMixin
6 5 
 from shortuuidfield import ShortUUIDField
7 6
8 7
8 
+class BaseModelMixin(models.Model):
9 
+    status = models.BooleanField(_(u'状态'), default=True, help_text=_(u'状态'), db_index=True)
10 
+    created_at = models.DateTimeField(_(u'创建时间'), auto_now_add=True, editable=True, help_text=_(u'创建时间'))
11 
+    updated_at = models.DateTimeField(_(u'更新时间'), auto_now=True, editable=True, help_text=_(u'更新时间'))
12 
+
13 
+    class Meta:
14 
+        abstract = True
15 
+
16 
+
9 17 
 class StockInfo(BaseModelMixin):
10 18 
     stock_id = ShortUUIDField(_(u'Stock唯一标识'), max_length=32, blank=True, null=True, help_text=u'Stock唯一标识', db_index=True)
11 19 
 
@@ -32,7 +40,7 @@ class StockInfo(BaseModelMixin):
32 40 
         verbose_name_plural = _(u'1、库存数据调整')
33 41
34 42 
     def __unicode__(self):
35 
-        return u'{0.vendorProductName}'.format(self)
43 
+        return u'{0.vendorProductId}'.format(self)
36 44
37 45
38 46 
 class StockSendInfo(BaseModelMixin):