Add field dupload for SaleclerkSubmitLogInfo
Brightcells
Se han modificado 5 ficheros con 32 adiciones y 6 borrados
+ 2
- 2
integral/admin.py
@@ -14,8 +14,8 @@ class SaleclerkIntegralIncomeExpensesInfoAdmin(ReadOnlyModelAdmin, admin.ModelAd |
||
| 14 | 14 |
|
| 15 | 15 |
|
| 16 | 16 |
class SaleclerkSubmitLogInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin): |
| 17 |
- list_display = ('franchiser_id', 'clerk_id', 'code', 'remark', 'test_user', 'status', 'created_at', 'updated_at')
|
|
| 18 |
- list_filter = ('franchiser_id', 'test_user', 'status')
|
|
| 17 |
+ list_display = ('franchiser_id', 'clerk_id', 'code', 'remark', 'dupload', 'test_user', 'status', 'created_at', 'updated_at')
|
|
| 18 |
+ list_filter = ('franchiser_id', 'dupload', 'test_user', 'status')
|
|
| 19 | 19 |
search_fields = ('code', 'remark')
|
| 20 | 20 |
|
| 21 | 21 |
|
+ 20
- 0
integral/migrations/0005_saleclerksubmitloginfo_dupload.py
@@ -0,0 +1,20 @@ |
||
| 1 |
+# -*- coding: utf-8 -*- |
|
| 2 |
+# Generated by Django 1.11.11 on 2018-04-18 03:22 |
|
| 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 |
+ ('integral', '0004_auto_20180417_1031'),
|
|
| 12 |
+ ] |
|
| 13 |
+ |
|
| 14 |
+ operations = [ |
|
| 15 |
+ migrations.AddField( |
|
| 16 |
+ model_name='saleclerksubmitloginfo', |
|
| 17 |
+ name='dupload', |
|
| 18 |
+ field=models.BooleanField(db_index=True, default=False, help_text='\u662f\u5426\u4e3a\u91cd\u590d\u63d0\u4ea4', verbose_name='dupload'), |
|
| 19 |
+ ), |
|
| 20 |
+ ] |
+ 2
- 0
integral/models.py
@@ -75,6 +75,8 @@ class SaleclerkSubmitLogInfo(BaseModelMixin): |
||
| 75 | 75 |
|
| 76 | 76 |
remark = models.CharField(_(u'remark'), max_length=255, blank=True, null=True, help_text=u'备注') |
| 77 | 77 |
|
| 78 |
+ dupload = models.BooleanField(_(u'dupload'), default=False, help_text=_(u'是否为重复提交'), db_index=True) |
|
| 79 |
+ |
|
| 78 | 80 |
test_user = models.BooleanField(_(u'test_user'), default=False, help_text=_(u'是否为测试用户'), db_index=True) |
| 79 | 81 |
|
| 80 | 82 |
class Meta: |
+ 6
- 2
page/sale_views.py
@@ -9,7 +9,7 @@ from django_logit import logit |
||
| 9 | 9 |
from django_response import response |
| 10 | 10 |
from paginator import pagination |
| 11 | 11 |
|
| 12 |
-from account.models import FranchiserInfo, SaleclerkInfo, UserInfo |
|
| 12 |
+from account.models import SaleclerkInfo, UserInfo |
|
| 13 | 13 |
from integral.models import SaleclerkIntegralIncomeExpensesInfo, SaleclerkSubmitLogInfo |
| 14 | 14 |
from mch.models import ModelInfo |
| 15 | 15 |
from product.models import ProductCodeSubmitLogInfo, ProductInfo, ProductModelInfo |
@@ -61,7 +61,7 @@ def clerk_sale_submit_api(request): |
||
| 61 | 61 |
return response(SaleclerkStatusCode.CLERK_NOT_FOUND) |
| 62 | 62 |
|
| 63 | 63 |
# 店员提交记录 |
| 64 |
- SaleclerkSubmitLogInfo.objects.create( |
|
| 64 |
+ ssli = SaleclerkSubmitLogInfo.objects.create( |
|
| 65 | 65 |
franchiser_id=clerk.franchiser_id, |
| 66 | 66 |
clerk_id=clerk.clerk_id, |
| 67 | 67 |
code=serialNo, |
@@ -79,10 +79,14 @@ def clerk_sale_submit_api(request): |
||
| 79 | 79 |
sci = None |
| 80 | 80 |
|
| 81 | 81 |
if sci: |
| 82 |
+ ssli.dupload = True |
|
| 83 |
+ ssli.save() |
|
| 84 |
+ |
|
| 82 | 85 |
try: |
| 83 | 86 |
clerk = SaleclerkInfo.objects.get(clerk_id=sci.clerk_id, status=True) |
| 84 | 87 |
except SaleclerkInfo.DoesNotExist: |
| 85 | 88 |
clerk = None |
| 89 |
+ |
|
| 86 | 90 |
return response(SaleclerkStatusCode.DUPLICATE_SUBMIT, data={
|
| 87 | 91 |
'franchiser_name': clerk.franchiser_name, |
| 88 | 92 |
'clerk_name': clerk.clerk_name, |
+ 2
- 2
requirements.txt
@@ -5,7 +5,7 @@ Pillow==5.0.0 |
||
| 5 | 5 |
StatusCode==1.0.0 |
| 6 | 6 |
TimeConvert==1.4.3 |
| 7 | 7 |
cryptography==1.5.2 |
| 8 |
-django-admin==1.2.3 |
|
| 8 |
+django-admin==1.2.4 |
|
| 9 | 9 |
django-curtail-uuid==1.0.4 |
| 10 | 10 |
django-detect==1.0.5 |
| 11 | 11 |
django-file-md5==1.0.2 |
@@ -24,7 +24,7 @@ django-rlog==1.0.7 |
||
| 24 | 24 |
django-shortuuidfield==0.1.3 |
| 25 | 25 |
django-six==1.0.4 |
| 26 | 26 |
django-uniapi==1.0.1 |
| 27 |
-django-we==1.2.3 |
|
| 27 |
+django-we==1.2.9 |
|
| 28 | 28 |
djangorestframework==3.7.7 |
| 29 | 29 |
furl==1.0.1 |
| 30 | 30 |
hiredis==0.2.0 |