From 9c68c22f48fa991166ccecc04c5eeace899113b3 Mon Sep 17 00:00:00 2001 From: 007 <007gzs@gmail.com> Date: Tue, 15 May 2018 15:55:52 +0800 Subject: [PATCH 01/65] =?UTF-8?q?=E6=94=AF=E6=8C=81django=202,=20python=20?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/admin.py | 6 ++-- basedata/models.py | 72 +++++++++++++++++++++---------------------- basedata/views.py | 2 +- common/const.py | 2 +- common/generic.py | 29 +++++++++--------- hr/models.py | 14 ++++----- invent/admin.py | 5 ++- invent/models.py | 75 ++++++++++++++++++++++----------------------- invent/views.py | 10 +++--- midware/cuser.py | 18 ++++++++--- mis/production.py | 11 +++---- mis/settings.py | 4 +-- mis/urls.py | 2 +- organ/models.py | 10 +++--- plugin/wfactions.py | 5 +-- plugin/xls.py | 18 +++++------ purchase/models.py | 32 +++++++++---------- sale/models.py | 38 +++++++++++------------ selfhelp/admin.py | 4 +-- selfhelp/models.py | 54 ++++++++++++++++---------------- selfhelp/views.py | 2 +- syscfg/models.py | 6 ++-- workflow/admin.py | 2 +- workflow/models.py | 31 +++++++++---------- workflow/views.py | 8 ++--- 25 files changed, 231 insertions(+), 229 deletions(-) diff --git a/basedata/admin.py b/basedata/admin.py index 7a0cd81..48ec3d5 100644 --- a/basedata/admin.py +++ b/basedata/admin.py @@ -85,7 +85,7 @@ def get_queryset(self, request): elif request.user.has_perm('basedata.view_all_customer'): return super(PartnerAdmin,self).get_queryset(request).filter(partner_type='C') else: - return super(PartnerAdmin,self).get_queryset(request).filter(partner_type='S') + return super(PartnerAdmin,self).get_queryset(request).filter(partner_type='S') class ProjectForm(models.ModelForm): @@ -125,7 +125,7 @@ def save_model(self, request, obj, form, change): if not code: obj.code = '%s%02d' % ('A',obj.id) obj.save() - except Exception,e: + except Exception as e: self.message_user(request,'ERROR:%s' % e,level=messages.ERROR) @@ -153,7 +153,7 @@ def save_model(self, request, obj, form, change): else: obj.path = obj.parent.name obj.save() - except Exception,e: + except Exception as e: self.message_user(request,'ERROR:%s' % e,level=messages.ERROR) diff --git a/basedata/models.py b/basedata/models.py index 68f77f6..7bd4989 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -4,7 +4,7 @@ from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.fields import GenericForeignKey from django.utils.translation import ugettext_lazy as _ -from django.utils.text import force_text +from django.utils.encoding import force_text from common import const from common import generic from syscfg.models import Module,Site @@ -20,11 +20,11 @@ class ValueList(generic.BO): index_weight = 9 code = models.CharField(_("list code"),max_length=const.DB_CHAR_CODE_6,blank=True,null=True) name = models.CharField(_("list name"),max_length=const.DB_CHAR_NAME_40) - module = models.ForeignKey(Module,verbose_name=_("module"),blank=True,null=True) + module = models.ForeignKey(Module,verbose_name=_("module"),blank=True,null=True,on_delete=models.CASCADE) status = models.BooleanField(_("in use"),default=True) init = models.BooleanField(_("is init"),default=False) locked = models.BooleanField(_("is locked"),default=False) - locked_by = models.ForeignKey(User,verbose_name=_("locked by"),blank=True,null=True) + locked_by = models.ForeignKey(User,verbose_name=_("locked by"),blank=True,null=True,on_delete=models.CASCADE) lock_time = models.DateTimeField(_("locked time"),null=True,blank=True) def save(self, force_insert=False, force_update=False, using=None, @@ -43,7 +43,7 @@ class ValueListItem(models.Model): """ 值列表项 """ - group = models.ForeignKey(ValueList,verbose_name=_("list group")) + group = models.ForeignKey(ValueList,verbose_name=_("list group"),on_delete=models.CASCADE) group_code = models.CharField(max_length=const.DB_CHAR_CODE_6,blank=True,null=True) code = models.CharField(_("item code"),max_length=const.DB_CHAR_CODE_6,blank=True,null=True) name = models.CharField(_("item name"),max_length=const.DB_CHAR_NAME_40) @@ -91,7 +91,7 @@ class Address(generic.BO): phone = models.CharField(_("phone"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) contacts = models.CharField(_("contacts"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - content_type = models.ForeignKey(ContentType,blank=True,null=True) + content_type = models.ForeignKey(ContentType,blank=True,null=True,on_delete=models.CASCADE) object_id = models.PositiveIntegerField(blank=True,null=True) content_object = GenericForeignKey('content_type', 'object_id') @@ -116,7 +116,7 @@ class Partner(generic.BO): ('C','C'), ('D','D'), ) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) code = models.CharField(_("partner code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) name = models.CharField(_("partner name"),max_length=const.DB_CHAR_NAME_120) short = models.CharField(_("short name"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) @@ -148,8 +148,8 @@ class BankAccount(generic.BO): account = models.CharField(_("account num"),max_length=const.DB_CHAR_NAME_40) title = models.CharField(_("bank name"),max_length=const.DB_CHAR_NAME_40) memo = models.CharField(_("memo"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - partner = models.ForeignKey(Partner,verbose_name=_("partner"),blank=True,null=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + partner = models.ForeignKey(Partner,verbose_name=_("partner"),blank=True,null=True,on_delete=models.CASCADE) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) def __unicode__(self): name = '' @@ -177,7 +177,7 @@ class Project(generic.BO): short = models.CharField(_("short name"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) pinyin = models.CharField(_("pinyin"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - partner = models.ForeignKey(Partner,blank=True,null=True,verbose_name=_("partner"),limit_choices_to={"partner_type":"C"}) + partner = models.ForeignKey(Partner,blank=True,null=True,verbose_name=_("partner"),limit_choices_to={"partner_type":"C"},on_delete=models.CASCADE) status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,default='00',choices=STATUS) prj_type = models.CharField(_("project type"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=TYPES,default='00') @@ -192,7 +192,7 @@ class Project(generic.BO): business = models.FileField(_("business document"),upload_to='project',blank=True,null=True) users = models.ManyToManyField(User,verbose_name=_("related users"),blank=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) class Meta: verbose_name = _('project') @@ -209,7 +209,7 @@ class Warehouse(models.Model): status = models.BooleanField(_("in use"),default=True) location = models.CharField(_("location"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) users = models.ManyToManyField(User,verbose_name=_("related users"),blank=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) def __unicode__(self): return '%s' % self.name @@ -244,7 +244,7 @@ class Trade(models.Model): code = models.CharField(_("code"),max_length=const.DB_CHAR_CODE_6) name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_120) memo = models.CharField(_("memo"),max_length=const.DB_CHAR_NAME_120,null=True,blank=True) - parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True) + parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True,on_delete=models.CASCADE) def __unicode__(self): return '%s' % self.name @@ -260,7 +260,7 @@ class Brand(models.Model): 品牌 """ index_weight = 101 - trade = models.ForeignKey(Trade,verbose_name=_("trade"),null=True,blank=True) + trade = models.ForeignKey(Trade,verbose_name=_("trade"),null=True,blank=True,on_delete=models.CASCADE) name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_120) pinyin = models.CharField(_("pinyin"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) weight = models.IntegerField(_("weight"),blank=True,null=True,default=99) @@ -278,8 +278,8 @@ class Category(models.Model): 分类 """ index_weight = 100 - trade = models.ForeignKey(Trade,verbose_name=_("trade"),null=True,blank=True) - parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True) + trade = models.ForeignKey(Trade,verbose_name=_("trade"),null=True,blank=True,on_delete=models.CASCADE) + parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True,on_delete=models.CASCADE) code = models.CharField(_("code"),max_length=const.DB_CHAR_CODE_6,null=True,blank=True) name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_120) path = models.CharField(_("path"),max_length=const.DB_CHAR_NAME_200,null=True,blank=True) @@ -297,7 +297,7 @@ class TechnicalParameterName(models.Model): 技术参数-名称，将技术参数绑定于物料分类上，在此分类下的物料自动继承全部技术参数 """ index_weight = 7 - category = models.ForeignKey(Category,verbose_name=_("material category")) + category = models.ForeignKey(Category,verbose_name=_("material category"),on_delete=models.CASCADE) name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_40) status = models.BooleanField(_("in use"),default=True) @@ -313,7 +313,7 @@ class TechnicalParameterValue(models.Model): """ 技术参数-值，将技术参数绑定于物料分类上，在此分类下的物料自动继承全部技术参数 """ - tech_name = models.ForeignKey(TechnicalParameterName,verbose_name=_("technical name")) + tech_name = models.ForeignKey(TechnicalParameterName,verbose_name=_("technical name"),on_delete=models.CASCADE) value = models.CharField(_("value"),max_length=const.DB_CHAR_NAME_80) description = models.CharField(_("description"),max_length=const.DB_CHAR_NAME_80,null=True,blank=True) @@ -335,15 +335,15 @@ class Material(generic.BO): name = models.CharField(_("material name"),max_length=const.DB_CHAR_NAME_120) spec = models.CharField(_("specifications"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) pinyin = models.CharField(_("pinyin"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - brand = models.ForeignKey(Brand,blank=True,null=True,verbose_name=_("brand")) - category = models.ForeignKey(Category,blank=True,null=True,verbose_name=_("category")) + brand = models.ForeignKey(Brand,blank=True,null=True,verbose_name=_("brand"),on_delete=models.CASCADE) + category = models.ForeignKey(Category,blank=True,null=True,verbose_name=_("category"),on_delete=models.CASCADE) tp = models.CharField(_('mt type'),blank=True,null=True,max_length=const.DB_CHAR_CODE_2,choices=const.get_value_list('S054'),default='10') status = models.BooleanField(_("in use"),default=True) is_equip = models.BooleanField(_("is equipment"),default=False) can_sale = models.BooleanField(_("can sale"),default=True) is_virtual = models.BooleanField(_("is virtual"),default=False) - warehouse = models.ForeignKey(Warehouse,blank=True,null=True,verbose_name=_("warehouse")) + warehouse = models.ForeignKey(Warehouse,blank=True,null=True,verbose_name=_("warehouse"),on_delete=models.CASCADE) measure = models.ManyToManyField(Measure,verbose_name=_("measure")) params = models.ManyToManyField(TechnicalParameterValue,verbose_name=_("technical parameter"),through='MaterialParam') @@ -351,7 +351,7 @@ class Material(generic.BO): stock_price = models.DecimalField(_("stock price"),max_digits=14,decimal_places=4,blank=True,null=True) purchase_price = models.DecimalField(_("purchase price"),max_digits=14,decimal_places=4,blank=True,null=True) sale_price = models.DecimalField(_("sale price"),max_digits=14,decimal_places=4,blank=True,null=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) def __unicode__(self): @@ -367,9 +367,9 @@ class MaterialParam(models.Model): """ """ - material = models.ForeignKey(Material) - param_value = models.ForeignKey(TechnicalParameterValue) - param_name = models.ForeignKey(TechnicalParameterName,blank=Trade,null=True) + material = models.ForeignKey(Material,on_delete=models.CASCADE) + param_value = models.ForeignKey(TechnicalParameterValue,on_delete=models.CASCADE) + param_name = models.ForeignKey(TechnicalParameterName,blank=Trade,null=True,on_delete=models.CASCADE) creation = models.DateField(auto_now_add=True) def __unicode__(self): @@ -389,7 +389,7 @@ class ExtraParam(models.Model): ('NUM',_('NUMBER')), ('DATE',_('DATE')), ) - material = models.ForeignKey(Material,verbose_name=_("material")) + material = models.ForeignKey(Material,verbose_name=_("material"),on_delete=models.CASCADE) name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_40) data_type = models.CharField(_("data type"),default='CHAR',choices=DATA_TYPE,max_length=const.DB_CHAR_CODE_6) data_source = models.CharField(_("data source"),blank=True,null=True,max_length=const.DB_CHAR_NAME_40) @@ -419,9 +419,9 @@ class ExpenseAccount(generic.BO): name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_120) category = models.CharField(_("category"),max_length=const.DB_CHAR_CODE_4,choices=CATEGORY,default='PU') description = models.TextField(_("description"),blank=True,null=True) - parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True) + parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True,on_delete=models.CASCADE) status = models.BooleanField(_("in use"),default=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) class Meta: verbose_name = _('expenses account') @@ -436,7 +436,7 @@ class Employee(generic.BO): index_weight = 2 code = models.CharField(_("employee number"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) phone = models.CharField(_("phone"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - organization = models.ForeignKey(Organization,verbose_name = _('organization'),null=True,blank=True) + organization = models.ForeignKey(Organization,verbose_name = _('organization'),null=True,blank=True,on_delete=models.CASCADE) name = models.CharField(_("employee name"),max_length=const.DB_CHAR_NAME_120) pinyin = models.CharField(_("pinyin"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) birthday = models.DateField(_("birthday"),blank=True,null=True) @@ -453,7 +453,7 @@ class Employee(generic.BO): email = models.CharField(_("email"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) office = models.CharField(_("office phone"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - position = models.ForeignKey(Position,verbose_name = _('position')) + position = models.ForeignKey(Position,verbose_name = _('position'),on_delete=models.CASCADE) rank = models.CharField(_("employee rank"),max_length=const.DB_CHAR_CODE_2,default='00',choices=const.get_value_list('S017')) workday = models.DateField(_("workday"),blank=True,null=True) @@ -481,7 +481,7 @@ class Employee(generic.BO): tag3 = models.CharField(_("tag3 dsjs"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S041'),default='00') tag4 = models.CharField(_("tag4 byzk"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S027'),default='0') - user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True) + user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) def age(self): import datetime @@ -520,7 +520,7 @@ class Family(generic.BO): organization = models.CharField(_("organization"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) phone = models.CharField(_("phone"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) emergency = models.BooleanField(_("emergency"),default=False) - employee = models.ForeignKey(Employee,verbose_name=_("employee")) + employee = models.ForeignKey(Employee,verbose_name=_("employee"),on_delete=models.CASCADE) class Meta: verbose_name = _("family member") @@ -535,7 +535,7 @@ class Education(generic.BO): school = models.CharField(_("school"),max_length=const.DB_CHAR_NAME_120) major = models.CharField(_("major"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) degree = models.CharField(_("major degree"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S037'),default='4') - employee = models.ForeignKey(Employee,verbose_name=_("employee")) + employee = models.ForeignKey(Employee,verbose_name=_("employee"),on_delete=models.CASCADE) class Meta: verbose_name = _("education experience") @@ -548,7 +548,7 @@ class WorkExperience(generic.BO): """ organization = models.CharField(_("organization"),max_length=const.DB_CHAR_NAME_120) position = models.CharField(_("position"),max_length=const.DB_CHAR_NAME_120) - employee = models.ForeignKey(Employee,verbose_name=_("employee")) + employee = models.ForeignKey(Employee,verbose_name=_("employee"),on_delete=models.CASCADE) class Meta: verbose_name = _("work experience") @@ -569,7 +569,7 @@ class DataImport(generic.BO): imp_date = models.DateField(_('date'),blank=True,null=True,default=datetime.datetime.today) title = models.CharField(_('title'),max_length=const.DB_CHAR_NAME_40) description = models.TextField(_('description'),blank=True,null=True) - content_type = models.ForeignKey(ContentType,verbose_name=_("content type"),limit_choices_to={"app_label__in":['basedata','organ','auth']}) + content_type = models.ForeignKey(ContentType,verbose_name=_("content type"),limit_choices_to={"app_label__in":['basedata','organ','auth']},on_delete=models.CASCADE) attach = models.FileField(_('attach'),blank=True,null=True,upload_to='data') is_clear = models.BooleanField(_('clear old data?'),default=0) handler = models.CharField(_('handler class'),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) @@ -615,7 +615,7 @@ def action_import(self,request): # print 'name is %s value is %s'%(name,v) try: params.pop('') - except Exception,e: + except Exception: pass # print params klass.objects.create(**params) @@ -646,7 +646,7 @@ class Document(generic.BO): description = models.TextField(_('description'),blank=True,null=True) tp = models.CharField(_('type'),max_length=const.DB_CHAR_CODE_2,default='10',choices=TP) business_domain = models.CharField(_("business domain"),max_length=const.DB_CHAR_CODE_4,choices=const.get_value_list('S045'),default='OT') - user = models.ForeignKey(User,verbose_name=_('user'),blank=True,null=True) + user = models.ForeignKey(User,verbose_name=_('user'),blank=True,null=True,on_delete=models.CASCADE) status = models.CharField(_('status'),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) pub_date = models.DateTimeField(_('publish date'),blank=True,null=True) size = models.CharField(_('size'),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) diff --git a/basedata/views.py b/basedata/views.py index 744b316..80acbbe 100644 --- a/basedata/views.py +++ b/basedata/views.py @@ -25,7 +25,7 @@ def action_import(request,object_id): try: messages.success(request,_('data import successfully')) - except Exception,e: + except Exception as e: messages.error(request,e) return HttpResponseRedirect("/admin/basedata/dataimport/%s"%(object_id)) diff --git a/common/const.py b/common/const.py index cb30663..a1b11d3 100644 --- a/common/const.py +++ b/common/const.py @@ -33,7 +33,7 @@ def get_value_list(group): cursor.execute('SELECT code,name FROM basedata_valuelistitem WHERE group_code=%s AND status=1',[group]) rows = cursor.fetchall() return tuple([(code,name) for code,name in rows]) - except Exception,e: + except Exception as e: return None else: return None diff --git a/common/generic.py b/common/generic.py index 50a4e03..330b7c3 100644 --- a/common/generic.py +++ b/common/generic.py @@ -1,4 +1,6 @@ # coding=utf-8 +import logging + __author__ = 'zhugl' # created at 15-4-21 import datetime @@ -9,10 +11,9 @@ from django.db.models import fields from django.db.models.fields import related from django.contrib import admin -from django.http import HttpRequest,HttpResponseRedirect,HttpResponse +from django.http import HttpRequest,HttpResponse from django.contrib.contenttypes.models import ContentType -from django.utils.text import force_text -from django.utils.encoding import smart_str +from django.utils.encoding import smart_str, force_text from django.utils.http import urlquote from django.utils.translation import ugettext_lazy as _ from common import const @@ -32,8 +33,8 @@ def update(sql, params=None): cursor.execute(sql,params) else: cursor.execute(sql) - except Exception,e: - print e + except Exception as e: + logging.error('', exc_info=e) def get_app_model_info_from_request(request): """ @@ -148,8 +149,8 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No can_restart = True show_workflow_line = True - except Exception,e: - print Exception,e + except Exception: + pass if workflow_modal and not workflow_instance: show_submit_button = True @@ -209,8 +210,7 @@ def history_view(self, request, object_id, extra_context=None): ) # print history_list extra_context.update(ctx) - except Exception,e: - print Exception,e + except Exception: pass return super(BOAdmin,self).history_view(request,object_id,extra_context) @@ -228,7 +228,7 @@ def save_model(self, request, obj, form, change): setattr(obj,'end',datetime.date(9999,12,31)) try: setattr(obj,'user',request.user) - except Exception,e: + except Exception: pass super(BOAdmin,self).save_model(request,obj,form,change) @@ -241,10 +241,9 @@ def save_model(self, request, obj, form, change): code = fmt % (self.CODE_PREFIX,obj.id) table = obj._meta.db_table sql = 'update %s set code = \'%s\' where id=%s' % (table,code,obj.id) - print sql update(sql) - except Exception,e: - print e + except Exception: + pass # def response_change(self, request, obj): # return HttpResponseRedirect('') @@ -263,7 +262,7 @@ def export_selected_data(self,request,queryset): try: f = ops.get_field(field) col_name = f.verbose_name - except Exception,e: + except Exception: f = getattr(self.model,field) if hasattr(f,'short_description'): col_name = f.short_description @@ -276,7 +275,7 @@ def export_selected_data(self,request,queryset): f = field try: f = ops.get_field(field) - except Exception,e: + except Exception: pass v = getattr(obj,field,'') if hasattr(v,'__call__') or callable(v): diff --git a/hr/models.py b/hr/models.py index 3582a05..9c81d73 100644 --- a/hr/models.py +++ b/hr/models.py @@ -62,8 +62,8 @@ class Entry(generic.BO): zipcode = models.CharField(_("zipcode"),max_length=const.DB_CHAR_CODE_8) phone = models.CharField(_("phone"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - guider = models.ForeignKey(Employee,verbose_name=_("guider")) - position = models.ForeignKey(Position,verbose_name = _('designate position')) + guider = models.ForeignKey(Employee,verbose_name=_("guider"),on_delete=models.CASCADE) + position = models.ForeignKey(Position,verbose_name = _('designate position'),on_delete=models.CASCADE) rank = models.CharField(_("employee rank"),max_length=const.DB_CHAR_CODE_2,default='00',choices=const.get_value_list('S017')) ygxs = models.CharField(_("employ ygxs"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S019'),default='2') category = models.CharField(_("employ category"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S018'),default='21') @@ -87,9 +87,9 @@ class EmployeeSalaryItem(models.Model): """ """ - entry = models.ForeignKey(Entry,verbose_name=_("employee entry")) - employee = models.ForeignKey(Employee,verbose_name=_("employee"),blank=True,null=True) - salary_item = models.ForeignKey(SalaryItem,verbose_name=_("salary item")) + entry = models.ForeignKey(Entry,verbose_name=_("employee entry"),on_delete=models.CASCADE) + employee = models.ForeignKey(Employee,verbose_name=_("employee"),blank=True,null=True,on_delete=models.CASCADE) + salary_item = models.ForeignKey(SalaryItem,verbose_name=_("salary item"),on_delete=models.CASCADE) calculate_way = models.CharField(_("calculate way"),max_length=const.DB_CHAR_CODE_2,choices=const.get_value_list('S050'),default='10') fixed_value = models.DecimalField(_("fixed value"),blank=True,null=True,max_digits=10,decimal_places=2) base_value = models.DecimalField(_("base value"),blank=True,null=True,max_digits=10,decimal_places=2) @@ -106,7 +106,7 @@ class Transfer(generic.BO): """ 人员调动 """ - employee = models.ForeignKey(Employee,verbose_name=_("employee")) + employee = models.ForeignKey(Employee,verbose_name=_("employee"),on_delete=models.CASCADE) class Meta: verbose_name = _("employee transfer") @@ -117,7 +117,7 @@ class Departure(generic.BO): """ 人员离职 """ - employee = models.ForeignKey(Employee,verbose_name=_("employee")) + employee = models.ForeignKey(Employee,verbose_name=_("employee"),on_delete=models.CASCADE) class Meta: verbose_name = _("employee departure") diff --git a/invent/admin.py b/invent/admin.py index 5bfbd32..e5601de 100644 --- a/invent/admin.py +++ b/invent/admin.py @@ -87,15 +87,14 @@ def save_model(self, request, obj, form, change): try: InItem.objects.get(po_item=item,master=obj) continue - except Exception,e: + except Exception as e: pp = item.discount_price or item.price if decimal.Decimal(item.tax) > decimal.Decimal(0): pp = pp /(decimal.Decimal(1)+decimal.Decimal(item.tax)) InItem.objects.create(warehouse=obj.warehouse,material=item.material,measure=item.measure,prop='+', - po_item=item,master=obj,cnt=item.left_cnt,price=pp,batch=obj.batch,source=obj.code) + po_item=item,master=obj,cnt=item.left_cnt,price=pp,batch=obj.batch,source=obj.code) def get_readonly_fields(self, request, obj=None): - print obj if obj and obj.status == 9: return ['code','title','po','warehouse','batch','status'] else: diff --git a/invent/models.py b/invent/models.py index b863956..b95d40b 100644 --- a/invent/models.py +++ b/invent/models.py @@ -3,11 +3,10 @@ import os import datetime import decimal -from django.db import transaction from django.db import models from django import forms from mis import settings -from django.utils.text import force_text +from django.utils.encoding import force_text from django.db import transaction from django.contrib.auth.models import User from django.utils.translation import ugettext_lazy as _ @@ -23,10 +22,10 @@ class Inventory(generic.BO): 库存信息 """ index_weight = 1 - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) - warehouse = models.ForeignKey(Warehouse,verbose_name=_("warehouse")) - material = models.ForeignKey(Material,verbose_name=_("material")) - measure = models.ForeignKey(Measure,verbose_name=_("measure")) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) + warehouse = models.ForeignKey(Warehouse,verbose_name=_("warehouse"),on_delete=models.CASCADE) + material = models.ForeignKey(Material,verbose_name=_("material"),on_delete=models.CASCADE) + measure = models.ForeignKey(Measure,verbose_name=_("measure"),on_delete=models.CASCADE) cnt = models.DecimalField(_("count"),max_digits=14,decimal_places=4) batch = models.CharField(_("batch"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) price = models.DecimalField(_("price"),max_digits=14,decimal_places=4) @@ -51,9 +50,9 @@ class InitialInventory(generic.BO): ) index_weight = 9 code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) - user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True) + user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) execute_time = models.DateTimeField(_("execute time"),blank=True,null=True) attach = models.FileField(_('attach'),blank=True,null=True,upload_to='inventory',help_text=u'参考FD0002模板文档') @@ -80,17 +79,17 @@ def save(self, force_insert=False, force_update=False, using=None, try: measure = Measure.objects.get(code=unit_code) - except Exception,e: + except Exception: measure = Measure.objects.create(code=unit_code,name=force_text(unit_name.decode('gbk'))) try: house = Warehouse.objects.get(code=warehouse_code) - except Exception,e: + except Exception: house = Warehouse.objects.create(code=warehouse_code,name=force_text(warehouse_name.decode('gbk'))) try: material = Material.objects.get(code=code) - except Exception,e: + except Exception: material = Material(code=code,name=force_text(name.decode('gbk')),spec=force_text(description.decode('gbk')),warehouse=house) material.stock_price = price material.save() @@ -138,13 +137,13 @@ class StockIn(generic.BO): ) index_weight = 3 code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) - warehouse = models.ForeignKey(Warehouse,verbose_name=_("warehouse")) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) + warehouse = models.ForeignKey(Warehouse,verbose_name=_("warehouse"),on_delete=models.CASCADE) title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) - user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True) + user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) execute_time = models.DateTimeField(_("execute time"),blank=True,null=True) - po = models.ForeignKey(PurchaseOrder,verbose_name=_("purchase order"),null=True,limit_choices_to={"entry_status":"0"},blank=True) + po = models.ForeignKey(PurchaseOrder,verbose_name=_("purchase order"),null=True,limit_choices_to={"entry_status":"0"},blank=True,on_delete=models.CASCADE) amount = models.DecimalField(_("stock in money of amount"),max_digits=14,decimal_places=4,blank=True,null=True) batch = models.CharField(_("batch"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) @@ -183,7 +182,7 @@ def action_entry(self,request): inventory.cnt += item.cnt inventory.save() total_amount += item.price*item.cnt - except Exception,e: + except Exception: Inventory.objects.create(warehouse=self.warehouse,material=item.material,measure=item.measure, cnt=item.cnt,price=item.price,org=self.org) item.material.stock_price = item.price @@ -231,13 +230,13 @@ class StockOut(generic.BO): ) index_weight = 2 code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) - project = models.ForeignKey(Project,verbose_name=_("project"),blank=True,null=True) - wo = models.ForeignKey(WorkOrder,verbose_name=_("work order"),blank=True,null=True) + project = models.ForeignKey(Project,verbose_name=_("project"),blank=True,null=True,on_delete=models.CASCADE) + wo = models.ForeignKey(WorkOrder,verbose_name=_("work order"),blank=True,null=True,on_delete=models.CASCADE) description = models.TextField(_("description"),blank=True,null=True) amount = models.DecimalField(_("money of amount"),max_digits=14,decimal_places=4,blank=True,null=True) - user = models.ForeignKey(User,verbose_name=_("out user"),blank=True,null=True) + user = models.ForeignKey(User,verbose_name=_("out user"),blank=True,null=True,on_delete=models.CASCADE) status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) execute_time = models.DateTimeField(_("execute time"),blank=True,null=True) @@ -291,11 +290,11 @@ class WareReturn(generic.BO): ) index_weight = 5 code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) - out = models.ForeignKey(StockOut,verbose_name=_('StockOut')) + out = models.ForeignKey(StockOut,verbose_name=_('StockOut'),on_delete=models.CASCADE) amount = models.DecimalField(_("money of amount"),max_digits=14,decimal_places=4,blank=True,null=True) - user = models.ForeignKey(User,verbose_name=_("out user"),blank=True,null=True) + user = models.ForeignKey(User,verbose_name=_("out user"),blank=True,null=True,on_delete=models.CASCADE) status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) execute_time = models.DateTimeField(_("execute time"),blank=True,null=True) @@ -342,10 +341,10 @@ class WareAdjust(generic.BO): ) index_weight = 4 code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) description = models.TextField(_("description"),blank=True,null=True) - user = models.ForeignKey(User,verbose_name=_("out user"),blank=True,null=True) + user = models.ForeignKey(User,verbose_name=_("out user"),blank=True,null=True,on_delete=models.CASCADE) status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) execute_time = models.DateTimeField(_("execute time"),blank=True,null=True) @@ -384,9 +383,9 @@ class InOutDetail(models.Model): create_time = models.DateTimeField(_("create time"),auto_now_add=True) status = models.BooleanField(_("executed"),default=0) event_time = models.DateTimeField(_("event time"),blank=True,null=True) - warehouse = models.ForeignKey(Warehouse,verbose_name=_("warehouse"),blank=True,null=True) - material = models.ForeignKey(Material,verbose_name=_("material"),limit_choices_to={"is_virtual":"0"},blank=True,null=True) - measure = models.ForeignKey(Measure,verbose_name=_("measure"),blank=True,null=True) + warehouse = models.ForeignKey(Warehouse,verbose_name=_("warehouse"),blank=True,null=True,on_delete=models.CASCADE) + material = models.ForeignKey(Material,verbose_name=_("material"),limit_choices_to={"is_virtual":"0"},blank=True,null=True,on_delete=models.CASCADE) + measure = models.ForeignKey(Measure,verbose_name=_("measure"),blank=True,null=True,on_delete=models.CASCADE) cnt = models.DecimalField(_("count"),max_digits=14,decimal_places=4,blank=True,null=True) batch = models.CharField(_("batch"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) price = models.DecimalField(_("price"),max_digits=14,decimal_places=4,blank=True,null=True) @@ -398,7 +397,7 @@ class InitItem(InOutDetail): """ 期初入库明细 """ - master = models.ForeignKey(InitialInventory) + master = models.ForeignKey(InitialInventory,on_delete=models.CASCADE) class Meta: verbose_name = _("init item") @@ -409,8 +408,8 @@ class InItem(InOutDetail): """ 入库单明细 """ - master = models.ForeignKey(StockIn) - po_item = models.ForeignKey(POItem,verbose_name=_("po item"),blank=True,null=True) + master = models.ForeignKey(StockIn,on_delete=models.CASCADE) + po_item = models.ForeignKey(POItem,verbose_name=_("po item"),blank=True,null=True,on_delete=models.CASCADE) def get_new_price(self): if self.po_item and self.master.warehouse: @@ -420,7 +419,7 @@ def get_new_price(self): total_amount = self.price*self.cnt+inventory.price*inventory.cnt total_count = self.cnt+inventory.cnt return total_amount/total_count - except Exception,e: + except Exception as e: pass return self.price or '' @@ -442,8 +441,8 @@ class OutItem(InOutDetail): """ 出库单明细 """ - master = models.ForeignKey(StockOut) - inventory = models.ForeignKey(Inventory,blank=True,null=True,verbose_name=_("inventory material")) + master = models.ForeignKey(StockOut,on_delete=models.CASCADE) + inventory = models.ForeignKey(Inventory,blank=True,null=True,verbose_name=_("inventory material"),on_delete=models.CASCADE) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): @@ -464,8 +463,8 @@ class ReturnItem(InOutDetail): """ 返库单明细 """ - master = models.ForeignKey(WareReturn) - out_item = models.ForeignKey(OutItem,blank=True,null=True,verbose_name=_('out item')) + master = models.ForeignKey(WareReturn,on_delete=models.CASCADE) + out_item = models.ForeignKey(OutItem,blank=True,null=True,verbose_name=_('out item'),on_delete=models.CASCADE) out_cnt = models.DecimalField(_("out count"),max_digits=14,decimal_places=4) class Meta: @@ -477,8 +476,8 @@ class AdjustItem(InOutDetail): """ 库存调整明细 """ - master = models.ForeignKey(WareAdjust) - inventory = models.ForeignKey(Inventory,blank=True,null=True,verbose_name=_("inventory material")) + master = models.ForeignKey(WareAdjust,on_delete=models.CASCADE) + inventory = models.ForeignKey(Inventory,blank=True,null=True,verbose_name=_("inventory material"),on_delete=models.CASCADE) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): diff --git a/invent/views.py b/invent/views.py index d747b63..79a3739 100644 --- a/invent/views.py +++ b/invent/views.py @@ -27,7 +27,7 @@ def action_in(request,object_id): try: obj.action_entry(request) messages.success(request,_('check in successfully')) - except Exception,e: + except Exception as e: messages.error(request,e) return HttpResponseRedirect("/admin/invent/stockin/%s"%(object_id)) @@ -60,7 +60,7 @@ def action_out(request,object_id): try: obj.action_out(request) messages.success(request,_('check out successfully')) - except Exception,e: + except Exception as e: messages.error(request,e) return HttpResponseRedirect("/admin/invent/stockout/%s"%(object_id)) @@ -92,7 +92,7 @@ def action_init(request,object_id): try: obj.init_entry(request) messages.success(request,_('check in successfully')) - except Exception,e: + except Exception as e: messages.error(request,e) return HttpResponseRedirect("/admin/invent/initialinventory/%s"%(object_id)) @@ -125,7 +125,7 @@ def action_return(request,object_id): try: obj.action_return(request) messages.success(request,_('check in successfully')) - except Exception,e: + except Exception as e: messages.error(request,e) return HttpResponseRedirect("/admin/invent/warereturn/%s"%(object_id)) @@ -158,7 +158,7 @@ def action_adjust(request,object_id): try: obj.action_adjust(request) messages.success(request,_('check in successfully')) - except Exception,e: + except Exception as e: messages.error(request,e) return HttpResponseRedirect("/admin/invent/wareadjust/%s"%(object_id)) diff --git a/midware/cuser.py b/midware/cuser.py index d8989e9..e61ce70 100644 --- a/midware/cuser.py +++ b/midware/cuser.py @@ -8,7 +8,15 @@ from django.contrib.admin import ModelAdmin, actions from django.contrib.auth import REDIRECT_FIELD_NAME from django.core.exceptions import ImproperlyConfigured, PermissionDenied -from django.core.urlresolvers import NoReverseMatch, reverse + +import django +if django.VERSION > (1, 10): + from django.urls import NoReverseMatch, reverse + from django.utils.deprecation import MiddlewareMixin +else: + from django.core.urlresolvers import NoReverseMatch, reverse + class MiddlewareMixin(object): + pass from django.db.models.base import ModelBase from django.http import Http404, HttpResponseRedirect from django.template.engine import Engine @@ -26,7 +34,7 @@ def getuser(): return getattr(_thread_local,'user',None) -class RequestUser(object): +class RequestUser(MiddlewareMixin): def process_request(self,request): django_user = getattr(request,'user',None) @@ -90,7 +98,7 @@ def process_view(self, request, view_func, view_args, view_kwargs): try: todolist = self.get_my_task(request) context.update(dict(todolist = todolist)) - except Exception,e: + except Exception: pass # print context view_kwargs['extra_context'] = context @@ -110,10 +118,10 @@ def process_view(self, request, view_func, view_args, view_kwargs): 'name': apps.get_app_config(label).verbose_name, 'app_label': label, 'app_url': reverse( - 'admin:app_list', + 'admin:app_list', kwargs={'app_label': label}, current_app=admin.site.name, - ), + ), 'weight':app_weight.get(label,99), 'is_current':is_current, } diff --git a/mis/production.py b/mis/production.py index f277194..088c320 100644 --- a/mis/production.py +++ b/mis/production.py @@ -52,7 +52,6 @@ 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', @@ -116,12 +115,12 @@ # https://docs.djangoproject.com/en/1.8/howto/static-files/ STATIC_URL = '/static/' -STATIC_ROOT = os.path.join(BASE_DIR,'static') +STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATICFILES_DIRS = ( - ('css',os.path.join(STATIC_ROOT,'css')), - ('js',os.path.join(STATIC_ROOT,'js')), - ('img',os.path.join(STATIC_ROOT,'img')), + ('css', os.path.join(STATIC_ROOT, 'css')), + ('js', os.path.join(STATIC_ROOT, 'js')), + ('img', os.path.join(STATIC_ROOT, 'img')), ) MEDIA_ROOT = os.path.join(BASE_DIR,'upload') -MEDIA_URL = '/upload/' \ No newline at end of file +MEDIA_URL = '/upload/' diff --git a/mis/settings.py b/mis/settings.py index 5e4b36b..63bf84f 100644 --- a/mis/settings.py +++ b/mis/settings.py @@ -52,12 +52,12 @@ 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', 'midware.cuser.RequestUser', ) +MIDDLEWARE = MIDDLEWARE_CLASSES ROOT_URLCONF = 'mis.urls' @@ -91,7 +91,7 @@ 'HOST': 'localhost', 'NAME': 'mis', 'USER': 'root', - 'PASSWORD': 'root', + 'PASSWORD': 'admin007', } } diff --git a/mis/urls.py b/mis/urls.py index 6250797..63a1e23 100644 --- a/mis/urls.py +++ b/mis/urls.py @@ -12,7 +12,7 @@ url(r"^admin/(?P\w+)/(?P\w+)/(?P\d+)/start", workflow.views.start), url(r"^admin/(?P\w+)/(?P\w+)/(?P\d+)/approve/(?P\d+)", workflow.views.approve), url(r"^admin/(?P\w+)/(?P\w+)/(?P\d+)/restart/(?P\d+)", workflow.views.restart), - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', admin.site.urls), url(r'^admin/invent/', include(invent.urls)), url(r'^admin/basedata/', include(basedata.urls)), url(r'^admin/selfhelp/', include(selfhelp.urls)), diff --git a/organ/models.py b/organ/models.py index 95e3347..d589978 100644 --- a/organ/models.py +++ b/organ/models.py @@ -52,8 +52,8 @@ class OrgUnit(generic.BO): (5,_('COMMITTEE')) ) index_weight = 2 - parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True) - organization = models.ForeignKey(Organization,verbose_name = _('organization'),null=True,blank=True) + parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True,on_delete=models.CASCADE) + organization = models.ForeignKey(Organization,verbose_name = _('organization'),null=True,blank=True,on_delete=models.CASCADE) code = models.CharField(_("code"),max_length=const.DB_CHAR_CODE_8,blank=True,null=True) name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_120) short = models.CharField(_("short name"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) @@ -91,9 +91,9 @@ class Position(generic.BO): ('05', _("EXPERT")), ) index_weight = 3 - unit = models.ForeignKey(OrgUnit,verbose_name=_('org unit')) - organization = models.ForeignKey(Organization,verbose_name=_('organization'),null=True,blank=True) - parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True) + unit = models.ForeignKey(OrgUnit,verbose_name=_('org unit'),on_delete=models.CASCADE) + organization = models.ForeignKey(Organization,verbose_name=_('organization'),null=True,blank=True,on_delete=models.CASCADE) + parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True,on_delete=models.CASCADE) code = models.CharField(_("position code"),max_length=const.DB_CHAR_CODE_8,blank=True,null=True) name = models.CharField(_("position name"),max_length=const.DB_CHAR_NAME_120) short = models.CharField(_("short name"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) diff --git a/plugin/wfactions.py b/plugin/wfactions.py index 803fc2e..bad9c89 100644 --- a/plugin/wfactions.py +++ b/plugin/wfactions.py @@ -1,5 +1,6 @@ # created at 15-6-30 # coding=utf-8 +import logging __author__ = 'zhugl' @@ -28,8 +29,8 @@ class TestAction(WorkflowAction): name = 'action.test' def action(self,request,obj,node_config,operation=Operation.APPROVE): - print 'this is a workflow test action' - print 'request user is %s,current node is %s'%(request.user,node_config) + logging.info('this is a workflow test action') + logging.info('request user is %s,current node is %s'%(request.user,node_config)) class WorkflowActionManager(object): diff --git a/plugin/xls.py b/plugin/xls.py index 7f07e6f..4e180bd 100644 --- a/plugin/xls.py +++ b/plugin/xls.py @@ -1,5 +1,5 @@ -# created at 15-6-27 # coding=utf-8 +# created at 15-6-27 __author__ = 'zhugl' import xlrd import os @@ -50,7 +50,7 @@ def department(self,obj,sheet): try: parent = OrgUnit.objects.get(code=row[4]) OrgUnit.objects.filter(code=row[0]).update(parent=parent) - except Exception,e: + except Exception: pass def position(self,obj,sheet): @@ -64,7 +64,7 @@ def position(self,obj,sheet): if len(row[4]) > 0: try: depart = OrgUnit.objects.filter(code=row[4],end__gt=datetime.date.today()).all()[0] - except Exception,e: + except Exception: pass weight = 99 if row[6]: @@ -77,7 +77,7 @@ def position(self,obj,sheet): try: parent = Position.objects.filter(code=row[2],end__gt=datetime.date.today()).all()[0] Position.objects.filter(code=row[0]).update(parent=parent) - except Exception,e: + except Exception: pass def stuff(self,obj,sheet): @@ -87,7 +87,7 @@ def stuff(self,obj,sheet): row_count = sheet.nrows try: group = Group.objects.get_by_natural_key(u'职员') - except Exception,e: + except Exception: pass for row_index in range(1,row_count): row = sheet.row_values(row_index) @@ -104,13 +104,13 @@ def stuff(self,obj,sheet): else: employee.position = position employee.save() - except Exception,e: + except Exception: employee = Employee.objects.create(code=row[0],name=row[1],pinyin=row[2],gender=row[3],idcard=row[4], birthday=row[5],workday=row[6],startday=row[7],position=position) if username: try: user = User.objects.get_by_natural_key(username) - except Exception,e: + except Exception: user = User.objects.create_user(username=username,password=password) user.is_staff = True user.is_active = True @@ -139,7 +139,7 @@ def handle(self,obj,f): row_count = sheet.nrows try: group = Group.objects.get_by_natural_key(u'职员') - except Exception,e: + except Exception: pass for row_index in range(2,row_count): @@ -153,7 +153,7 @@ def handle(self,obj,f): continue try: user = User.objects.get_by_natural_key(username) - except Exception,e: + except Exception: user = User.objects.create_user(username=username,password=password,email=email) user.is_staff = True user.is_active = True diff --git a/purchase/models.py b/purchase/models.py index 52cdf8e..0484cf8 100644 --- a/purchase/models.py +++ b/purchase/models.py @@ -8,7 +8,7 @@ from django.db.models.aggregates import Sum from django.contrib.auth.models import User from django.utils.translation import ugettext_lazy as _ -from django.utils.text import force_text +from django.utils.encoding import force_text from mis import settings from common import generic from common import const @@ -29,13 +29,13 @@ class PurchaseOrder(generic.BO): ) index_weight = 1 code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - partner = models.ForeignKey(Partner,verbose_name=_("partner"),limit_choices_to={"partner_type":"S"}) + partner = models.ForeignKey(Partner,verbose_name=_("partner"),limit_choices_to={"partner_type":"S"},on_delete=models.CASCADE) order_date = models.DateField(_("order date")) arrive_date = models.DateField(_("arrive date")) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) description = models.TextField(_("description"),blank=True,null=True) - user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True) + user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) amount = models.DecimalField(_("money amount"),max_digits=12,decimal_places=2,blank=True,null=True,default=0.00) discount_amount = models.DecimalField(_("discount amount"),max_digits=12,decimal_places=2,blank=True,null=True,default=0.00) @@ -79,12 +79,12 @@ def save(self, force_insert=False, force_update=False, using=None, try: measure = Measure.objects.get(code=row[4]) - except Exception,e: + except Exception: measure = Measure.objects.create(code=row[4],name=force_text(row[5])) try: material = Material.objects.get(code=row[0]) - except Exception,e: + except Exception: material = Material(code=row[0],name=force_text(row[1]),spec=force_text(row[2])) material.purchase_price = row[6] material.save() @@ -115,16 +115,16 @@ class POItem(models.Model): """ index_weight = 2 - po = models.ForeignKey(PurchaseOrder,verbose_name=_("purchase order")) - material = models.ForeignKey(Material,verbose_name=_("material"),limit_choices_to={"is_virtual":"0"}) - measure = models.ForeignKey(Measure,verbose_name=_("measure"),blank=True,null=True) + po = models.ForeignKey(PurchaseOrder,verbose_name=_("purchase order"),on_delete=models.CASCADE) + material = models.ForeignKey(Material,verbose_name=_("material"),limit_choices_to={"is_virtual":"0"},on_delete=models.CASCADE) + measure = models.ForeignKey(Measure,verbose_name=_("measure"),blank=True,null=True,on_delete=models.CASCADE) price = models.DecimalField(_("price"),max_digits=12,decimal_places=4,blank=True,null=True) cnt = models.DecimalField(_("count"),max_digits=12,decimal_places=4,blank=True,null=True) discount_price = models.DecimalField(_("discount price"),max_digits=12,decimal_places=4,blank=True,null=True) amount = models.DecimalField(_("money of amount"),max_digits=12,decimal_places=2,blank=True,null=True) discount_amount = models.DecimalField(_("discount amount"),max_digits=12,decimal_places=2,blank=True,null=True) tax = models.CharField(_("tax rate"),max_length=const.DB_CHAR_CODE_6,choices=const.get_value_list('S052'),default='0.00') - woitem = models.ForeignKey(WOItem,verbose_name=_("wo item"),blank=True,null=True) + woitem = models.ForeignKey(WOItem,verbose_name=_("wo item"),blank=True,null=True,on_delete=models.CASCADE) is_in_stock = models.BooleanField(_("is in stock"),default=0) in_stock_time = models.DateTimeField(_("execute time"),blank=True,null=True) entry_cnt = models.DecimalField(_("entry count"),max_digits=12,decimal_places=4,blank=True,null=True) @@ -169,8 +169,8 @@ class Invoice(generic.BO): vo_date = models.DateField(_("invoice date"),blank=True,null=True,default=datetime.date.today) code = models.CharField(_("invoice code"),max_length=const.DB_CHAR_NAME_20) number = models.CharField(_("invoice number"),max_length=const.DB_CHAR_NAME_20) - po = models.ForeignKey(PurchaseOrder,verbose_name=_("purchase order")) - partner = models.ForeignKey(Partner,verbose_name=_("partner"),blank=True,null=True) + po = models.ForeignKey(PurchaseOrder,verbose_name=_("purchase order"),on_delete=models.CASCADE) + partner = models.ForeignKey(Partner,verbose_name=_("partner"),blank=True,null=True,on_delete=models.CASCADE) po_amount = models.DecimalField(_("po amount"),max_digits=14,decimal_places=4,blank=True,null=True) vo_amount = models.DecimalField(_("invoice amount"),max_digits=14,decimal_places=4) file = models.FileField(_("invoice file"),upload_to='invoice',blank=True,null=True) @@ -196,13 +196,13 @@ class Payment(generic.BO): """ index_weight = 3 py_date = models.DateField(_("pay date"),blank=True,null=True,default=datetime.date.today) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) code = models.CharField(_("pay code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - po = models.ForeignKey(PurchaseOrder,verbose_name=_("purchase order")) - partner = models.ForeignKey(Partner,verbose_name=_("partner"),blank=True,null=True) + po = models.ForeignKey(PurchaseOrder,verbose_name=_("purchase order"),on_delete=models.CASCADE) + partner = models.ForeignKey(Partner,verbose_name=_("partner"),blank=True,null=True,on_delete=models.CASCADE) po_amount = models.DecimalField(_("po amount"),max_digits=14,decimal_places=4,blank=True,null=True) py_amount = models.DecimalField(_("pay amount"),max_digits=14,decimal_places=4) - bank = models.ForeignKey(BankAccount,verbose_name=_("bank account"),blank=True,null=True) + bank = models.ForeignKey(BankAccount,verbose_name=_("bank account"),blank=True,null=True,on_delete=models.CASCADE) response_code = models.CharField(_("response code"),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) memo = models.TextField(_("memo"),blank=True,null=True) diff --git a/sale/models.py b/sale/models.py index d71d114..ce41dfa 100644 --- a/sale/models.py +++ b/sale/models.py @@ -9,7 +9,7 @@ from django.db import transaction from django.db.models.aggregates import Sum from django.contrib.auth.models import User -from django.utils.text import force_text +from django.utils.encoding import force_text from django.utils.translation import ugettext_lazy as _ from common import generic from common import const @@ -29,10 +29,10 @@ class SaleOrder(generic.BO): ) index_weight = 2 code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - partner = models.ForeignKey(Partner,verbose_name=_("partner"),limit_choices_to={"partner_type":"C"}) + partner = models.ForeignKey(Partner,verbose_name=_("partner"),limit_choices_to={"partner_type":"C"},on_delete=models.CASCADE) order_date = models.DateField(_("order date")) deliver_date = models.DateField(_("deliver date")) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) description = models.TextField(_("memo"),blank=True,null=True) contact = models.CharField(_("contacts"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) @@ -43,7 +43,7 @@ class SaleOrder(generic.BO): amount = models.DecimalField(_("money amount"),max_digits=12,decimal_places=2,blank=True,null=True,default=0.00) discount_amount = models.DecimalField(_("discount amount"),max_digits=12,decimal_places=2,blank=True,null=True,default=0.00) - user = models.ForeignKey(User,verbose_name=_("sales man"),blank=True,null=True) + user = models.ForeignKey(User,verbose_name=_("sales man"),blank=True,null=True,on_delete=models.CASCADE) status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) def __unicode__(self): @@ -72,9 +72,9 @@ class SaleItem(models.Model): """ 订单明细 """ - master = models.ForeignKey(SaleOrder) - material = models.ForeignKey(Material,verbose_name=_("material"),limit_choices_to={"is_virtual":"0",'can_sale':'1'},blank=True,null=True) - measure = models.ForeignKey(Measure,verbose_name=_("measure"),blank=True,null=True) + master = models.ForeignKey(SaleOrder,on_delete=models.CASCADE) + material = models.ForeignKey(Material,verbose_name=_("material"),limit_choices_to={"is_virtual":"0",'can_sale':'1'},blank=True,null=True,on_delete=models.CASCADE) + measure = models.ForeignKey(Measure,verbose_name=_("measure"),blank=True,null=True,on_delete=models.CASCADE) cnt = models.DecimalField(_("count"),max_digits=14,decimal_places=4) stock_price = models.DecimalField(_("stock price"),max_digits=14,decimal_places=4,blank=True,null=True) sale_price = models.DecimalField(_("sale price"),max_digits=14,decimal_places=4,blank=True,null=True) @@ -107,13 +107,13 @@ class PaymentCollection(generic.BO): """ index_weight = 3 collection_date = models.DateField(_("collection date"),blank=True,null=True,default=datetime.date.today) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) code = models.CharField(_("collection code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - so = models.ForeignKey(SaleOrder,verbose_name=_("sale order")) - partner = models.ForeignKey(Partner,verbose_name=_("partner"),blank=True,null=True) + so = models.ForeignKey(SaleOrder,verbose_name=_("sale order"),on_delete=models.CASCADE) + partner = models.ForeignKey(Partner,verbose_name=_("partner"),blank=True,null=True,on_delete=models.CASCADE) order_amount = models.DecimalField(_("order amount"),max_digits=14,decimal_places=4,blank=True,null=True) collection_amount = models.DecimalField(_("collection amount"),max_digits=14,decimal_places=4) - bank = models.ForeignKey(BankAccount,verbose_name=_("bank account"),blank=True,null=True) + bank = models.ForeignKey(BankAccount,verbose_name=_("bank account"),blank=True,null=True,on_delete=models.CASCADE) memo = models.TextField(_("memo"),blank=True,null=True) def __unicode__(self): @@ -145,16 +145,16 @@ class OfferSheet(generic.BO): ('9', _("APPROVED")), ) code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - partner = models.ForeignKey(Partner,verbose_name=_("partner"),limit_choices_to={"partner_type":"C"}) + partner = models.ForeignKey(Partner,verbose_name=_("partner"),limit_choices_to={"partner_type":"C"},on_delete=models.CASCADE) offer_date = models.DateField(_("offer date")) deliver_date = models.DateField(_("deliver date")) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True) + org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) description = models.TextField(_("memo"),blank=True,null=True) amount = models.DecimalField(_("money amount"),max_digits=12,decimal_places=2,blank=True,null=True,default=0.00) discount_amount = models.DecimalField(_("discount amount"),max_digits=12,decimal_places=2,blank=True,null=True,default=0.00) - user = models.ForeignKey(User,verbose_name=_("offer man"),blank=True,null=True) + user = models.ForeignKey(User,verbose_name=_("offer man"),blank=True,null=True,on_delete=models.CASCADE) attach = models.FileField(_('offer sheet file'),blank=True,null=True,upload_to='offer sheet',help_text=u'您可导入报价明细，模板请参考文档FD0006') status = models.BooleanField(_("executed"),default=0) @@ -195,12 +195,12 @@ def save(self, force_insert=False, force_update=False, using=None, try: measure = Measure.objects.get(code=row[4]) - except Exception,e: + except Exception: measure = Measure.objects.create(code=row[4],name=force_text(row[5])) try: material = Material.objects.get(code=row[0]) - except Exception,e: + except Exception: material = Material(code=row[0],name=force_text(row[1]),spec=force_text(row[2])) material.sale_price = row[6] material.purchase_price = row[7] @@ -221,9 +221,9 @@ class OfferItem(models.Model): """ 订单明细 """ - master = models.ForeignKey(OfferSheet) - material = models.ForeignKey(Material,verbose_name=_("material"),limit_choices_to={"is_virtual":"0",'can_sale':'1'},blank=True,null=True) - measure = models.ForeignKey(Measure,verbose_name=_("measure"),blank=True,null=True) + master = models.ForeignKey(OfferSheet,on_delete=models.CASCADE) + material = models.ForeignKey(Material,verbose_name=_("material"),limit_choices_to={"is_virtual":"0",'can_sale':'1'},blank=True,null=True,on_delete=models.CASCADE) + measure = models.ForeignKey(Measure,verbose_name=_("measure"),blank=True,null=True,on_delete=models.CASCADE) cnt = models.DecimalField(_("count"),max_digits=14,decimal_places=4) brand = models.CharField(_('brand'),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) cost_price = models.DecimalField(_("cost price"),max_digits=14,decimal_places=4,blank=True,null=True) diff --git a/selfhelp/admin.py b/selfhelp/admin.py index 0a52495..26abc62 100644 --- a/selfhelp/admin.py +++ b/selfhelp/admin.py @@ -108,7 +108,7 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No if obj and obj.status == 'P': extra_context = extra_context or {} extra_context.update(dict(readonly=True)) - except Exception,e: + except Exception: pass return super(LoanAdmin,self).changeform_view(request,object_id,form_url,extra_context) @@ -182,7 +182,7 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No if obj and obj.status == 'P': extra_context = extra_context or {} extra_context.update(dict(readonly=True)) - except Exception,e: + except Exception: pass return super(ReimbursementAdmin,self).changeform_view(request,object_id,form_url,extra_context) diff --git a/selfhelp/models.py b/selfhelp/models.py index 5fc023d..8fd87be 100644 --- a/selfhelp/models.py +++ b/selfhelp/models.py @@ -6,7 +6,7 @@ from django.db import transaction from django.db import models from django.contrib.auth.models import User -from django.utils.text import force_text +from django.utils.encoding import force_text from django.utils.translation import ugettext_lazy as _ from common import generic from common import const @@ -21,16 +21,16 @@ class WorkOrder(generic.BO): """ index_weight = 1 code = models.CharField(_("workorder code"),blank=True,null=True,max_length=const.DB_CHAR_CODE_10) - refer = models.ForeignKey("self",verbose_name=_("refer wo"),blank=True,null=True) + refer = models.ForeignKey("self",verbose_name=_("refer wo"),blank=True,null=True,on_delete=models.CASCADE) title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_120) description = models.TextField(_("description"),blank=True,null=True) business_domain = models.CharField(_("business domain"),max_length=const.DB_CHAR_CODE_4,choices=const.get_value_list('S045'),default='OT') classification = models.CharField(_("classification"),max_length=const.DB_CHAR_CODE_4,choices=const.get_value_list('S044'),default='D') - service = models.ForeignKey(Material,verbose_name=_("service name"),null=True,blank=True,limit_choices_to={"is_virtual":"1"}) - project = models.ForeignKey(Project,verbose_name=_("project"),null=True,blank=True) + service = models.ForeignKey(Material,verbose_name=_("service name"),null=True,blank=True,limit_choices_to={"is_virtual":"1"},on_delete=models.CASCADE) + project = models.ForeignKey(Project,verbose_name=_("project"),null=True,blank=True,on_delete=models.CASCADE) status = models.CharField(_("status"),blank=True,null=True,default='NEW',max_length=const.DB_CHAR_CODE_6,choices=const.get_value_list('S046')) answer = models.TextField(_("answer"),blank=True,null=True) - user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True) + user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) attach = models.FileField(_('attach'),blank=True,null=True,help_text=u'工单附件，不导入明细。') detail = models.FileField(_('to be imported detail'),blank=True,null=True,help_text=u'您可导入需求明细，模板请参考文档FD0007') @@ -67,11 +67,11 @@ def save(self, force_insert=False, force_update=False, using=None, measure = None try: measure = Measure.objects.get(code=row[4]) - except Exception,e: + except Exception: measure = Measure.objects.create(code=row[4],name=force_text(row[5])) try: material = Material.objects.get(code=row[0]) - except Exception,e: + except Exception: material = Material(code=row[0],name=force_text(row[1]),spec=force_text(row[2])) material.save() WOItem.objects.create(workorder=self,material=material,measure=measure,amount=row[6]) @@ -88,8 +88,8 @@ class WOExtraValue(models.Model): """ """ - workorder = models.ForeignKey(WorkOrder,verbose_name=_("workorder")) - param_name = models.ForeignKey(ExtraParam,verbose_name=_("extra param")) + workorder = models.ForeignKey(WorkOrder,verbose_name=_("workorder"),on_delete=models.CASCADE) + param_name = models.ForeignKey(ExtraParam,verbose_name=_("extra param"),on_delete=models.CASCADE) param_value = models.CharField(_("param value"),blank=True,null=True,max_length=const.DB_CHAR_NAME_40) class Meta: @@ -101,10 +101,10 @@ class WOItem(models.Model): """ """ - workorder = models.ForeignKey(WorkOrder,verbose_name=_("workorder")) - material = models.ForeignKey(Material,verbose_name=_("material"),null=True,blank=True,limit_choices_to={"is_virtual":"0"}) + workorder = models.ForeignKey(WorkOrder,verbose_name=_("workorder"),on_delete=models.CASCADE) + material = models.ForeignKey(Material,verbose_name=_("material"),null=True,blank=True,limit_choices_to={"is_virtual":"0"},on_delete=models.CASCADE) amount = models.DecimalField(_("amount"),max_digits=10,decimal_places=4,blank=True,null=True) - measure = models.ForeignKey(Measure,verbose_name=_('measure'),blank=True,null=True) + measure = models.ForeignKey(Measure,verbose_name=_('measure'),blank=True,null=True,on_delete=models.CASCADE) price = models.DecimalField(_("price"),max_digits=10,decimal_places=4,blank=True,null=True) class Meta: @@ -126,8 +126,8 @@ class Loan(generic.BO): code = models.CharField(_("loan code"),max_length=const.DB_CHAR_CODE_10,blank=True,null=True) title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_120) description = models.TextField(_("description"),blank=True,null=True) - project = models.ForeignKey(Project,verbose_name=_("project")) - user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True) + project = models.ForeignKey(Project,verbose_name=_("project"),on_delete=models.CASCADE) + user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) status = models.CharField(_("status"),blank=True,null=True,default='N',max_length=const.DB_CHAR_CODE_2,choices=LOAD_STATUS) logout_time = models.DateTimeField(_("logout time"),blank=True,null=True) loan_amount = models.DecimalField(_("loan amount"),max_digits=10,decimal_places=2,blank=True,null=True) @@ -176,14 +176,14 @@ class Reimbursement(generic.BO): code = models.CharField(_("fee code"),max_length=const.DB_CHAR_CODE_10,blank=True,null=True) title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_120) description = models.TextField(_("description"),blank=True,null=True) - project = models.ForeignKey(Project,verbose_name=_("project")) - wo = models.ForeignKey(WorkOrder,verbose_name=_("work order"),null=True,blank=True) - user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True) - org = models.ForeignKey(OrgUnit,verbose_name=_("cost center"),blank=True,null=True) + project = models.ForeignKey(Project,verbose_name=_("project"),on_delete=models.CASCADE) + wo = models.ForeignKey(WorkOrder,verbose_name=_("work order"),null=True,blank=True,on_delete=models.CASCADE) + user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) + org = models.ForeignKey(OrgUnit,verbose_name=_("cost center"),blank=True,null=True,on_delete=models.CASCADE) bank_account = models.CharField(_("bank account"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) status = models.CharField(_("status"),blank=True,null=True,default='N',max_length=const.DB_CHAR_CODE_2,choices=REIM_STATUS) amount = models.DecimalField(_("amount of money"),max_digits=10,decimal_places=2,blank=True,null=True) - loan = models.ForeignKey(Loan,verbose_name=_("loan record"),blank=True,null=True) + loan = models.ForeignKey(Loan,verbose_name=_("loan record"),blank=True,null=True,on_delete=models.CASCADE) loan_amount = models.DecimalField(_("loan amount"),max_digits=10,decimal_places=2,blank=True,null=True) logout_amount = models.DecimalField(_("logout amount"),max_digits=10,decimal_places=2,blank=True,null=True) pay_amount = models.DecimalField(_("pay amount"),max_digits=10,decimal_places=2,blank=True,null=True) @@ -250,8 +250,8 @@ class ReimbursementItem(models.Model): """ import datetime - reimbursement = models.ForeignKey(Reimbursement,verbose_name=_("reimbursement")) - expense_account = models.ForeignKey(ExpenseAccount,verbose_name=_("expenses account")) + reimbursement = models.ForeignKey(Reimbursement,verbose_name=_("reimbursement"),on_delete=models.CASCADE) + expense_account = models.ForeignKey(ExpenseAccount,verbose_name=_("expenses account"),on_delete=models.CASCADE) begin = models.DateField(_("occur date"),default=datetime.date.today) amount = models.DecimalField(_("amount of money"),max_digits=10,decimal_places=2) memo = models.CharField(_("memo"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) @@ -283,12 +283,12 @@ class Activity(generic.BO): enroll_deadline = models.DateTimeField(_('enroll deadline'),blank=True,null=True) code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_120) - parent = models.ForeignKey('self',verbose_name=_("parent"),blank=True,null=True) + parent = models.ForeignKey('self',verbose_name=_("parent"),blank=True,null=True,on_delete=models.CASCADE) description = models.TextField(_("description"),blank=True,null=True) host = models.CharField(_("host"),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) speaker = models.CharField(_("speaker"),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) accept_enroll = models.BooleanField(_("accept enroll"),default=1) - room = models.ForeignKey(Material,verbose_name=_("room"),blank=True,null=True,limit_choices_to={'tp':20}) + room = models.ForeignKey(Material,verbose_name=_("room"),blank=True,null=True,limit_choices_to={'tp':20},on_delete=models.CASCADE) location = models.CharField(_("location"),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) classification = models.CharField(_("classification"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=CLASSIFICATION,default='M') mail_list = models.TextField(_("mail list"),blank=True,null=True) @@ -314,8 +314,8 @@ class Feedback(models.Model): ('C','C'), ('D','D'), ) - activity = models.ForeignKey(Activity) - user = models.ForeignKey(User) + activity = models.ForeignKey(Activity,on_delete=models.CASCADE) + user = models.ForeignKey(User,on_delete=models.CASCADE) feed_time = models.DateTimeField(_("feedback time"),auto_now_add=True) rank = models.CharField(_('rank'),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=RANK,default='B') comment = models.CharField(_("suggest"),blank=True,null=True,max_length=const.DB_CHAR_NAME_80) @@ -325,6 +325,6 @@ class Enroll(models.Model): """ """ - activity = models.ForeignKey(Activity) - user = models.ForeignKey(User) + activity = models.ForeignKey(Activity,on_delete=models.CASCADE) + user = models.ForeignKey(User,on_delete=models.CASCADE) enroll_time = models.DateTimeField(_("enroll time"),auto_now_add=True) diff --git a/selfhelp/views.py b/selfhelp/views.py index 261d5a3..7aee157 100644 --- a/selfhelp/views.py +++ b/selfhelp/views.py @@ -28,7 +28,7 @@ def pay_action(request,model,object_id): try: obj.action_pay(request) messages.success(request,_('action successfully')) - except Exception,e: + except Exception as e: messages.error(request,e) return HttpResponseRedirect("/admin/selfhelp/%s/%s"%(model,object_id)) diff --git a/syscfg/models.py b/syscfg/models.py index b84eebd..b0b3870 100644 --- a/syscfg/models.py +++ b/syscfg/models.py @@ -35,7 +35,7 @@ class Module(generic.BO): url = models.URLField(_("module url"),blank=True,null=True,max_length=const.DB_CHAR_NAME_80) weight = models.IntegerField(_("weight"),blank=True,null=True,default=99) icon = models.CharField(_("style class"),blank=True,null=True,max_length=const.DB_CHAR_NAME_40) - parent = models.ForeignKey('self',blank=True,null=True,verbose_name=_("parent")) + parent = models.ForeignKey('self',blank=True,null=True,verbose_name=_("parent"),on_delete=models.CASCADE) status = models.BooleanField(_("in use"),default=True) class Meta: @@ -48,7 +48,7 @@ class Menu(generic.BO): 菜单管理 """ index_weight = 3 - module = models.ForeignKey(Module,verbose_name=_("module")) + module = models.ForeignKey(Module,verbose_name=_("module"),on_delete=models.CASCADE) code = models.CharField(_("menu code"),max_length=const.DB_CHAR_CODE_6,blank=True,null=True) name = models.CharField(_("menu name"),max_length=const.DB_CHAR_NAME_40) url = models.URLField(_("menu url"),blank=True,null=True,max_length=const.DB_CHAR_NAME_80) @@ -70,7 +70,7 @@ class Role(generic.BO): name = models.CharField(_("role name"),max_length=const.DB_CHAR_NAME_40) description = models.CharField(_("description"),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) status = models.BooleanField(_("in use"),default=True) - parent = models.ForeignKey('self',blank=True,null=True,verbose_name=_("parent")) + parent = models.ForeignKey('self',blank=True,null=True,verbose_name=_("parent"),on_delete=models.CASCADE) users = models.ManyToManyField(User,verbose_name=_("role users"),blank=True) menus = models.ManyToManyField(Menu,verbose_name=_("role menus"),blank=True) diff --git a/workflow/admin.py b/workflow/admin.py index 39fe49d..048efc6 100644 --- a/workflow/admin.py +++ b/workflow/admin.py @@ -1,3 +1,4 @@ + from django.contrib import admin from django.contrib.contenttypes.models import ContentType from common import generic @@ -25,7 +26,6 @@ class WorkflowModelAdmin(admin.ModelAdmin): ) def get_form(self, request, obj=None, **kwargs): - print kwargs return super(WorkflowModelAdmin,self).get_form(request,obj,**kwargs) def save_model(self, request, obj, form, change): diff --git a/workflow/models.py b/workflow/models.py index 7bf9f40..992f265 100644 --- a/workflow/models.py +++ b/workflow/models.py @@ -18,7 +18,7 @@ class Modal(models.Model): code = models.CharField(_("workflow code"),max_length=const.DB_CHAR_CODE_6,blank=True,null=True) name = models.CharField(_("workflow name"),max_length=const.DB_CHAR_NAME_40) description = models.TextField(_("description"),blank=True,null=True) - content_type = models.ForeignKey(ContentType,verbose_name=_("content type"),limit_choices_to={"app_label__in":['basedata','organ']}) + content_type = models.ForeignKey(ContentType,verbose_name=_("content type"),limit_choices_to={"app_label__in":['basedata','organ']},on_delete=models.CASCADE) app_name = models.CharField(_("app name"),max_length=const.DB_CHAR_NAME_60,blank=True,null=True) model_name = models.CharField(_("model name"),max_length=const.DB_CHAR_NAME_60,blank=True,null=True) # added by zhugl 2015-05-10 @@ -50,7 +50,7 @@ class Node(models.Model): (4, _("submitter")), ) index_weight = 2 - modal = models.ForeignKey(Modal,verbose_name=_("workflow model")) + modal = models.ForeignKey(Modal,verbose_name=_("workflow model"),on_delete=models.CASCADE) code = models.CharField(_("node code"),max_length=const.DB_CHAR_CODE_4,blank=True,null=True) name = models.CharField(_("node name"),max_length=const.DB_CHAR_NAME_80) tooltip = models.CharField(_('tooltip words'),blank=True,null=True,max_length=const.DB_CHAR_NAME_120) @@ -108,9 +108,9 @@ class Instance(models.Model): ) index_weight = 3 code = models.CharField(_("code"),blank=True,null=True,max_length=const.DB_CHAR_CODE_10) - modal = models.ForeignKey(Modal,verbose_name=_("workflow model")) + modal = models.ForeignKey(Modal,verbose_name=_("workflow model"),on_delete=models.CASCADE) object_id = models.PositiveIntegerField("object id") - starter = models.ForeignKey(User,verbose_name=_("start user"),related_name="starter") + starter = models.ForeignKey(User,verbose_name=_("start user"),related_name="starter",on_delete=models.CASCADE) start_time = models.DateTimeField(_("start time"),auto_now_add=True) approved_time = models.DateTimeField(_("approved time"),blank=True,null=True) status = models.IntegerField(_("status"),default=1,choices=STATUS) @@ -142,9 +142,9 @@ class History(models.Model): (4, _("TERMINATE")), ) index_weight = 5 - inst = models.ForeignKey(Instance,verbose_name=_("workflow instance")) - node = models.ForeignKey(Node,verbose_name=_("workflow node"),blank=True,null=True) - user = models.ForeignKey(User,verbose_name=_("submitter")) + inst = models.ForeignKey(Instance,verbose_name=_("workflow instance"),on_delete=models.CASCADE) + node = models.ForeignKey(Node,verbose_name=_("workflow node"),blank=True,null=True,on_delete=models.CASCADE) + user = models.ForeignKey(User,verbose_name=_("submitter"),on_delete=models.CASCADE) pro_time = models.DateTimeField(_("process time"),auto_now_add=True) pro_type = models.IntegerField(_("process type"),choices=PROCESS_TYPE,default=0) memo = models.CharField(_("memo"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) @@ -181,11 +181,11 @@ class TodoList(models.Model): """ index_weight = 4 code = models.CharField(_("code"),max_length=const.DB_CHAR_CODE_10,blank=True,null=True) - inst = models.ForeignKey(Instance,verbose_name=_("workflow instance")) - node = models.ForeignKey(Node,verbose_name=_("current node"),blank=True,null=True) + inst = models.ForeignKey(Instance,verbose_name=_("workflow instance"),on_delete=models.CASCADE) + node = models.ForeignKey(Node,verbose_name=_("current node"),blank=True,null=True,on_delete=models.CASCADE) app_name = models.CharField(_("app name"),max_length=const.DB_CHAR_NAME_60,blank=True,null=True) model_name = models.CharField(_("model name"),max_length=const.DB_CHAR_NAME_60,blank=True,null=True) - user = models.ForeignKey(User,verbose_name=_("handler")) + user = models.ForeignKey(User,verbose_name=_("handler"),on_delete=models.CASCADE) arrived_time = models.DateTimeField(_("arrived time"),auto_now_add=True) is_read = models.BooleanField(_("is read"),default=False) read_time = models.DateTimeField(_("read time"),blank=True,null=True) @@ -211,13 +211,10 @@ def code_link(self): code_link.short_description = _("code") def href(self): - import sys - reload(sys) - sys.setdefaultencoding("utf-8") ct = ContentType.objects.get(app_label=self.app_name,model=self.model_name) obj = ct.get_object_for_this_type(id=self.inst.object_id) - title = u"%s" % (obj) - return format_html("{}", + title = u"%s" % obj + return format_html(u"{}", self.app_name,self.model_name,self.inst.object_id,title) def modal_dsc(self): return u'%s'%(self.inst.modal.name) @@ -251,7 +248,7 @@ def get_modal(app_label,model_name): """ try: return Modal.objects.get(app_name=app_label,model_name=model_name) - except Exception,e: + except Exception: return None @@ -266,7 +263,7 @@ def get_instance(obj): if modal: try: return Instance.objects.get(modal=modal,object_id=obj.id) - except Exception,e: + except Exception: return None else: return None diff --git a/workflow/views.py b/workflow/views.py index df40cb9..ca21e3c 100644 --- a/workflow/views.py +++ b/workflow/views.py @@ -133,7 +133,7 @@ def start(request,app,model,object_id): try: setattr(obj,next_node.status_field,next_node.status_value) obj.save() - except Exception,e: + except Exception: pass messages.success(request,_('workflow started successfully')) return HttpResponseRedirect("/admin/%s/%s/%s"%(app,model,object_id)) @@ -253,12 +253,12 @@ def approve(request,app,model,object_id,operation): try: setattr(obj,current_tmp.status_field,current_tmp.status_value) obj.save() - except Exception,e: + except Exception: pass History.objects.create(inst=workflow_instance,user=request.user,pro_type=int(operation),memo=memo,node=current_tmp) TodoList.objects.filter(inst=workflow_instance,node=current_tmp,status=0).update(status=1) messages.success(request,_('workflow approved successfully')) - except Exception,e: + except Exception as e: messages.error(request,e) pass if current_tmp.action and len(current_tmp.action) > 0: @@ -309,6 +309,6 @@ def restart(request,app,model,object_id,instance): messages.success(request,_("workflow restarted success")) else: messages.warning(request,_("you do not have the permission to restart,only the starter can restart")) - except Exception,e: + except Exception as e: messages.error(request,e) return HttpResponseRedirect("/admin/%s/%s/%s"%(app,model,object_id)) \ No newline at end of file From c8f10c2eb8f9cf133543c1a94aa5c74e5bec19fa Mon Sep 17 00:00:00 2001 From: 007 <007gzs@gmail.com> Date: Tue, 15 May 2018 16:09:02 +0800 Subject: [PATCH 02/65] python 3 object.__str__ --- basedata/models.py | 21 +++++++++++---------- common/generic.py | 13 +++++++++++-- hr/models.py | 3 ++- syscfg/models.py | 3 ++- workflow/models.py | 11 ++++++----- 5 files changed, 32 insertions(+), 19 deletions(-) diff --git a/basedata/models.py b/basedata/models.py index 7bd4989..9344461 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -7,6 +7,7 @@ from django.utils.encoding import force_text from common import const from common import generic +from common.generic import ToStringMixin from syscfg.models import Module,Site from organ.models import Organization,Position import datetime @@ -39,7 +40,7 @@ class Meta: verbose_name_plural = _('value list') -class ValueListItem(models.Model): +class ValueListItem(models.Model, ToStringMixin): """ 值列表项 """ @@ -199,7 +200,7 @@ class Meta: verbose_name_plural = _('project') -class Warehouse(models.Model): +class Warehouse(models.Model, ToStringMixin): """ 仓库 """ @@ -219,7 +220,7 @@ class Meta: verbose_name_plural = _('warehouse') -class Measure(models.Model): +class Measure(models.Model, ToStringMixin): """ 计量单位 """ @@ -236,7 +237,7 @@ class Meta: verbose_name_plural = _('measure') -class Trade(models.Model): +class Trade(models.Model, ToStringMixin): """ 国民经济行业分类 """ @@ -255,7 +256,7 @@ class Meta: ordering = ['code'] -class Brand(models.Model): +class Brand(models.Model, ToStringMixin): """ 品牌 """ @@ -273,7 +274,7 @@ class Meta: verbose_name_plural = _('brand') -class Category(models.Model): +class Category(models.Model, ToStringMixin): """ 分类 """ @@ -292,7 +293,7 @@ class Meta: verbose_name_plural = _('category') -class TechnicalParameterName(models.Model): +class TechnicalParameterName(models.Model, ToStringMixin): """ 技术参数-名称，将技术参数绑定于物料分类上，在此分类下的物料自动继承全部技术参数 """ @@ -309,7 +310,7 @@ class Meta: verbose_name_plural = _('technical parameter') -class TechnicalParameterValue(models.Model): +class TechnicalParameterValue(models.Model, ToStringMixin): """ 技术参数-值，将技术参数绑定于物料分类上，在此分类下的物料自动继承全部技术参数 """ @@ -363,7 +364,7 @@ class Meta: ordering = ['tp','code'] -class MaterialParam(models.Model): +class MaterialParam(models.Model, ToStringMixin): """ """ @@ -380,7 +381,7 @@ class Meta: verbose_name_plural = _('material parameter') -class ExtraParam(models.Model): +class ExtraParam(models.Model, ToStringMixin): """ """ diff --git a/common/generic.py b/common/generic.py index 330b7c3..978812e 100644 --- a/common/generic.py +++ b/common/generic.py @@ -13,7 +13,7 @@ from django.contrib import admin from django.http import HttpRequest,HttpResponse from django.contrib.contenttypes.models import ContentType -from django.utils.encoding import smart_str, force_text +from django.utils.encoding import smart_str, force_text, force_str from django.utils.http import urlquote from django.utils.translation import ugettext_lazy as _ from common import const @@ -70,7 +70,16 @@ def get_query_set(self): return super(BOManager,self).get_query_set() -class BO(models.Model): +class ToStringMixin(object): + + def __unicode__(self): + return u'' + + def __str__(self): + return force_str(self.__unicode__()) + + +class BO(models.Model, ToStringMixin): """ All business object derive from this class """ diff --git a/hr/models.py b/hr/models.py index 9c81d73..3360e97 100644 --- a/hr/models.py +++ b/hr/models.py @@ -5,6 +5,7 @@ from common import generic from common import const from basedata.models import Position,Employee +from common.generic import ToStringMixin from organ.models import OrgUnit import datetime @@ -19,7 +20,7 @@ def value(self): return 0 -class SalaryItem(models.Model): +class SalaryItem(models.Model, ToStringMixin): """ 工资项 """ diff --git a/syscfg/models.py b/syscfg/models.py index b0b3870..d3137d2 100644 --- a/syscfg/models.py +++ b/syscfg/models.py @@ -4,9 +4,10 @@ from django.utils.translation import ugettext_lazy as _ from common import const from common import generic +from common.generic import ToStringMixin -class Site(models.Model): +class Site(models.Model, ToStringMixin): """ 站点，一个站点下可有多个公司，处于同一个站点下的用户逻辑上位于同一个组织 """ diff --git a/workflow/models.py b/workflow/models.py index 992f265..2603c8d 100644 --- a/workflow/models.py +++ b/workflow/models.py @@ -5,11 +5,12 @@ from django.utils.html import format_html from django.utils.translation import ugettext_lazy as _ from common import const +from common.generic import ToStringMixin from syscfg.models import Role from organ.models import Position,OrgUnit -class Modal(models.Model): +class Modal(models.Model, ToStringMixin): """ """ @@ -33,7 +34,7 @@ class Meta: verbose_name_plural = _("workflow model") -class Node(models.Model): +class Node(models.Model, ToStringMixin): """ submitter() upper() @@ -94,7 +95,7 @@ class Meta: verbose_name_plural = _("workflow node") -class Instance(models.Model): +class Instance(models.Model, ToStringMixin): """ """ @@ -131,7 +132,7 @@ class Meta: verbose_name_plural = _("workflow instance") -class History(models.Model): +class History(models.Model, ToStringMixin): """ workflow history """ @@ -175,7 +176,7 @@ class Meta: ordering = ['inst','pro_time'] -class TodoList(models.Model): +class TodoList(models.Model, ToStringMixin): """ """ From 86ef82c46cc7d4508b53620994f7f551e294d3b6 Mon Sep 17 00:00:00 2001 From: 007 <007gzs@gmail.com> Date: Tue, 15 May 2018 16:10:57 +0800 Subject: [PATCH 03/65] =?UTF-8?q?=E6=B2=A1=E6=9C=89=5F=5Funicode=5F=5F?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E9=BB=98=E8=AE=A4=E8=B0=83=5F=5Fstr=5F=5F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/generic.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/generic.py b/common/generic.py index 978812e..047212b 100644 --- a/common/generic.py +++ b/common/generic.py @@ -72,11 +72,11 @@ def get_query_set(self): class ToStringMixin(object): - def __unicode__(self): - return u'' - def __str__(self): - return force_str(self.__unicode__()) + if hasattr(self, '__unicode__'): + return force_str(self.__unicode__()) + else: + return super(ToStringMixin, self).__str__() class BO(models.Model, ToStringMixin): From abfe105a0fa36fa5bdf210d9d8c7a0bf49ab6284 Mon Sep 17 00:00:00 2001 From: 007 <007gzs@gmail.com> Date: Tue, 15 May 2018 16:15:55 +0800 Subject: [PATCH 04/65] =?UTF-8?q?=E7=BB=A7=E6=89=BF=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 20 ++++++++++---------- common/generic.py | 2 +- hr/models.py | 2 +- syscfg/models.py | 2 +- workflow/models.py | 10 +++++----- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/basedata/models.py b/basedata/models.py index 9344461..2a7c7b2 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -40,7 +40,7 @@ class Meta: verbose_name_plural = _('value list') -class ValueListItem(models.Model, ToStringMixin): +class ValueListItem(ToStringMixin, models.Model): """ 值列表项 """ @@ -200,7 +200,7 @@ class Meta: verbose_name_plural = _('project') -class Warehouse(models.Model, ToStringMixin): +class Warehouse(ToStringMixin, models.Model): """ 仓库 """ @@ -220,7 +220,7 @@ class Meta: verbose_name_plural = _('warehouse') -class Measure(models.Model, ToStringMixin): +class Measure(ToStringMixin, models.Model): """ 计量单位 """ @@ -237,7 +237,7 @@ class Meta: verbose_name_plural = _('measure') -class Trade(models.Model, ToStringMixin): +class Trade(ToStringMixin, models.Model): """ 国民经济行业分类 """ @@ -256,7 +256,7 @@ class Meta: ordering = ['code'] -class Brand(models.Model, ToStringMixin): +class Brand(ToStringMixin, models.Model): """ 品牌 """ @@ -274,7 +274,7 @@ class Meta: verbose_name_plural = _('brand') -class Category(models.Model, ToStringMixin): +class Category(ToStringMixin, models.Model): """ 分类 """ @@ -293,7 +293,7 @@ class Meta: verbose_name_plural = _('category') -class TechnicalParameterName(models.Model, ToStringMixin): +class TechnicalParameterName(ToStringMixin, models.Model): """ 技术参数-名称，将技术参数绑定于物料分类上，在此分类下的物料自动继承全部技术参数 """ @@ -310,7 +310,7 @@ class Meta: verbose_name_plural = _('technical parameter') -class TechnicalParameterValue(models.Model, ToStringMixin): +class TechnicalParameterValue(ToStringMixin, models.Model): """ 技术参数-值，将技术参数绑定于物料分类上，在此分类下的物料自动继承全部技术参数 """ @@ -364,7 +364,7 @@ class Meta: ordering = ['tp','code'] -class MaterialParam(models.Model, ToStringMixin): +class MaterialParam(ToStringMixin, models.Model): """ """ @@ -381,7 +381,7 @@ class Meta: verbose_name_plural = _('material parameter') -class ExtraParam(models.Model, ToStringMixin): +class ExtraParam(ToStringMixin, models.Model): """ """ diff --git a/common/generic.py b/common/generic.py index 047212b..d569a1f 100644 --- a/common/generic.py +++ b/common/generic.py @@ -79,7 +79,7 @@ def __str__(self): return super(ToStringMixin, self).__str__() -class BO(models.Model, ToStringMixin): +class BO(ToStringMixin, models.Model): """ All business object derive from this class """ diff --git a/hr/models.py b/hr/models.py index 3360e97..b62edd0 100644 --- a/hr/models.py +++ b/hr/models.py @@ -20,7 +20,7 @@ def value(self): return 0 -class SalaryItem(models.Model, ToStringMixin): +class SalaryItem(ToStringMixin, models.Model): """ 工资项 """ diff --git a/syscfg/models.py b/syscfg/models.py index d3137d2..a3d21e9 100644 --- a/syscfg/models.py +++ b/syscfg/models.py @@ -7,7 +7,7 @@ from common.generic import ToStringMixin -class Site(models.Model, ToStringMixin): +class Site(ToStringMixin, models.Model): """ 站点，一个站点下可有多个公司，处于同一个站点下的用户逻辑上位于同一个组织 """ diff --git a/workflow/models.py b/workflow/models.py index 2603c8d..0ef7be2 100644 --- a/workflow/models.py +++ b/workflow/models.py @@ -10,7 +10,7 @@ from organ.models import Position,OrgUnit -class Modal(models.Model, ToStringMixin): +class Modal(ToStringMixin, models.Model): """ """ @@ -34,7 +34,7 @@ class Meta: verbose_name_plural = _("workflow model") -class Node(models.Model, ToStringMixin): +class Node(ToStringMixin, models.Model): """ submitter() upper() @@ -95,7 +95,7 @@ class Meta: verbose_name_plural = _("workflow node") -class Instance(models.Model, ToStringMixin): +class Instance(ToStringMixin, models.Model): """ """ @@ -132,7 +132,7 @@ class Meta: verbose_name_plural = _("workflow instance") -class History(models.Model, ToStringMixin): +class History(ToStringMixin, models.Model): """ workflow history """ @@ -176,7 +176,7 @@ class Meta: ordering = ['inst','pro_time'] -class TodoList(models.Model, ToStringMixin): +class TodoList(ToStringMixin, models.Model): """ """ From d96122c750e3a3800dba02d6cefe0b441f3fa7b3 Mon Sep 17 00:00:00 2001 From: AngelLiang Date: Sat, 13 Jun 2020 20:59:58 +0800 Subject: [PATCH 05/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E5=BC=80=E5=A7=8B=E7=9A=84=E6=96=87=E6=A1=A3=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 + Pipfile | 15 + Pipfile.lock | 60 +++ basedata/migrations/0001_initial.py | 575 ++++++++++++++++++++++++++++ basedata/migrations/__init__.py | 0 basedata/models.py | 6 +- hr/migrations/0001_initial.py | 136 +++++++ hr/migrations/__init__.py | 0 invent/migrations/0001_initial.py | 264 +++++++++++++ invent/migrations/__init__.py | 0 mis/settings.py | 18 +- note.md | 8 + organ/migrations/0001_initial.py | 115 ++++++ organ/migrations/__init__.py | 0 purchase/migrations/0001_initial.py | 143 +++++++ purchase/migrations/__init__.py | 0 sale/migrations/0001_initial.py | 180 +++++++++ sale/migrations/__init__.py | 0 selfhelp/migrations/0001_initial.py | 224 +++++++++++ selfhelp/migrations/__init__.py | 0 syscfg/migrations/0001_initial.py | 107 ++++++ syscfg/migrations/__init__.py | 0 workflow/migrations/0001_initial.py | 155 ++++++++ workflow/migrations/__init__.py | 0 24 files changed, 2001 insertions(+), 8 deletions(-) create mode 100644 .gitignore create mode 100644 Pipfile create mode 100644 Pipfile.lock create mode 100644 basedata/migrations/0001_initial.py create mode 100644 basedata/migrations/__init__.py create mode 100644 hr/migrations/0001_initial.py create mode 100644 hr/migrations/__init__.py create mode 100644 invent/migrations/0001_initial.py create mode 100644 invent/migrations/__init__.py create mode 100644 note.md create mode 100644 organ/migrations/0001_initial.py create mode 100644 organ/migrations/__init__.py create mode 100644 purchase/migrations/0001_initial.py create mode 100644 purchase/migrations/__init__.py create mode 100644 sale/migrations/0001_initial.py create mode 100644 sale/migrations/__init__.py create mode 100644 selfhelp/migrations/0001_initial.py create mode 100644 selfhelp/migrations/__init__.py create mode 100644 syscfg/migrations/0001_initial.py create mode 100644 syscfg/migrations/__init__.py create mode 100644 workflow/migrations/0001_initial.py create mode 100644 workflow/migrations/__init__.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..04655ca --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.sqlite3 +.vscode/ +.venv/ diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000..c2bbbc7 --- /dev/null +++ b/Pipfile @@ -0,0 +1,15 @@ +[[source]] +name = "pypi" +url = "https://pypi.org/simple" +verify_ssl = true + +[dev-packages] + +[packages] +django = "<2.0" +xlwt = "*" +xlrd = "*" +pymysql = "*" + +[requires] +python_version = "2.7" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 0000000..71700da --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,60 @@ +{ + "_meta": { + "hash": { + "sha256": "8e22a5249afffe582a3836bfc0fac9f381e906443b4b95de1c2de25b94325fc4" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "2.7" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "django": { + "hashes": [ + "sha256:014e3392058d94f40569206a24523ce254d55ad2f9f46c6550b0fe2e4f94cf3f", + "sha256:4200aefb6678019a0acf0005cd14cfce3a5e6b9b90d06145fcdd2e474ad4329c" + ], + "index": "pypi", + "version": "==1.11.29" + }, + "pymysql": { + "hashes": [ + "sha256:3943fbbbc1e902f41daf7f9165519f140c4451c179380677e6a848587042561a", + "sha256:d8c059dcd81dedb85a9f034d5e22dcb4442c0b201908bede99e306d65ea7c8e7" + ], + "index": "pypi", + "version": "==0.9.3" + }, + "pytz": { + "hashes": [ + "sha256:a494d53b6d39c3c6e44c3bec237336e14305e4f29bbf800b599253057fbb79ed", + "sha256:c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048" + ], + "version": "==2020.1" + }, + "xlrd": { + "hashes": [ + "sha256:546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2", + "sha256:e551fb498759fa3a5384a94ccd4c3c02eb7c00ea424426e212ac0c57be9dfbde" + ], + "index": "pypi", + "version": "==1.2.0" + }, + "xlwt": { + "hashes": [ + "sha256:a082260524678ba48a297d922cc385f58278b8aa68741596a87de01a9c628b2e", + "sha256:c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88" + ], + "index": "pypi", + "version": "==1.3.0" + } + }, + "develop": {} +} diff --git a/basedata/migrations/0001_initial.py b/basedata/migrations/0001_initial.py new file mode 100644 index 0000000..5f703f9 --- /dev/null +++ b/basedata/migrations/0001_initial.py @@ -0,0 +1,575 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-06-13 20:58 +from __future__ import unicode_literals + +import basedata.models +import datetime +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('organ', '0001_initial'), + ('syscfg', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Address', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('address_type', models.CharField(default=b'01', max_length=2, verbose_name='address type')), + ('address', models.CharField(max_length=120, verbose_name='address')), + ('zipcode', models.CharField(blank=True, max_length=8, null=True, verbose_name='zipcode')), + ('phone', models.CharField(blank=True, max_length=20, null=True, verbose_name='phone')), + ('contacts', models.CharField(blank=True, max_length=40, null=True, verbose_name='contacts')), + ('object_id', models.PositiveIntegerField(blank=True, null=True)), + ('content_type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), + ], + options={ + 'verbose_name': 'address', + 'verbose_name_plural': 'address', + }, + ), + migrations.CreateModel( + name='BankAccount', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('account', models.CharField(max_length=40, verbose_name='account num')), + ('title', models.CharField(max_length=40, verbose_name='bank name')), + ('memo', models.CharField(blank=True, max_length=20, null=True, verbose_name='memo')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ], + options={ + 'verbose_name': 'bank account', + 'verbose_name_plural': 'bank account', + }, + ), + migrations.CreateModel( + name='Brand', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=120, verbose_name='name')), + ('pinyin', models.CharField(blank=True, max_length=120, null=True, verbose_name='pinyin')), + ('weight', models.IntegerField(blank=True, default=99, null=True, verbose_name='weight')), + ], + options={ + 'verbose_name': 'brand', + 'verbose_name_plural': 'brand', + }, + ), + migrations.CreateModel( + name='Category', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('code', models.CharField(blank=True, max_length=6, null=True, verbose_name='code')), + ('name', models.CharField(max_length=120, verbose_name='name')), + ('path', models.CharField(blank=True, max_length=200, null=True, verbose_name='path')), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Category', verbose_name='parent')), + ], + options={ + 'verbose_name': 'category', + 'verbose_name_plural': 'category', + }, + ), + migrations.CreateModel( + name='DataImport', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('imp_date', models.DateField(blank=True, default=datetime.datetime.today, null=True, verbose_name='date')), + ('title', models.CharField(max_length=40, verbose_name='title')), + ('description', models.TextField(blank=True, null=True, verbose_name='description')), + ('attach', models.FileField(blank=True, null=True, upload_to=b'data', verbose_name='attach')), + ('is_clear', models.BooleanField(default=0, verbose_name='clear old data?')), + ('handler', models.CharField(blank=True, max_length=80, null=True, verbose_name='handler class')), + ('status', models.CharField(choices=[(b'0', 'NEW'), (b'1', 'EXECUTED')], default=b'0', max_length=2, verbose_name='status')), + ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType', verbose_name='content type')), + ], + options={ + 'verbose_name': 'data import', + 'verbose_name_plural': 'data import', + }, + ), + migrations.CreateModel( + name='Document', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='code')), + ('title', models.CharField(max_length=120, verbose_name='title')), + ('keywords', models.CharField(blank=True, max_length=120, null=True, verbose_name='keywords')), + ('description', models.TextField(blank=True, null=True, verbose_name='description')), + ('tp', models.CharField(choices=[(b'00', 'SYSTEM MANUAL'), (b'10', 'BUSINESS DOC')], default=b'10', max_length=2, verbose_name='type')), + ('business_domain', models.CharField(default=b'OT', max_length=4, verbose_name='business domain')), + ('status', models.CharField(choices=[(b'0', 'draft'), (b'1', 'published')], default=b'0', max_length=2, verbose_name='status')), + ('pub_date', models.DateTimeField(blank=True, null=True, verbose_name='publish date')), + ('size', models.CharField(blank=True, max_length=20, null=True, verbose_name='size')), + ('attach', models.FileField(blank=True, null=True, upload_to=b'doc', verbose_name='attach')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')), + ], + options={ + 'verbose_name': 'document', + 'verbose_name_plural': 'documents', + }, + ), + migrations.CreateModel( + name='Education', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('edu_type', models.CharField(default=b'1', max_length=2, verbose_name='edu type')), + ('school', models.CharField(max_length=120, verbose_name='school')), + ('major', models.CharField(blank=True, max_length=120, null=True, verbose_name='major')), + ('degree', models.CharField(blank=True, default=b'4', max_length=2, null=True, verbose_name='major degree')), + ], + options={ + 'verbose_name': 'education experience', + 'verbose_name_plural': 'education experience', + }, + ), + migrations.CreateModel( + name='Employee', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='employee number')), + ('phone', models.CharField(blank=True, max_length=20, null=True, verbose_name='phone')), + ('name', models.CharField(max_length=120, verbose_name='employee name')), + ('pinyin', models.CharField(blank=True, max_length=120, null=True, verbose_name='pinyin')), + ('birthday', models.DateField(blank=True, null=True, verbose_name='birthday')), + ('gender', models.CharField(default=b'1', max_length=2, verbose_name='gender')), + ('idcard', models.CharField(max_length=20, verbose_name='id card')), + ('country', models.CharField(blank=True, default=b'CN', max_length=2, null=True, verbose_name='nationality')), + ('hometown', models.CharField(blank=True, max_length=40, null=True, verbose_name='hometown')), + ('address', models.CharField(blank=True, max_length=120, null=True, verbose_name='home address')), + ('banknum', models.CharField(blank=True, max_length=40, null=True, verbose_name='bank account')), + ('bankname', models.CharField(blank=True, max_length=80, null=True, verbose_name='bank name')), + ('emergency', models.CharField(blank=True, max_length=40, null=True, verbose_name='emergency contacts')), + ('email', models.CharField(blank=True, max_length=20, null=True, verbose_name='email')), + ('office', models.CharField(blank=True, max_length=20, null=True, verbose_name='office phone')), + ('rank', models.CharField(default=b'00', max_length=2, verbose_name='employee rank')), + ('workday', models.DateField(blank=True, null=True, verbose_name='workday')), + ('startday', models.DateField(blank=True, null=True, verbose_name='start date')), + ('religion', models.CharField(blank=True, default=b'00', max_length=2, null=True, verbose_name='religion')), + ('marital', models.CharField(blank=True, default=b'10', max_length=2, null=True, verbose_name='marital status')), + ('party', models.CharField(blank=True, default=b'13', max_length=2, null=True, verbose_name='political party')), + ('nation', models.CharField(blank=True, default=b'01', max_length=2, null=True, verbose_name='nation')), + ('ygxs', models.CharField(blank=True, default=b'2', max_length=2, null=True, verbose_name='employ ygxs')), + ('status', models.CharField(blank=True, default=b'10', max_length=2, null=True, verbose_name='employ status')), + ('category', models.CharField(blank=True, default=b'21', max_length=2, null=True, verbose_name='employ category')), + ('literacy', models.CharField(blank=True, default=b'10', max_length=2, null=True, verbose_name='literacy')), + ('major', models.CharField(blank=True, default=b'99', max_length=2, null=True, verbose_name='major type')), + ('degree', models.CharField(blank=True, default=b'4', max_length=2, null=True, verbose_name='major degree')), + ('spjob', models.CharField(blank=True, default=b'00', max_length=2, null=True, verbose_name='special job')), + ('health', models.CharField(blank=True, default=b'1', max_length=2, null=True, verbose_name='health')), + ('tag1', models.CharField(blank=True, default=b'99', max_length=2, null=True, verbose_name='tag1 fzjr')), + ('tag2', models.CharField(blank=True, default=b'9', max_length=2, null=True, verbose_name='tag2 dwld')), + ('tag3', models.CharField(blank=True, default=b'00', max_length=2, null=True, verbose_name='tag3 dsjs')), + ('tag4', models.CharField(blank=True, default=b'0', max_length=2, null=True, verbose_name='tag4 byzk')), + ('organization', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('position', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organ.Position', verbose_name='position')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')), + ], + options={ + 'verbose_name': 'employee', + 'verbose_name_plural': 'employee', + 'permissions': (('view_all_employee', 'view all employee'),), + }, + ), + migrations.CreateModel( + name='ExpenseAccount', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='code')), + ('name', models.CharField(max_length=120, verbose_name='name')), + ('category', models.CharField(choices=[(b'HR', 'HR-DOMAIN'), (b'OF', 'OFFICE-DOMAIN'), (b'PU', 'PUBLIS-DOMAIN'), (b'MU', 'MUNADOMAIN'), (b'BU', 'BUSINESS'), (b'OT', 'OTHER')], default=b'PU', max_length=4, verbose_name='category')), + ('description', models.TextField(blank=True, null=True, verbose_name='description')), + ('status', models.BooleanField(default=True, verbose_name='in use')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.ExpenseAccount', verbose_name='parent')), + ], + options={ + 'ordering': ['category', 'code'], + 'verbose_name': 'expenses account', + 'verbose_name_plural': 'expenses account', + }, + ), + migrations.CreateModel( + name='ExtraParam', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=40, verbose_name='name')), + ('data_type', models.CharField(choices=[(b'CHAR', 'CHAR'), (b'NUM', 'NUMBER'), (b'DATE', 'DATE')], default=b'CHAR', max_length=6, verbose_name='data type')), + ('data_source', models.CharField(blank=True, max_length=40, null=True, verbose_name='data source')), + ], + options={ + 'verbose_name': 'extra param', + 'verbose_name_plural': 'extra params', + }, + ), + migrations.CreateModel( + name='Family', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('relation', models.CharField(blank=True, max_length=2, null=True, verbose_name='family title')), + ('status', models.CharField(blank=True, default=b'17', max_length=2, null=True, verbose_name='social status')), + ('name', models.CharField(max_length=60, verbose_name='name')), + ('birthday', models.DateField(blank=True, null=True, verbose_name='birthday')), + ('organization', models.CharField(blank=True, max_length=120, null=True, verbose_name='organization')), + ('phone', models.CharField(blank=True, max_length=120, null=True, verbose_name='phone')), + ('emergency', models.BooleanField(default=False, verbose_name='emergency')), + ('employee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Employee', verbose_name='employee')), + ], + options={ + 'verbose_name': 'family member', + 'verbose_name_plural': 'family member', + }, + ), + migrations.CreateModel( + name='Material', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='material code')), + ('barcode', models.CharField(blank=True, max_length=40, null=True, verbose_name='bar code')), + ('name', models.CharField(max_length=120, verbose_name='material name')), + ('spec', models.CharField(blank=True, max_length=120, null=True, verbose_name='specifications')), + ('pinyin', models.CharField(blank=True, max_length=120, null=True, verbose_name='pinyin')), + ('tp', models.CharField(blank=True, default=b'10', max_length=2, null=True, verbose_name='mt type')), + ('status', models.BooleanField(default=True, verbose_name='in use')), + ('is_equip', models.BooleanField(default=False, verbose_name='is equipment')), + ('can_sale', models.BooleanField(default=True, verbose_name='can sale')), + ('is_virtual', models.BooleanField(default=False, verbose_name='is virtual')), + ('stock_price', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='stock price')), + ('purchase_price', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='purchase price')), + ('sale_price', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='sale price')), + ('brand', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Brand', verbose_name='brand')), + ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Category', verbose_name='category')), + ], + options={ + 'ordering': ['tp', 'code'], + 'verbose_name': 'material', + 'verbose_name_plural': 'material', + }, + ), + migrations.CreateModel( + name='MaterialParam', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('creation', models.DateField(auto_now_add=True)), + ('material', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Material')), + ], + options={ + 'verbose_name': 'material parameter', + 'verbose_name_plural': 'material parameter', + }, + ), + migrations.CreateModel( + name='Measure', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('code', models.CharField(blank=True, max_length=6, null=True, verbose_name='code')), + ('name', models.CharField(max_length=20, verbose_name='name')), + ('status', models.BooleanField(default=True, verbose_name='in use')), + ], + options={ + 'verbose_name': 'measure', + 'verbose_name_plural': 'measure', + }, + ), + migrations.CreateModel( + name='Partner', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='partner code')), + ('name', models.CharField(max_length=120, verbose_name='partner name')), + ('short', models.CharField(blank=True, max_length=20, null=True, verbose_name='short name')), + ('pinyin', models.CharField(blank=True, max_length=120, null=True, verbose_name='pinyin')), + ('partner_type', models.CharField(choices=[(b'C', 'Customer'), (b'S', 'Supplier')], default=b'C', max_length=2, verbose_name='type')), + ('level', models.CharField(choices=[(b'A', b'A'), (b'B', b'B'), (b'C', b'C'), (b'D', b'D')], default=b'C', max_length=2, verbose_name='level')), + ('tax_num', models.CharField(blank=True, max_length=40, null=True, verbose_name='tax num')), + ('tax_address', models.CharField(blank=True, max_length=40, null=True, verbose_name='tax address')), + ('tax_account', models.CharField(blank=True, max_length=80, null=True, verbose_name='tax account')), + ('contacts', models.CharField(blank=True, max_length=40, null=True, verbose_name='contacts')), + ('phone', models.CharField(blank=True, max_length=40, null=True, verbose_name='phone')), + ('memo', models.TextField(blank=True, null=True, verbose_name='memo')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ], + options={ + 'verbose_name': 'partner', + 'verbose_name_plural': 'partner', + 'permissions': (('view_all_customer', 'view all customer'), ('view_all_supplier', 'view all supplier')), + }, + ), + migrations.CreateModel( + name='Project', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='project code')), + ('name', models.CharField(max_length=120, verbose_name='project name')), + ('short', models.CharField(blank=True, max_length=20, null=True, verbose_name='short name')), + ('pinyin', models.CharField(blank=True, max_length=120, null=True, verbose_name='pinyin')), + ('status', models.CharField(blank=True, default=b'00', max_length=2, null=True, verbose_name='status')), + ('prj_type', models.CharField(blank=True, default=b'00', max_length=2, null=True, verbose_name='project type')), + ('description', models.TextField(blank=True, null=True, verbose_name='description')), + ('budget', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True, verbose_name='budget')), + ('income', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True, verbose_name='income')), + ('expand', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True, verbose_name='expand')), + ('blueprint', models.FileField(blank=True, null=True, upload_to=b'project', verbose_name='blueprint')), + ('offer', models.FileField(blank=True, null=True, upload_to=b'offer sheet', verbose_name='offer sheet')), + ('business', models.FileField(blank=True, null=True, upload_to=b'project', verbose_name='business document')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('partner', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Partner', verbose_name='partner')), + ('users', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL, verbose_name='related users')), + ], + options={ + 'verbose_name': 'project', + 'verbose_name_plural': 'project', + }, + ), + migrations.CreateModel( + name='TechnicalParameterName', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=40, verbose_name='name')), + ('status', models.BooleanField(default=True, verbose_name='in use')), + ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Category', verbose_name='material category')), + ], + options={ + 'verbose_name': 'technical parameter', + 'verbose_name_plural': 'technical parameter', + }, + ), + migrations.CreateModel( + name='TechnicalParameterValue', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('value', models.CharField(max_length=80, verbose_name='value')), + ('description', models.CharField(blank=True, max_length=80, null=True, verbose_name='description')), + ('tech_name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.TechnicalParameterName', verbose_name='technical name')), + ], + options={ + 'verbose_name': 'technical value', + 'verbose_name_plural': 'technical value', + }, + ), + migrations.CreateModel( + name='Trade', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('code', models.CharField(max_length=6, verbose_name='code')), + ('name', models.CharField(max_length=120, verbose_name='name')), + ('memo', models.CharField(blank=True, max_length=120, null=True, verbose_name='memo')), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Trade', verbose_name='parent')), + ], + options={ + 'ordering': ['code'], + 'verbose_name': 'trade', + 'verbose_name_plural': 'trade', + }, + ), + migrations.CreateModel( + name='ValueList', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=6, null=True, verbose_name='list code')), + ('name', models.CharField(max_length=40, verbose_name='list name')), + ('status', models.BooleanField(default=True, verbose_name='in use')), + ('init', models.BooleanField(default=False, verbose_name='is init')), + ('locked', models.BooleanField(default=False, verbose_name='is locked')), + ('lock_time', models.DateTimeField(blank=True, null=True, verbose_name='locked time')), + ('locked_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='locked by')), + ('module', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='syscfg.Module', verbose_name='module')), + ], + options={ + 'verbose_name': 'value list', + 'verbose_name_plural': 'value list', + }, + ), + migrations.CreateModel( + name='ValueListItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('group_code', models.CharField(blank=True, max_length=6, null=True)), + ('code', models.CharField(blank=True, max_length=6, null=True, verbose_name='item code')), + ('name', models.CharField(max_length=40, verbose_name='item name')), + ('status', models.BooleanField(default=True, verbose_name='in use')), + ('weight', models.IntegerField(default=9, null=True, verbose_name='weight')), + ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.ValueList', verbose_name='list group')), + ], + options={ + 'ordering': ['weight', 'code'], + 'verbose_name': 'list item', + 'verbose_name_plural': 'list item', + }, + ), + migrations.CreateModel( + name='Warehouse', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('code', models.CharField(blank=True, max_length=6, null=True, verbose_name='code')), + ('name', models.CharField(max_length=40, verbose_name='name')), + ('status', models.BooleanField(default=True, verbose_name='in use')), + ('location', models.CharField(blank=True, max_length=120, null=True, verbose_name='location')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('users', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL, verbose_name='related users')), + ], + options={ + 'verbose_name': 'warehouse', + 'verbose_name_plural': 'warehouse', + }, + ), + migrations.CreateModel( + name='WorkExperience', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('organization', models.CharField(max_length=120, verbose_name='organization')), + ('position', models.CharField(max_length=120, verbose_name='position')), + ('employee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Employee', verbose_name='employee')), + ], + options={ + 'verbose_name': 'work experience', + 'verbose_name_plural': 'work experience', + }, + ), + migrations.AddField( + model_name='materialparam', + name='param_name', + field=models.ForeignKey(blank=basedata.models.Trade, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.TechnicalParameterName'), + ), + migrations.AddField( + model_name='materialparam', + name='param_value', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.TechnicalParameterValue'), + ), + migrations.AddField( + model_name='material', + name='measure', + field=models.ManyToManyField(to='basedata.Measure', verbose_name='measure'), + ), + migrations.AddField( + model_name='material', + name='org', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization'), + ), + migrations.AddField( + model_name='material', + name='params', + field=models.ManyToManyField(through='basedata.MaterialParam', to='basedata.TechnicalParameterValue', verbose_name='technical parameter'), + ), + migrations.AddField( + model_name='material', + name='warehouse', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Warehouse', verbose_name='warehouse'), + ), + migrations.AddField( + model_name='extraparam', + name='material', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='material'), + ), + migrations.AddField( + model_name='education', + name='employee', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Employee', verbose_name='employee'), + ), + migrations.AddField( + model_name='category', + name='trade', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Trade', verbose_name='trade'), + ), + migrations.AddField( + model_name='brand', + name='trade', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Trade', verbose_name='trade'), + ), + migrations.AddField( + model_name='bankaccount', + name='partner', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Partner', verbose_name='partner'), + ), + migrations.AlterIndexTogether( + name='valuelistitem', + index_together=set([('group', 'group_code')]), + ), + ] diff --git a/basedata/migrations/__init__.py b/basedata/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/basedata/models.py b/basedata/models.py index 68f77f6..add78a2 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -74,8 +74,12 @@ def get_value_list(group): :param group: :return: """ + from django.db.utils import OperationalError if group: - return tuple([(item.code, item.name) for item in ValueListItem.objects.filter(group_code__exact=group,status=1)]) + try: + return tuple([(item.code, item.name) for item in ValueListItem.objects.filter(group_code__exact=group,status=1)]) + except OperationalError: + return None else: return None diff --git a/hr/migrations/0001_initial.py b/hr/migrations/0001_initial.py new file mode 100644 index 0000000..5ebfc69 --- /dev/null +++ b/hr/migrations/0001_initial.py @@ -0,0 +1,136 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-06-13 20:58 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('organ', '0001_initial'), + ('basedata', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Departure', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('employee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Employee', verbose_name='employee')), + ], + options={ + 'verbose_name': 'employee departure', + 'verbose_name_plural': 'employee departures', + }, + ), + migrations.CreateModel( + name='EmployeeSalaryItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('calculate_way', models.CharField(default=b'10', max_length=2, verbose_name='calculate way')), + ('fixed_value', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True, verbose_name='fixed value')), + ('base_value', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True, verbose_name='base value')), + ('org_percent', models.DecimalField(blank=True, decimal_places=2, max_digits=4, null=True, verbose_name='org percent')), + ('employee_percent', models.DecimalField(blank=True, decimal_places=2, max_digits=4, null=True, verbose_name='employee percent')), + ('employee', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Employee', verbose_name='employee')), + ], + options={ + 'verbose_name': 'salary item', + 'verbose_name_plural': 'salary item', + }, + ), + migrations.CreateModel( + name='Entry', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='employee number')), + ('name', models.CharField(max_length=120, verbose_name='employee name')), + ('pinyin', models.CharField(blank=True, max_length=120, null=True, verbose_name='pinyin')), + ('birthday', models.DateField(blank=True, null=True, verbose_name='birthday')), + ('gender', models.CharField(default=b'1', max_length=2, verbose_name='gender')), + ('idcard', models.CharField(max_length=20, verbose_name='id card')), + ('address', models.CharField(blank=True, max_length=120, null=True, verbose_name='mail address')), + ('zipcode', models.CharField(max_length=8, verbose_name='zipcode')), + ('phone', models.CharField(blank=True, max_length=20, null=True, verbose_name='phone')), + ('rank', models.CharField(default=b'00', max_length=2, verbose_name='employee rank')), + ('ygxs', models.CharField(blank=True, default=b'2', max_length=2, null=True, verbose_name='employ ygxs')), + ('category', models.CharField(blank=True, default=b'21', max_length=2, null=True, verbose_name='employ category')), + ('probation_months', models.CharField(default=b'3', max_length=2, verbose_name='probation months')), + ('probation_begin', models.DateField(default=datetime.date.today, verbose_name='probation begin')), + ('probation_end', models.DateField(blank=True, null=True, verbose_name='probation end')), + ('memo', models.TextField(blank=True, null=True, verbose_name='memo')), + ('profile', models.FileField(blank=True, null=True, upload_to=b'hr profile', verbose_name='profile')), + ('guider', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Employee', verbose_name='guider')), + ('position', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organ.Position', verbose_name='designate position')), + ], + options={ + 'verbose_name': 'employee entry', + 'verbose_name_plural': 'employee entries', + 'permissions': (('modify_salary_item', 'modify salary item'),), + }, + ), + migrations.CreateModel( + name='SalaryItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('code', models.CharField(max_length=10, null=True, verbose_name='code')), + ('name', models.CharField(max_length=120, verbose_name='name')), + ('classification', models.CharField(default=b'10', max_length=2, verbose_name='classification')), + ('plus_or_minus', models.CharField(default=b'+', max_length=2, verbose_name='plus or minus')), + ('required', models.BooleanField(default=0, verbose_name='is required')), + ], + options={ + 'ordering': ('code',), + 'verbose_name': 'salary item', + 'verbose_name_plural': 'salary items', + }, + ), + migrations.CreateModel( + name='Transfer', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('employee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Employee', verbose_name='employee')), + ], + options={ + 'verbose_name': 'employee transfer', + 'verbose_name_plural': 'employee transfers', + }, + ), + migrations.AddField( + model_name='employeesalaryitem', + name='entry', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hr.Entry', verbose_name='employee entry'), + ), + migrations.AddField( + model_name='employeesalaryitem', + name='salary_item', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hr.SalaryItem', verbose_name='salary item'), + ), + migrations.AlterUniqueTogether( + name='employeesalaryitem', + unique_together=set([('entry', 'salary_item')]), + ), + ] diff --git a/hr/migrations/__init__.py b/hr/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/invent/migrations/0001_initial.py b/invent/migrations/0001_initial.py new file mode 100644 index 0000000..b56431d --- /dev/null +++ b/invent/migrations/0001_initial.py @@ -0,0 +1,264 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-06-13 20:58 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('organ', '0001_initial'), + ('selfhelp', '0001_initial'), + ('purchase', '0001_initial'), + ('basedata', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='InitialInventory', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='code')), + ('title', models.CharField(max_length=40, verbose_name='title')), + ('status', models.CharField(choices=[(b'0', 'NEW'), (b'9', 'EXECUTED')], default=b'0', max_length=2, verbose_name='status')), + ('execute_time', models.DateTimeField(blank=True, null=True, verbose_name='execute time')), + ('attach', models.FileField(blank=True, help_text='\u53c2\u8003FD0002\u6a21\u677f\u6587\u6863', null=True, upload_to=b'inventory', verbose_name='attach')), + ('amount', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='money of amount')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')), + ], + options={ + 'verbose_name': 'Initial Inventory', + 'verbose_name_plural': 'Initial Inventory', + }, + ), + migrations.CreateModel( + name='InOutDetail', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(auto_now_add=True, verbose_name='create time')), + ('status', models.BooleanField(default=0, verbose_name='executed')), + ('event_time', models.DateTimeField(blank=True, null=True, verbose_name='event time')), + ('cnt', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='count')), + ('batch', models.CharField(blank=True, max_length=20, null=True, verbose_name='batch')), + ('price', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='price')), + ('prop', models.CharField(choices=[(b'+', 'PLUS'), (b'-', 'MINUS')], default=b'+', max_length=2, verbose_name='plus or minus property')), + ('source', models.CharField(blank=True, max_length=20, null=True, verbose_name='source')), + ], + ), + migrations.CreateModel( + name='Inventory', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('cnt', models.DecimalField(decimal_places=4, max_digits=14, verbose_name='count')), + ('batch', models.CharField(blank=True, max_length=20, null=True, verbose_name='batch')), + ('price', models.DecimalField(decimal_places=4, max_digits=14, verbose_name='price')), + ('material', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='material')), + ('measure', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Measure', verbose_name='measure')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('warehouse', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Warehouse', verbose_name='warehouse')), + ], + options={ + 'ordering': ['material'], + 'verbose_name': 'Inventory', + 'verbose_name_plural': 'Inventory', + }, + ), + migrations.CreateModel( + name='StockIn', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='code')), + ('title', models.CharField(max_length=40, verbose_name='title')), + ('status', models.CharField(choices=[(b'0', 'NEW'), (b'1', 'QUALITY TESTING'), (b'9', 'EXECUTED')], default=b'0', max_length=2, verbose_name='status')), + ('execute_time', models.DateTimeField(blank=True, null=True, verbose_name='execute time')), + ('amount', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='stock in money of amount')), + ('batch', models.CharField(blank=True, max_length=20, null=True, verbose_name='batch')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('po', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='purchase.PurchaseOrder', verbose_name='purchase order')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')), + ('warehouse', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Warehouse', verbose_name='warehouse')), + ], + options={ + 'verbose_name': 'StockIn', + 'verbose_name_plural': 'StockIn', + }, + ), + migrations.CreateModel( + name='StockOut', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='code')), + ('title', models.CharField(max_length=40, verbose_name='title')), + ('description', models.TextField(blank=True, null=True, verbose_name='description')), + ('amount', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='money of amount')), + ('status', models.CharField(choices=[(b'0', 'NEW'), (b'1', 'IN PROGRESS'), (b'9', 'EXECUTED')], default=b'0', max_length=2, verbose_name='status')), + ('execute_time', models.DateTimeField(blank=True, null=True, verbose_name='execute time')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('project', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Project', verbose_name='project')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='out user')), + ('wo', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='selfhelp.WorkOrder', verbose_name='work order')), + ], + options={ + 'verbose_name': 'StockOut', + 'verbose_name_plural': 'StockOut', + }, + ), + migrations.CreateModel( + name='WareAdjust', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='code')), + ('title', models.CharField(max_length=40, verbose_name='title')), + ('description', models.TextField(blank=True, null=True, verbose_name='description')), + ('status', models.CharField(choices=[(b'0', 'NEW'), (b'1', 'IN PROGRESS'), (b'9', 'EXECUTED')], default=b'0', max_length=2, verbose_name='status')), + ('execute_time', models.DateTimeField(blank=True, null=True, verbose_name='execute time')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='out user')), + ], + options={ + 'verbose_name': 'ware adjust', + 'verbose_name_plural': 'ware adjust', + }, + ), + migrations.CreateModel( + name='WareReturn', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='code')), + ('title', models.CharField(max_length=40, verbose_name='title')), + ('amount', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='money of amount')), + ('status', models.CharField(choices=[(b'0', 'NEW'), (b'1', 'IN PROGRESS'), (b'9', 'EXECUTED')], default=b'0', max_length=2, verbose_name='status')), + ('execute_time', models.DateTimeField(blank=True, null=True, verbose_name='execute time')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('out', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='invent.StockOut', verbose_name='StockOut')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='out user')), + ], + options={ + 'verbose_name': 'ware return', + 'verbose_name_plural': 'ware return', + }, + ), + migrations.CreateModel( + name='AdjustItem', + fields=[ + ('inoutdetail_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='invent.InOutDetail')), + ('inventory', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='invent.Inventory', verbose_name='inventory material')), + ('master', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='invent.WareAdjust')), + ], + options={ + 'verbose_name': 'adjust item', + 'verbose_name_plural': 'adjust item', + }, + bases=('invent.inoutdetail',), + ), + migrations.CreateModel( + name='InItem', + fields=[ + ('inoutdetail_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='invent.InOutDetail')), + ('master', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='invent.StockIn')), + ('po_item', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='purchase.POItem', verbose_name='po item')), + ], + options={ + 'verbose_name': 'in item', + 'verbose_name_plural': 'in item', + }, + bases=('invent.inoutdetail',), + ), + migrations.CreateModel( + name='InitItem', + fields=[ + ('inoutdetail_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='invent.InOutDetail')), + ('master', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='invent.InitialInventory')), + ], + options={ + 'verbose_name': 'init item', + 'verbose_name_plural': 'init item', + }, + bases=('invent.inoutdetail',), + ), + migrations.CreateModel( + name='OutItem', + fields=[ + ('inoutdetail_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='invent.InOutDetail')), + ('inventory', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='invent.Inventory', verbose_name='inventory material')), + ('master', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='invent.StockOut')), + ], + options={ + 'verbose_name': 'out item', + 'verbose_name_plural': 'out item', + }, + bases=('invent.inoutdetail',), + ), + migrations.CreateModel( + name='ReturnItem', + fields=[ + ('inoutdetail_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='invent.InOutDetail')), + ('out_cnt', models.DecimalField(decimal_places=4, max_digits=14, verbose_name='out count')), + ('master', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='invent.WareReturn')), + ('out_item', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='invent.OutItem', verbose_name='out item')), + ], + options={ + 'verbose_name': 'return item', + 'verbose_name_plural': 'return item', + }, + bases=('invent.inoutdetail',), + ), + migrations.AddField( + model_name='inoutdetail', + name='material', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='material'), + ), + migrations.AddField( + model_name='inoutdetail', + name='measure', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Measure', verbose_name='measure'), + ), + migrations.AddField( + model_name='inoutdetail', + name='warehouse', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Warehouse', verbose_name='warehouse'), + ), + ] diff --git a/invent/migrations/__init__.py b/invent/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/mis/settings.py b/mis/settings.py index 5e4b36b..7938291 100644 --- a/mis/settings.py +++ b/mis/settings.py @@ -86,13 +86,17 @@ # https://docs.djangoproject.com/en/1.8/ref/settings/#databases DATABASES = { + # 'default': { + # 'ENGINE': 'django.db.backends.mysql', + # 'HOST': 'localhost', + # 'NAME': 'mis', + # 'USER': 'root', + # 'PASSWORD': 'root', + # } 'default': { - 'ENGINE': 'django.db.backends.mysql', - 'HOST': 'localhost', - 'NAME': 'mis', - 'USER': 'root', - 'PASSWORD': 'root', - } + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + }, } @@ -124,4 +128,4 @@ ) MEDIA_ROOT = os.path.join(BASE_DIR,'upload') -MEDIA_URL = '/upload/' \ No newline at end of file +MEDIA_URL = '/upload/' diff --git a/note.md b/note.md new file mode 100644 index 0000000..a913bdf --- /dev/null +++ b/note.md @@ -0,0 +1,8 @@ +## 快速开始 + + pipenv install + pipenv shell + # python manage.py makemigrations sale purchase invent hr selfhelp workflow organ basedata syscfg + python manage.py migrate + python manage.py createsuperuser + python manage.py runserver diff --git a/organ/migrations/0001_initial.py b/organ/migrations/0001_initial.py new file mode 100644 index 0000000..5d71812 --- /dev/null +++ b/organ/migrations/0001_initial.py @@ -0,0 +1,115 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-06-13 20:58 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Organization', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='organ code')), + ('name', models.CharField(max_length=120, verbose_name='organ name')), + ('short', models.CharField(blank=True, max_length=20, null=True, verbose_name='short name')), + ('pinyin', models.CharField(blank=True, max_length=120, null=True, verbose_name='pinyin')), + ('status', models.BooleanField(default=True, verbose_name='in use')), + ('tax_num', models.CharField(blank=True, max_length=40, null=True, verbose_name='tax num')), + ('tax_address', models.CharField(blank=True, max_length=40, null=True, verbose_name='tax address')), + ('tax_account', models.CharField(blank=True, max_length=80, null=True, verbose_name='tax account')), + ('represent', models.CharField(blank=True, max_length=40, null=True, verbose_name='representative ')), + ('address', models.CharField(blank=True, max_length=120, null=True, verbose_name='address')), + ('zipcode', models.CharField(blank=True, max_length=8, null=True, verbose_name='zipcode')), + ('fax', models.CharField(blank=True, max_length=20, null=True, verbose_name='fax')), + ('contacts', models.CharField(blank=True, max_length=40, null=True, verbose_name='contacts')), + ('phone', models.CharField(blank=True, max_length=40, null=True, verbose_name='phone')), + ('website', models.CharField(blank=True, max_length=40, null=True, verbose_name='website')), + ('email', models.CharField(blank=True, max_length=40, null=True, verbose_name='email')), + ('lic_code', models.CharField(blank=True, max_length=40, null=True, verbose_name='license code')), + ('cer_code', models.CharField(blank=True, max_length=40, null=True, verbose_name='certificate code')), + ('license', models.FileField(blank=True, null=True, upload_to=b'organ', verbose_name='business license')), + ('certificate', models.FileField(blank=True, null=True, upload_to=b'organ', verbose_name='organization code certificate')), + ('weight', models.IntegerField(default=9, verbose_name='weight')), + ], + options={ + 'verbose_name': 'organization', + 'verbose_name_plural': 'organization', + }, + ), + migrations.CreateModel( + name='OrgUnit', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=8, null=True, verbose_name='code')), + ('name', models.CharField(max_length=120, verbose_name='name')), + ('short', models.CharField(blank=True, max_length=20, null=True, verbose_name='short name')), + ('pinyin', models.CharField(blank=True, max_length=120, null=True, verbose_name='pinyin')), + ('unit_type', models.IntegerField(choices=[(1, 'BRANCH'), (2, 'DEPARTMENT'), (3, 'OFFICE'), (4, 'TEAM'), (5, 'COMMITTEE')], default=2, verbose_name='type')), + ('status', models.BooleanField(default=True, verbose_name='in use')), + ('virtual', models.BooleanField(default=False, verbose_name='is virtual')), + ('fax', models.CharField(blank=True, max_length=20, null=True, verbose_name='fax')), + ('phone', models.CharField(blank=True, max_length=40, null=True, verbose_name='phone')), + ('contacts', models.CharField(blank=True, max_length=40, null=True, verbose_name='contacts')), + ('email', models.CharField(blank=True, max_length=40, null=True, verbose_name='email')), + ('weight', models.IntegerField(default=99, verbose_name='weight')), + ('organization', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.OrgUnit', verbose_name='parent')), + ], + options={ + 'verbose_name': 'org unit', + 'verbose_name_plural': 'org unit', + }, + ), + migrations.CreateModel( + name='Position', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=8, null=True, verbose_name='position code')), + ('name', models.CharField(max_length=120, verbose_name='position name')), + ('short', models.CharField(blank=True, max_length=20, null=True, verbose_name='short name')), + ('pinyin', models.CharField(blank=True, max_length=120, null=True, verbose_name='pinyin')), + ('series', models.CharField(default=b'A', max_length=1, verbose_name='position series')), + ('grade', models.CharField(default=b'01', max_length=2, verbose_name='position grade')), + ('virtual', models.BooleanField(default=False, verbose_name='is virtual')), + ('status', models.BooleanField(default=True, verbose_name='in use')), + ('description', models.TextField(blank=True, null=True, verbose_name='position description')), + ('qualification', models.TextField(blank=True, null=True, verbose_name='qualification')), + ('document', models.FileField(blank=True, null=True, upload_to=b'', verbose_name='reference')), + ('weight', models.IntegerField(default=99, verbose_name='weight')), + ('organization', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Position', verbose_name='parent')), + ('unit', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organ.OrgUnit', verbose_name='org unit')), + ], + options={ + 'verbose_name': 'position', + 'verbose_name_plural': 'position', + }, + ), + ] diff --git a/organ/migrations/__init__.py b/organ/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/purchase/migrations/0001_initial.py b/purchase/migrations/0001_initial.py new file mode 100644 index 0000000..d097368 --- /dev/null +++ b/purchase/migrations/0001_initial.py @@ -0,0 +1,143 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-06-13 20:58 +from __future__ import unicode_literals + +import datetime +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('organ', '0001_initial'), + ('basedata', '0001_initial'), + ('selfhelp', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Invoice', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('vo_date', models.DateField(blank=True, default=datetime.date.today, null=True, verbose_name='invoice date')), + ('code', models.CharField(max_length=20, verbose_name='invoice code')), + ('number', models.CharField(max_length=20, verbose_name='invoice number')), + ('po_amount', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='po amount')), + ('vo_amount', models.DecimalField(decimal_places=4, max_digits=14, verbose_name='invoice amount')), + ('file', models.FileField(blank=True, null=True, upload_to=b'invoice', verbose_name='invoice file')), + ('partner', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Partner', verbose_name='partner')), + ], + options={ + 'verbose_name': 'Invoice', + 'verbose_name_plural': 'Invoice', + }, + ), + migrations.CreateModel( + name='Payment', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('py_date', models.DateField(blank=True, default=datetime.date.today, null=True, verbose_name='pay date')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='pay code')), + ('po_amount', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='po amount')), + ('py_amount', models.DecimalField(decimal_places=4, max_digits=14, verbose_name='pay amount')), + ('response_code', models.CharField(blank=True, max_length=80, null=True, verbose_name='response code')), + ('memo', models.TextField(blank=True, null=True, verbose_name='memo')), + ('bank', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.BankAccount', verbose_name='bank account')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('partner', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Partner', verbose_name='partner')), + ], + options={ + 'verbose_name': 'Payment', + 'verbose_name_plural': 'Payment', + }, + ), + migrations.CreateModel( + name='POItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('price', models.DecimalField(blank=True, decimal_places=4, max_digits=12, null=True, verbose_name='price')), + ('cnt', models.DecimalField(blank=True, decimal_places=4, max_digits=12, null=True, verbose_name='count')), + ('discount_price', models.DecimalField(blank=True, decimal_places=4, max_digits=12, null=True, verbose_name='discount price')), + ('amount', models.DecimalField(blank=True, decimal_places=2, max_digits=12, null=True, verbose_name='money of amount')), + ('discount_amount', models.DecimalField(blank=True, decimal_places=2, max_digits=12, null=True, verbose_name='discount amount')), + ('tax', models.CharField(default=b'0.00', max_length=6, verbose_name='tax rate')), + ('is_in_stock', models.BooleanField(default=0, verbose_name='is in stock')), + ('in_stock_time', models.DateTimeField(blank=True, null=True, verbose_name='execute time')), + ('entry_cnt', models.DecimalField(blank=True, decimal_places=4, max_digits=12, null=True, verbose_name='entry count')), + ('left_cnt', models.DecimalField(blank=True, decimal_places=4, max_digits=12, null=True, verbose_name='left count')), + ('material', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='material')), + ('measure', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Measure', verbose_name='measure')), + ], + options={ + 'verbose_name': 'po item', + 'verbose_name_plural': 'po item', + }, + ), + migrations.CreateModel( + name='PurchaseOrder', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='code')), + ('order_date', models.DateField(verbose_name='order date')), + ('arrive_date', models.DateField(verbose_name='arrive date')), + ('title', models.CharField(max_length=40, verbose_name='title')), + ('description', models.TextField(blank=True, null=True, verbose_name='description')), + ('status', models.CharField(choices=[(b'0', 'NEW'), (b'1', 'IN PROGRESS'), (b'4', 'DROP'), (b'9', 'APPROVED'), (b'99', 'ALREADY STOCK IN')], default=b'0', max_length=2, verbose_name='status')), + ('amount', models.DecimalField(blank=True, decimal_places=2, default=0.0, max_digits=12, null=True, verbose_name='money amount')), + ('discount_amount', models.DecimalField(blank=True, decimal_places=2, default=0.0, max_digits=12, null=True, verbose_name='discount amount')), + ('entry_status', models.BooleanField(default=0, verbose_name='entry status')), + ('entry_time', models.DateTimeField(blank=True, null=True, verbose_name='entry time')), + ('attach', models.FileField(blank=True, help_text='\u60a8\u53ef\u5bfc\u5165\u91c7\u8d2d\u660e\u7ec6\uff0c\u6a21\u677f\u8bf7\u53c2\u8003\u6587\u6863FD0008', null=True, upload_to=b'', verbose_name='attach')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('partner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Partner', verbose_name='partner')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')), + ], + options={ + 'verbose_name': 'purchase order', + 'verbose_name_plural': 'purchase orders', + }, + ), + migrations.AddField( + model_name='poitem', + name='po', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='purchase.PurchaseOrder', verbose_name='purchase order'), + ), + migrations.AddField( + model_name='poitem', + name='woitem', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='selfhelp.WOItem', verbose_name='wo item'), + ), + migrations.AddField( + model_name='payment', + name='po', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='purchase.PurchaseOrder', verbose_name='purchase order'), + ), + migrations.AddField( + model_name='invoice', + name='po', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='purchase.PurchaseOrder', verbose_name='purchase order'), + ), + ] diff --git a/purchase/migrations/__init__.py b/purchase/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/sale/migrations/0001_initial.py b/sale/migrations/0001_initial.py new file mode 100644 index 0000000..aa2f23a --- /dev/null +++ b/sale/migrations/0001_initial.py @@ -0,0 +1,180 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-06-13 20:58 +from __future__ import unicode_literals + +import datetime +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('organ', '0001_initial'), + ('basedata', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='OfferItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('cnt', models.DecimalField(decimal_places=4, max_digits=14, verbose_name='count')), + ('brand', models.CharField(blank=True, max_length=20, null=True, verbose_name='brand')), + ('cost_price', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='cost price')), + ('stock_price', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='stock price')), + ('sale_price', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='sale price')), + ('discount_price', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='discount price')), + ('tax', models.CharField(default=b'0.00', max_length=6, verbose_name='tax rate')), + ('create_time', models.DateTimeField(auto_now_add=True, verbose_name='create time')), + ('status', models.BooleanField(default=0, verbose_name='executed')), + ('event_time', models.DateTimeField(blank=True, null=True, verbose_name='event time')), + ], + options={ + 'verbose_name': 'offer detail', + 'verbose_name_plural': 'offer detail', + }, + ), + migrations.CreateModel( + name='OfferSheet', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='code')), + ('offer_date', models.DateField(verbose_name='offer date')), + ('deliver_date', models.DateField(verbose_name='deliver date')), + ('title', models.CharField(max_length=40, verbose_name='title')), + ('description', models.TextField(blank=True, null=True, verbose_name='memo')), + ('amount', models.DecimalField(blank=True, decimal_places=2, default=0.0, max_digits=12, null=True, verbose_name='money amount')), + ('discount_amount', models.DecimalField(blank=True, decimal_places=2, default=0.0, max_digits=12, null=True, verbose_name='discount amount')), + ('attach', models.FileField(blank=True, help_text='\u60a8\u53ef\u5bfc\u5165\u62a5\u4ef7\u660e\u7ec6\uff0c\u6a21\u677f\u8bf7\u53c2\u8003\u6587\u6863FD0006', null=True, upload_to=b'offer sheet', verbose_name='offer sheet file')), + ('status', models.BooleanField(default=0, verbose_name='executed')), + ('event_time', models.DateTimeField(blank=True, null=True, verbose_name='event time')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('partner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Partner', verbose_name='partner')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='offer man')), + ], + options={ + 'verbose_name': 'offer sheet', + 'verbose_name_plural': 'offer sheet', + }, + ), + migrations.CreateModel( + name='PaymentCollection', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('collection_date', models.DateField(blank=True, default=datetime.date.today, null=True, verbose_name='collection date')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='collection code')), + ('order_amount', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='order amount')), + ('collection_amount', models.DecimalField(decimal_places=4, max_digits=14, verbose_name='collection amount')), + ('memo', models.TextField(blank=True, null=True, verbose_name='memo')), + ('bank', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.BankAccount', verbose_name='bank account')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('partner', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Partner', verbose_name='partner')), + ], + options={ + 'verbose_name': 'Payment Collection', + 'verbose_name_plural': 'Payment Collection', + }, + ), + migrations.CreateModel( + name='SaleItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('cnt', models.DecimalField(decimal_places=4, max_digits=14, verbose_name='count')), + ('stock_price', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='stock price')), + ('sale_price', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='sale price')), + ('discount_price', models.DecimalField(blank=True, decimal_places=4, max_digits=14, null=True, verbose_name='discount price')), + ('tax', models.CharField(default=b'0.00', max_length=6, verbose_name='tax rate')), + ('create_time', models.DateTimeField(auto_now_add=True, verbose_name='create time')), + ('status', models.BooleanField(default=0, verbose_name='executed')), + ('event_time', models.DateTimeField(blank=True, null=True, verbose_name='event time')), + ], + options={ + 'verbose_name': 'order detail', + 'verbose_name_plural': 'order detail', + }, + ), + migrations.CreateModel( + name='SaleOrder', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='code')), + ('order_date', models.DateField(verbose_name='order date')), + ('deliver_date', models.DateField(verbose_name='deliver date')), + ('title', models.CharField(max_length=40, verbose_name='title')), + ('description', models.TextField(blank=True, null=True, verbose_name='memo')), + ('contact', models.CharField(blank=True, max_length=20, null=True, verbose_name='contacts')), + ('phone', models.CharField(blank=True, max_length=20, null=True, verbose_name='phone')), + ('fax', models.CharField(blank=True, max_length=20, null=True, verbose_name='fax')), + ('deliver_address', models.CharField(blank=True, max_length=120, null=True, verbose_name='deliver address')), + ('invoice_type', models.CharField(default=b'10', max_length=6, verbose_name='invoice type')), + ('amount', models.DecimalField(blank=True, decimal_places=2, default=0.0, max_digits=12, null=True, verbose_name='money amount')), + ('discount_amount', models.DecimalField(blank=True, decimal_places=2, default=0.0, max_digits=12, null=True, verbose_name='discount amount')), + ('status', models.CharField(choices=[(b'0', 'NEW'), (b'1', 'IN PROGRESS'), (b'4', 'DROP'), (b'9', 'APPROVED'), (b'99', 'ALREADY STOCK OUT')], default=b'0', max_length=2, verbose_name='status')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.Organization', verbose_name='organization')), + ('partner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Partner', verbose_name='partner')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='sales man')), + ], + options={ + 'verbose_name': 'sale order', + 'verbose_name_plural': 'sale order', + }, + ), + migrations.AddField( + model_name='saleitem', + name='master', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sale.SaleOrder'), + ), + migrations.AddField( + model_name='saleitem', + name='material', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='material'), + ), + migrations.AddField( + model_name='saleitem', + name='measure', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Measure', verbose_name='measure'), + ), + migrations.AddField( + model_name='paymentcollection', + name='so', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sale.SaleOrder', verbose_name='sale order'), + ), + migrations.AddField( + model_name='offeritem', + name='master', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sale.OfferSheet'), + ), + migrations.AddField( + model_name='offeritem', + name='material', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='material'), + ), + migrations.AddField( + model_name='offeritem', + name='measure', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Measure', verbose_name='measure'), + ), + ] diff --git a/sale/migrations/__init__.py b/sale/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/selfhelp/migrations/0001_initial.py b/selfhelp/migrations/0001_initial.py new file mode 100644 index 0000000..6532812 --- /dev/null +++ b/selfhelp/migrations/0001_initial.py @@ -0,0 +1,224 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-06-13 20:58 +from __future__ import unicode_literals + +import datetime +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('organ', '0001_initial'), + ('basedata', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Activity', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('begin_time', models.DateTimeField(verbose_name='begin time')), + ('end_time', models.DateTimeField(verbose_name='end time')), + ('enroll_deadline', models.DateTimeField(blank=True, null=True, verbose_name='enroll deadline')), + ('code', models.CharField(blank=True, max_length=20, null=True, verbose_name='code')), + ('title', models.CharField(max_length=120, verbose_name='title')), + ('description', models.TextField(blank=True, null=True, verbose_name='description')), + ('host', models.CharField(blank=True, max_length=80, null=True, verbose_name='host')), + ('speaker', models.CharField(blank=True, max_length=80, null=True, verbose_name='speaker')), + ('accept_enroll', models.BooleanField(default=1, verbose_name='accept enroll')), + ('location', models.CharField(blank=True, max_length=80, null=True, verbose_name='location')), + ('classification', models.CharField(blank=True, choices=[(b'T', 'Train'), (b'M', 'Meeting'), (b'G', 'Community')], default=b'M', max_length=2, null=True, verbose_name='classification')), + ('mail_list', models.TextField(blank=True, null=True, verbose_name='mail list')), + ('mail_notice', models.BooleanField(default=1, verbose_name='mail notice')), + ('short_message_notice', models.BooleanField(default=1, verbose_name='short message notice')), + ('weixin_notice', models.BooleanField(default=1, verbose_name='weixin notice')), + ('status', models.BooleanField(default=0, verbose_name='published')), + ('publish_time', models.DateTimeField(blank=True, null=True, verbose_name='publish time')), + ('attach', models.FileField(blank=True, null=True, upload_to=b'activity', verbose_name='attach')), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='selfhelp.Activity', verbose_name='parent')), + ('room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='room')), + ], + options={ + 'verbose_name': 'activity', + 'verbose_name_plural': 'activities', + }, + ), + migrations.CreateModel( + name='Enroll', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('enroll_time', models.DateTimeField(auto_now_add=True, verbose_name='enroll time')), + ('activity', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='selfhelp.Activity')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='Feedback', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('feed_time', models.DateTimeField(auto_now_add=True, verbose_name='feedback time')), + ('rank', models.CharField(blank=True, choices=[(b'A', b'A'), (b'B', b'B'), (b'C', b'C'), (b'D', b'D')], default=b'B', max_length=2, null=True, verbose_name='rank')), + ('comment', models.CharField(blank=True, max_length=80, null=True, verbose_name='suggest')), + ('activity', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='selfhelp.Activity')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='Loan', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=10, null=True, verbose_name='loan code')), + ('title', models.CharField(max_length=120, verbose_name='title')), + ('description', models.TextField(blank=True, null=True, verbose_name='description')), + ('status', models.CharField(blank=True, choices=[(b'N', 'NEW'), (b'I', 'IN PROGRESS'), (b'A', 'APPROVED'), (b'P', 'PAYED')], default=b'N', max_length=2, null=True, verbose_name='status')), + ('logout_time', models.DateTimeField(blank=True, null=True, verbose_name='logout time')), + ('loan_amount', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True, verbose_name='loan amount')), + ('logout_amount', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True, verbose_name='logout amount')), + ('pay_user', models.CharField(blank=True, max_length=40, null=True, verbose_name='pay user')), + ('pay_time', models.DateTimeField(blank=True, null=True, verbose_name='pay time')), + ('is_clear', models.BooleanField(default=False, verbose_name='is clear')), + ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Project', verbose_name='project')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')), + ], + options={ + 'verbose_name': 'loan', + 'verbose_name_plural': 'loans', + 'permissions': (('financial_pay', 'financial pay'),), + }, + ), + migrations.CreateModel( + name='Reimbursement', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=10, null=True, verbose_name='fee code')), + ('title', models.CharField(max_length=120, verbose_name='title')), + ('description', models.TextField(blank=True, null=True, verbose_name='description')), + ('bank_account', models.CharField(blank=True, max_length=120, null=True, verbose_name='bank account')), + ('status', models.CharField(blank=True, choices=[(b'N', 'NEW'), (b'I', 'IN PROGRESS'), (b'A', 'APPROVED'), (b'P', 'PAYED')], default=b'N', max_length=2, null=True, verbose_name='status')), + ('amount', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True, verbose_name='amount of money')), + ('loan_amount', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True, verbose_name='loan amount')), + ('logout_amount', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True, verbose_name='logout amount')), + ('pay_amount', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True, verbose_name='pay amount')), + ('pay_time', models.DateTimeField(blank=True, null=True, verbose_name='pay time')), + ('pay_user', models.CharField(blank=True, max_length=40, null=True, verbose_name='pay user')), + ('loan', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='selfhelp.Loan', verbose_name='loan record')), + ('org', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organ.OrgUnit', verbose_name='cost center')), + ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.Project', verbose_name='project')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')), + ], + options={ + 'verbose_name': 'reimbursement', + 'verbose_name_plural': 'reimbursements', + 'permissions': (('financial_pay', 'financial pay'),), + }, + ), + migrations.CreateModel( + name='ReimbursementItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(default=datetime.date.today, verbose_name='occur date')), + ('amount', models.DecimalField(decimal_places=2, max_digits=10, verbose_name='amount of money')), + ('memo', models.CharField(blank=True, max_length=40, null=True, verbose_name='memo')), + ('expense_account', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.ExpenseAccount', verbose_name='expenses account')), + ('reimbursement', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='selfhelp.Reimbursement', verbose_name='reimbursement')), + ], + options={ + 'verbose_name': 'fee item', + 'verbose_name_plural': 'fee items', + }, + ), + migrations.CreateModel( + name='WOExtraValue', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('param_value', models.CharField(blank=True, max_length=40, null=True, verbose_name='param value')), + ('param_name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='basedata.ExtraParam', verbose_name='extra param')), + ], + options={ + 'verbose_name': 'extra value', + 'verbose_name_plural': 'extra values', + }, + ), + migrations.CreateModel( + name='WOItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('amount', models.DecimalField(blank=True, decimal_places=4, max_digits=10, null=True, verbose_name='amount')), + ('price', models.DecimalField(blank=True, decimal_places=4, max_digits=10, null=True, verbose_name='price')), + ('material', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='material')), + ('measure', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Measure', verbose_name='measure')), + ], + options={ + 'verbose_name': 'workorder item', + 'verbose_name_plural': 'workorder items', + }, + ), + migrations.CreateModel( + name='WorkOrder', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=10, null=True, verbose_name='workorder code')), + ('title', models.CharField(max_length=120, verbose_name='title')), + ('description', models.TextField(blank=True, null=True, verbose_name='description')), + ('business_domain', models.CharField(default=b'OT', max_length=4, verbose_name='business domain')), + ('classification', models.CharField(default=b'D', max_length=4, verbose_name='classification')), + ('status', models.CharField(blank=True, default=b'NEW', max_length=6, null=True, verbose_name='status')), + ('answer', models.TextField(blank=True, null=True, verbose_name='answer')), + ('attach', models.FileField(blank=True, help_text='\u5de5\u5355\u9644\u4ef6\uff0c\u4e0d\u5bfc\u5165\u660e\u7ec6\u3002', null=True, upload_to=b'', verbose_name='attach')), + ('detail', models.FileField(blank=True, help_text='\u60a8\u53ef\u5bfc\u5165\u9700\u6c42\u660e\u7ec6\uff0c\u6a21\u677f\u8bf7\u53c2\u8003\u6587\u6863FD0007', null=True, upload_to=b'', verbose_name='to be imported detail')), + ('project', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Project', verbose_name='project')), + ('refer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='selfhelp.WorkOrder', verbose_name='refer wo')), + ('service', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='service name')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')), + ], + options={ + 'verbose_name': 'workorder apply', + 'verbose_name_plural': 'workorder apply', + }, + ), + migrations.AddField( + model_name='woitem', + name='workorder', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='selfhelp.WorkOrder', verbose_name='workorder'), + ), + migrations.AddField( + model_name='woextravalue', + name='workorder', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='selfhelp.WorkOrder', verbose_name='workorder'), + ), + migrations.AddField( + model_name='reimbursement', + name='wo', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='selfhelp.WorkOrder', verbose_name='work order'), + ), + ] diff --git a/selfhelp/migrations/__init__.py b/selfhelp/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/syscfg/migrations/0001_initial.py b/syscfg/migrations/0001_initial.py new file mode 100644 index 0000000..a9b9654 --- /dev/null +++ b/syscfg/migrations/0001_initial.py @@ -0,0 +1,107 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-06-13 20:58 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Menu', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=6, null=True, verbose_name='menu code')), + ('name', models.CharField(max_length=40, verbose_name='menu name')), + ('url', models.URLField(blank=True, max_length=80, null=True, verbose_name='menu url')), + ('weight', models.IntegerField(blank=True, default=99, null=True, verbose_name='weight')), + ('icon', models.CharField(blank=True, max_length=40, null=True, verbose_name='style class')), + ('status', models.BooleanField(default=True, verbose_name='in use')), + ], + options={ + 'verbose_name': 'menu', + 'verbose_name_plural': 'menu', + }, + ), + migrations.CreateModel( + name='Module', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=6, null=True, verbose_name='module code')), + ('name', models.CharField(max_length=40, verbose_name='module name')), + ('url', models.URLField(blank=True, max_length=80, null=True, verbose_name='module url')), + ('weight', models.IntegerField(blank=True, default=99, null=True, verbose_name='weight')), + ('icon', models.CharField(blank=True, max_length=40, null=True, verbose_name='style class')), + ('status', models.BooleanField(default=True, verbose_name='in use')), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='syscfg.Module', verbose_name='parent')), + ], + options={ + 'verbose_name': 'module', + 'verbose_name_plural': 'module', + }, + ), + migrations.CreateModel( + name='Role', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('creator', models.CharField(blank=True, max_length=20, null=True, verbose_name='creator')), + ('modifier', models.CharField(blank=True, max_length=20, null=True, verbose_name='modifier')), + ('creation', models.DateTimeField(auto_now_add=True, null=True, verbose_name='creation')), + ('modification', models.DateTimeField(auto_now=True, null=True, verbose_name='modification')), + ('code', models.CharField(blank=True, max_length=6, null=True, verbose_name='role code')), + ('name', models.CharField(max_length=40, verbose_name='role name')), + ('description', models.CharField(blank=True, max_length=80, null=True, verbose_name='description')), + ('status', models.BooleanField(default=True, verbose_name='in use')), + ('menus', models.ManyToManyField(blank=True, to='syscfg.Menu', verbose_name='role menus')), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='syscfg.Role', verbose_name='parent')), + ('users', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL, verbose_name='role users')), + ], + options={ + 'verbose_name': 'role', + 'verbose_name_plural': 'role', + }, + ), + migrations.CreateModel( + name='Site', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('begin', models.DateField(blank=True, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, null=True, verbose_name='end date')), + ('name', models.CharField(max_length=40, verbose_name='site name')), + ('description', models.TextField(blank=True, null=True, verbose_name='site description')), + ('user', models.ManyToManyField(to=settings.AUTH_USER_MODEL, verbose_name='administrator')), + ], + options={ + 'verbose_name': 'Site', + 'verbose_name_plural': 'Site', + }, + ), + migrations.AddField( + model_name='menu', + name='module', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='syscfg.Module', verbose_name='module'), + ), + ] diff --git a/syscfg/migrations/__init__.py b/syscfg/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/workflow/migrations/0001_initial.py b/workflow/migrations/0001_initial.py new file mode 100644 index 0000000..385b894 --- /dev/null +++ b/workflow/migrations/0001_initial.py @@ -0,0 +1,155 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-06-13 20:58 +from __future__ import unicode_literals + +import datetime +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('organ', '0001_initial'), + ('syscfg', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='History', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('pro_time', models.DateTimeField(auto_now_add=True, verbose_name='process time')), + ('pro_type', models.IntegerField(choices=[(0, 'SUBMIT'), (1, 'AGREE'), (3, 'DENY'), (4, 'TERMINATE')], default=0, verbose_name='process type')), + ('memo', models.CharField(blank=True, max_length=40, null=True, verbose_name='memo')), + ], + options={ + 'ordering': ['inst', 'pro_time'], + 'verbose_name': 'workflow history', + 'verbose_name_plural': 'workflow history', + }, + ), + migrations.CreateModel( + name='Instance', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('code', models.CharField(blank=True, max_length=10, null=True, verbose_name='code')), + ('object_id', models.PositiveIntegerField(verbose_name=b'object id')), + ('start_time', models.DateTimeField(auto_now_add=True, verbose_name='start time')), + ('approved_time', models.DateTimeField(blank=True, null=True, verbose_name='approved time')), + ('status', models.IntegerField(choices=[(1, 'NEW'), (2, 'IN PROGRESS'), (3, 'DENY'), (4, 'TERMINATED'), (9, 'APPROVED'), (99, 'COMPLETED')], default=1, verbose_name='status')), + ], + options={ + 'verbose_name': 'workflow instance', + 'verbose_name_plural': 'workflow instance', + }, + ), + migrations.CreateModel( + name='Modal', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('code', models.CharField(blank=True, max_length=6, null=True, verbose_name='workflow code')), + ('name', models.CharField(max_length=40, verbose_name='workflow name')), + ('description', models.TextField(blank=True, null=True, verbose_name='description')), + ('app_name', models.CharField(blank=True, max_length=60, null=True, verbose_name='app name')), + ('model_name', models.CharField(blank=True, max_length=60, null=True, verbose_name='model name')), + ('begin', models.DateField(blank=True, default=datetime.date.today, null=True, verbose_name='begin date')), + ('end', models.DateField(blank=True, default=datetime.date(9999, 12, 31), null=True, verbose_name='end date')), + ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType', verbose_name='content type')), + ], + options={ + 'verbose_name': 'workflow model', + 'verbose_name_plural': 'workflow model', + }, + ), + migrations.CreateModel( + name='Node', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('code', models.CharField(blank=True, max_length=4, null=True, verbose_name='node code')), + ('name', models.CharField(max_length=80, verbose_name='node name')), + ('tooltip', models.CharField(blank=True, max_length=120, null=True, verbose_name='tooltip words')), + ('start', models.BooleanField(default=False, verbose_name='start node')), + ('stop', models.BooleanField(default=False, verbose_name='stop node')), + ('can_terminate', models.BooleanField(default=False, verbose_name='can terminate')), + ('can_deny', models.BooleanField(default=True, verbose_name='can deny')), + ('can_edit', models.BooleanField(default=False, verbose_name='can edit')), + ('email_notice', models.BooleanField(default=True, verbose_name='email notice')), + ('short_message_notice', models.BooleanField(default=False, verbose_name='short message notice')), + ('approve_node', models.BooleanField(default=False, verbose_name='approve node')), + ('handler', models.TextField(blank=True, help_text='\u81ea\u5b9a\u4e49SQL\u8bed\u53e5\uff0c\u4f18\u5148\u9ad8\u4e8e\u6307\u5b9a\u7528\u6237\u3001\u5c97\u4f4d\u3001\u89d2\u8272', null=True, verbose_name='handler')), + ('handler_type', models.IntegerField(choices=[(1, 'designated user'), (2, 'designated position'), (3, 'designated role'), (4, 'submitter')], default=1, verbose_name='handler type')), + ('next_user_handler', models.CharField(blank=True, max_length=40, null=True, verbose_name='next user handler')), + ('next_node_handler', models.CharField(blank=True, max_length=40, null=True, verbose_name='next node handler')), + ('status_field', models.CharField(blank=True, max_length=40, null=True, verbose_name='status field')), + ('status_value', models.CharField(blank=True, max_length=40, null=True, verbose_name='status value')), + ('action', models.CharField(blank=True, max_length=40, null=True, verbose_name='execute action')), + ('departments', models.ManyToManyField(blank=True, to='organ.OrgUnit', verbose_name='designated department')), + ('modal', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='workflow.Modal', verbose_name='workflow model')), + ('next', models.ManyToManyField(blank=True, to='workflow.Node', verbose_name='next node')), + ('positions', models.ManyToManyField(blank=True, to='organ.Position', verbose_name='designated position')), + ('roles', models.ManyToManyField(blank=True, to='syscfg.Role', verbose_name='designated role')), + ('users', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL, verbose_name='designated user')), + ], + options={ + 'verbose_name': 'workflow node', + 'verbose_name_plural': 'workflow node', + }, + ), + migrations.CreateModel( + name='TodoList', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('code', models.CharField(blank=True, max_length=10, null=True, verbose_name='code')), + ('app_name', models.CharField(blank=True, max_length=60, null=True, verbose_name='app name')), + ('model_name', models.CharField(blank=True, max_length=60, null=True, verbose_name='model name')), + ('arrived_time', models.DateTimeField(auto_now_add=True, verbose_name='arrived time')), + ('is_read', models.BooleanField(default=False, verbose_name='is read')), + ('read_time', models.DateTimeField(blank=True, null=True, verbose_name='read time')), + ('status', models.BooleanField(default=False, verbose_name='is done')), + ('inst', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='workflow.Instance', verbose_name='workflow instance')), + ('node', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='workflow.Node', verbose_name='current node')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='handler')), + ], + options={ + 'ordering': ['user', '-arrived_time'], + 'verbose_name': 'workflow todo', + 'verbose_name_plural': 'workflow todo', + }, + ), + migrations.AddField( + model_name='instance', + name='current_nodes', + field=models.ManyToManyField(blank=True, to='workflow.Node', verbose_name='current node'), + ), + migrations.AddField( + model_name='instance', + name='modal', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='workflow.Modal', verbose_name='workflow model'), + ), + migrations.AddField( + model_name='instance', + name='starter', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='starter', to=settings.AUTH_USER_MODEL, verbose_name='start user'), + ), + migrations.AddField( + model_name='history', + name='inst', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='workflow.Instance', verbose_name='workflow instance'), + ), + migrations.AddField( + model_name='history', + name='node', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='workflow.Node', verbose_name='workflow node'), + ), + migrations.AddField( + model_name='history', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='submitter'), + ), + ] diff --git a/workflow/migrations/__init__.py b/workflow/migrations/__init__.py new file mode 100644 index 0000000..e69de29 From 5bdf70df9d26edb8885b98eeb22df6c1fddc9bd3 Mon Sep 17 00:00:00 2001 From: AngelLiang Date: Sat, 13 Jun 2020 21:01:27 +0800 Subject: [PATCH 06/65] Added .flake8 --- .flake8 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .flake8 diff --git a/.flake8 b/.flake8 new file mode 100644 index 0000000..41dd444 --- /dev/null +++ b/.flake8 @@ -0,0 +1,6 @@ +[flake8] +exclude = .git,*migrations,*venv* +max-line-length = 120 + +# ignore module level import not at top of file +ignore = E402 From 7f405d81946bb1d229d0859f5acbf57de0dd3a6c Mon Sep 17 00:00:00 2001 From: AngelLiang Date: Sat, 13 Jun 2020 21:17:11 +0800 Subject: [PATCH 07/65] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invent/initialinventory/change_form.html | 167 ++++++++++++++++++ .../admin/invent/inventory/change_form.html | 2 +- .../admin/invent/stockin/change_form.html | 7 +- .../admin/invent/stockout/change_form.html | 2 +- .../admin/invent/wareadjust/change_form.html | 148 ++++++++++++++++ .../admin/invent/warereturn/change_form.html | 148 ++++++++++++++++ templates/admin/submit_line.html | 11 +- 7 files changed, 478 insertions(+), 7 deletions(-) create mode 100644 templates/admin/invent/initialinventory/change_form.html create mode 100644 templates/admin/invent/wareadjust/change_form.html create mode 100644 templates/admin/invent/warereturn/change_form.html diff --git a/templates/admin/invent/initialinventory/change_form.html b/templates/admin/invent/initialinventory/change_form.html new file mode 100644 index 0000000..27b1a4e --- /dev/null +++ b/templates/admin/invent/initialinventory/change_form.html @@ -0,0 +1,167 @@ +{% extends "admin/base_site.html" %} +{% load i18n admin_urls admin_static admin_modify %} + +{% block extrahead %}{{ block.super }} + +{{ media }} +{% endblock %} + +{% block extrastyle %}{{ block.super }}{% endblock %} + +{% block coltype %}colM{% endblock %} + +{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %} + +{% if not is_popup %} +{% block breadcrumbs %} +
+{% trans 'Home' %} +› {{ opts.app_config.verbose_name }} +› {% if has_change_permission %}{{ opts.verbose_name_plural|capfirst }}{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} +› {% if add %}{% trans 'Add' %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %} +
+{% endblock %} +{% endif %} + +{% block content %}
+{% block object-tools %} +{% if change %}{% if not is_popup %} + +{% endif %}{% endif %} +{% endblock %} +
{% csrf_token %}{% block form_top %}{% endblock %} +
+{% if is_popup %}{% endif %} +{% if to_field %}{% endif %} +{% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %} +{% if show_workflow_line%} +
+

{% trans "workflow approve" %}

+
+ {% if can_restart %} + {% trans "restart workflow" %} +

{% trans "your apply has been denied,you can restart a new apply" %}

+ {% else %} + + + + {% trans "submit" %} + {% endif %} +
+
+{% endif %} +{% if errors %} +

+ {% if errors|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} +

+ {{ adminform.form.non_field_errors }} +{% endif %} + +{% block field_sets %} +{% for fieldset in adminform %} + {% include "admin/includes/fieldset.html" %} +{% endfor %} +{% endblock %} + +{% block after_field_sets %}{% endblock %} + +{% block inline_field_sets %} +{% for inline_admin_formset in inline_admin_formsets %} + {% include inline_admin_formset.opts.template %} +{% endfor %} +{% endblock %} + +{% block after_related_objects %}{% endblock %} + +{% block submit_buttons_bottom %}{% submit_row %}{% endblock %} + +{% block admin_change_form_document_ready %} + +{% endblock %} + +{# JavaScript for prepopulated fields #} +{% prepopulated_fields_js %} + +
+
+{% if detail %} +

{% trans "InOut History" %}

+
+ + + + + + + + + + + + + + {% for item in detail %} + + + + + + + + + + {% endfor %} + + +
{% trans 'execute time' %}{% trans 'plus or minus prop' %}{% trans 'price' %}{% trans 'count' %}{% trans 'measure' %}{% trans 'status' %}{% trans 'source' %}
{{ item.event_time|date:"DATETIME_FORMAT" }}{{ item.prop }}{{ item.price }}{{ item.cnt }}{{ item.measure }}{% if item.status %} {% trans 'EXECUTED'%} {% endif %}{{ item.source }}
+
+{% endif %} +{% endblock %} diff --git a/templates/admin/invent/inventory/change_form.html b/templates/admin/invent/inventory/change_form.html index a6e147e..a5f742b 100644 --- a/templates/admin/invent/inventory/change_form.html +++ b/templates/admin/invent/inventory/change_form.html @@ -114,7 +114,7 @@

{% trans "workflow approve" %}

{% endif %} {% if extra_buttons %} {% for button in extra_buttons %} - $("{{button.title}}").insertAfter("#workflow_submit"); + $("{{button.title}}").insertAfter("#workflow_submit"); {% endfor %} {% endif %} {% if readonly %} diff --git a/templates/admin/invent/stockin/change_form.html b/templates/admin/invent/stockin/change_form.html index 453b691..97362e6 100644 --- a/templates/admin/invent/stockin/change_form.html +++ b/templates/admin/invent/stockin/change_form.html @@ -100,6 +100,7 @@

{% trans "workflow approve" %}

{% if adminform and add %} $('form#{{ opts.model_name }}_form :input:visible:enabled:first').focus() {% endif %} + // 工作流按钮 {% if workflow_modal %} {% if workflow_instance %} workflow_modal = "{{ workflow_modal.code }}"; @@ -113,11 +114,15 @@

{% trans "workflow approve" %}

{% else %} $("#workflow_submit").hide(); {% endif %} + + // 额外的按钮 {% if extra_buttons %} {% for button in extra_buttons %} - $("{{button.title}}").insertAfter("#workflow_submit"); + $("{{button.title}}").insertAfter("#workflow_submit"); {% endfor %} {% endif %} + + // 原始按钮 {% if readonly %} $('input,select').attr('disabled',true); $('div.submit-row').hide(); diff --git a/templates/admin/invent/stockout/change_form.html b/templates/admin/invent/stockout/change_form.html index 3e8227e..20c61e9 100644 --- a/templates/admin/invent/stockout/change_form.html +++ b/templates/admin/invent/stockout/change_form.html @@ -115,7 +115,7 @@

{% trans "workflow approve" %}

{% endif %} {% if extra_buttons %} {% for button in extra_buttons %} - $("{{button.title}}").insertAfter("#workflow_submit"); + $("{{button.title}}").insertAfter("#workflow_submit"); {% endfor %} {% endif %} {% if readonly %} diff --git a/templates/admin/invent/wareadjust/change_form.html b/templates/admin/invent/wareadjust/change_form.html new file mode 100644 index 0000000..df74b91 --- /dev/null +++ b/templates/admin/invent/wareadjust/change_form.html @@ -0,0 +1,148 @@ +{% extends "admin/base_site.html" %} +{% load i18n admin_urls admin_static admin_modify %} + +{% block extrahead %}{{ block.super }} + +{{ media }} +{% endblock %} + +{% block extrastyle %}{{ block.super }}{% endblock %} + +{% block coltype %}colM{% endblock %} + +{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %} + +{% if not is_popup %} +{% block breadcrumbs %} +
+{% trans 'Home' %} +› {{ opts.app_config.verbose_name }} +› {% if has_change_permission %}{{ opts.verbose_name_plural|capfirst }}{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} +› {% if add %}{% trans 'Add' %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %} +
+{% endblock %} +{% endif %} + +{% block content %}
+{% block object-tools %} +{% if change %}{% if not is_popup %} + +{% endif %}{% endif %} +{% endblock %} +
{% csrf_token %}{% block form_top %}{% endblock %} +
+{% if is_popup %}{% endif %} +{% if to_field %}{% endif %} +{% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %} +{% if show_workflow_line%} +
+

{% trans "workflow approve" %}

+
+ {% if can_restart %} + {% trans "restart workflow" %} +

{% trans "your apply has been denied,you can restart a new apply" %}

+ {% else %} + + + + {% trans "submit" %} + {% endif %} +
+
+{% endif %} +{% if errors %} +

+ {% if errors|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} +

+ {{ adminform.form.non_field_errors }} +{% endif %} + +{% block field_sets %} +{% for fieldset in adminform %} + {% include "admin/includes/fieldset.html" %} +{% endfor %} +{% endblock %} + +{% block after_field_sets %}{% endblock %} + +{% block inline_field_sets %} +{% for inline_admin_formset in inline_admin_formsets %} + {% include inline_admin_formset.opts.template %} +{% endfor %} +{% endblock %} + +{% block after_related_objects %}{% endblock %} + +{% block submit_buttons_bottom %}{% submit_row %}{% endblock %} + +{% block admin_change_form_document_ready %} + +{% endblock %} + +{# JavaScript for prepopulated fields #} +{% prepopulated_fields_js %} + +
+
+{% endblock %} diff --git a/templates/admin/invent/warereturn/change_form.html b/templates/admin/invent/warereturn/change_form.html new file mode 100644 index 0000000..ddcb90f --- /dev/null +++ b/templates/admin/invent/warereturn/change_form.html @@ -0,0 +1,148 @@ +{% extends "admin/base_site.html" %} +{% load i18n admin_urls admin_static admin_modify %} + +{% block extrahead %}{{ block.super }} + +{{ media }} +{% endblock %} + +{% block extrastyle %}{{ block.super }}{% endblock %} + +{% block coltype %}colM{% endblock %} + +{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %} + +{% if not is_popup %} +{% block breadcrumbs %} +
+{% trans 'Home' %} +› {{ opts.app_config.verbose_name }} +› {% if has_change_permission %}{{ opts.verbose_name_plural|capfirst }}{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} +› {% if add %}{% trans 'Add' %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %} +
+{% endblock %} +{% endif %} + +{% block content %}
+{% block object-tools %} +{% if change %}{% if not is_popup %} + +{% endif %}{% endif %} +{% endblock %} +
{% csrf_token %}{% block form_top %}{% endblock %} +
+{% if is_popup %}{% endif %} +{% if to_field %}{% endif %} +{% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %} +{% if show_workflow_line%} +
+

{% trans "workflow approve" %}

+
+ {% if can_restart %} + {% trans "restart workflow" %} +

{% trans "your apply has been denied,you can restart a new apply" %}

+ {% else %} + + + + {% trans "submit" %} + {% endif %} +
+
+{% endif %} +{% if errors %} +

+ {% if errors|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} +

+ {{ adminform.form.non_field_errors }} +{% endif %} + +{% block field_sets %} +{% for fieldset in adminform %} + {% include "admin/includes/fieldset.html" %} +{% endfor %} +{% endblock %} + +{% block after_field_sets %}{% endblock %} + +{% block inline_field_sets %} +{% for inline_admin_formset in inline_admin_formsets %} + {% include inline_admin_formset.opts.template %} +{% endfor %} +{% endblock %} + +{% block after_related_objects %}{% endblock %} + +{% block submit_buttons_bottom %}{% submit_row %}{% endblock %} + +{% block admin_change_form_document_ready %} + +{% endblock %} + +{# JavaScript for prepopulated fields #} +{% prepopulated_fields_js %} + +
+
+{% endblock %} diff --git a/templates/admin/submit_line.html b/templates/admin/submit_line.html index 9ae7940..0323fc5 100644 --- a/templates/admin/submit_line.html +++ b/templates/admin/submit_line.html @@ -3,10 +3,13 @@ {% if show_save %}{% endif %} {% trans "submit" %} - {% for button in extra_buttons %} -{{button.title}} - {% endfor %} - {{extra_buttons}} + + + + + {% if show_delete_link %} {% url opts|admin_urlname:'delete' original.pk|admin_urlquote as delete_url %}

{% trans "Delete" %} From 6beff733d8c5dfd7d478e8725a47661e87b45bbf Mon Sep 17 00:00:00 2001 From: AngelLiang Date: Sat, 13 Jun 2020 21:23:10 +0800 Subject: [PATCH 08/65] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=E6=A8=A1=E5=9D=97=E7=9B=B8=E5=85=B3=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mis/urls.py | 6 +++--- workflow/views.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mis/urls.py b/mis/urls.py index 6250797..0c03fd9 100644 --- a/mis/urls.py +++ b/mis/urls.py @@ -9,9 +9,9 @@ urlpatterns = [ url(r'^$', mis.views.home), - url(r"^admin/(?P\w+)/(?P\w+)/(?P\d+)/start", workflow.views.start), - url(r"^admin/(?P\w+)/(?P\w+)/(?P\d+)/approve/(?P\d+)", workflow.views.approve), - url(r"^admin/(?P\w+)/(?P\w+)/(?P\d+)/restart/(?P\d+)", workflow.views.restart), + url(r"^admin/(?P\w+)/(?P\w+)/(?P\d+)/change/start", workflow.views.start), + url(r"^admin/(?P\w+)/(?P\w+)/(?P\d+)/change/approve/(?P\d+)", workflow.views.approve), + url(r"^admin/(?P\w+)/(?P\w+)/(?P\d+)/change/restart/(?P\d+)", workflow.views.restart), url(r'^admin/', include(admin.site.urls)), url(r'^admin/invent/', include(invent.urls)), url(r'^admin/basedata/', include(basedata.urls)), diff --git a/workflow/views.py b/workflow/views.py index df40cb9..b9b6a5d 100644 --- a/workflow/views.py +++ b/workflow/views.py @@ -72,9 +72,9 @@ def compile_node_handler(request,obj,next_node): return users elif tp == 4: # submitter - return request.user + return [request.user] else: - return None + return [] def start(request,app,model,object_id): @@ -311,4 +311,4 @@ def restart(request,app,model,object_id,instance): messages.warning(request,_("you do not have the permission to restart,only the starter can restart")) except Exception,e: messages.error(request,e) - return HttpResponseRedirect("/admin/%s/%s/%s"%(app,model,object_id)) \ No newline at end of file + return HttpResponseRedirect("/admin/%s/%s/%s"%(app,model,object_id)) From 0d7b08fd1484f7f5dab3c4a15ea06c2426cdebc4 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 15 Jun 2020 10:02:30 +0800 Subject: [PATCH 09/65] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=8C=E6=94=AF?= =?UTF-8?q?=E6=8C=81Python3=20Django2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pipfile | 4 ++-- Pipfile.lock | 17 ++++++++++++----- mis/__init__.py | 4 ---- mis/admin.py | 7 +++++++ mis/apps.py | 5 +++++ mis/settings.py | 3 ++- mis/urls.py | 2 +- 7 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 mis/admin.py create mode 100644 mis/apps.py diff --git a/Pipfile b/Pipfile index c2bbbc7..73e50b7 100644 --- a/Pipfile +++ b/Pipfile @@ -6,10 +6,10 @@ verify_ssl = true [dev-packages] [packages] -django = "<2.0" +django = ">=2.0,<3.0" xlwt = "*" xlrd = "*" pymysql = "*" [requires] -python_version = "2.7" +python_version = "3.6" diff --git a/Pipfile.lock b/Pipfile.lock index 71700da..b768adb 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,11 +1,11 @@ { "_meta": { "hash": { - "sha256": "8e22a5249afffe582a3836bfc0fac9f381e906443b4b95de1c2de25b94325fc4" + "sha256": "24bf2118ee868e0d36346fdb7b4bc4412126f303efb0a39b671b9a6e533ad9b0" }, "pipfile-spec": 6, "requires": { - "python_version": "2.7" + "python_version": "3.6" }, "sources": [ { @@ -18,11 +18,11 @@ "default": { "django": { "hashes": [ - "sha256:014e3392058d94f40569206a24523ce254d55ad2f9f46c6550b0fe2e4f94cf3f", - "sha256:4200aefb6678019a0acf0005cd14cfce3a5e6b9b90d06145fcdd2e474ad4329c" + "sha256:84f370f6acedbe1f3c41e1a02de44ac206efda3355e427139ecb785b5f596d80", + "sha256:e8fe3c2b2212dce6126becab7a693157f1a441a07b62ec994c046c76af5bb66d" ], "index": "pypi", - "version": "==1.11.29" + "version": "==2.2.13" }, "pymysql": { "hashes": [ @@ -39,6 +39,13 @@ ], "version": "==2020.1" }, + "sqlparse": { + "hashes": [ + "sha256:022fb9c87b524d1f7862b3037e541f68597a730a8843245c349fc93e1643dc4e", + "sha256:e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548" + ], + "version": "==0.3.1" + }, "xlrd": { "hashes": [ "sha256:546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2", diff --git a/mis/__init__.py b/mis/__init__.py index 7b1a6e3..c621205 100644 --- a/mis/__init__.py +++ b/mis/__init__.py @@ -3,7 +3,3 @@ import pymysql pymysql.install_as_MySQLdb() #解决mysql-python的历史遗留问题(Yuri_2017-04-29) -from django.contrib import admin - -admin.site.site_header = 'Django-ERP' -admin.site.site_title = 'ERP' \ No newline at end of file diff --git a/mis/admin.py b/mis/admin.py new file mode 100644 index 0000000..54907c2 --- /dev/null +++ b/mis/admin.py @@ -0,0 +1,7 @@ +from django.contrib import admin + + +class AdminSite(admin.AdminSite): + site_header = 'Django-ERP' + site_title = 'ERP' + index_title = 'ERP' diff --git a/mis/apps.py b/mis/apps.py new file mode 100644 index 0000000..8225f34 --- /dev/null +++ b/mis/apps.py @@ -0,0 +1,5 @@ +from django.contrib.admin.apps import AdminConfig + + +class MisAdminConfig(AdminConfig): + default_site = 'mis.admin.AdminSite' diff --git a/mis/settings.py b/mis/settings.py index 9d2ae88..b6037f9 100644 --- a/mis/settings.py +++ b/mis/settings.py @@ -30,7 +30,8 @@ # Application definition INSTALLED_APPS = ( - 'django.contrib.admin', + # 'django.contrib.admin', + 'mis.apps.MisAdminConfig', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', diff --git a/mis/urls.py b/mis/urls.py index 0c03fd9..b71d01a 100644 --- a/mis/urls.py +++ b/mis/urls.py @@ -12,7 +12,7 @@ url(r"^admin/(?P\w+)/(?P\w+)/(?P\d+)/change/start", workflow.views.start), url(r"^admin/(?P\w+)/(?P\w+)/(?P\d+)/change/approve/(?P\d+)", workflow.views.approve), url(r"^admin/(?P\w+)/(?P\w+)/(?P\d+)/change/restart/(?P\d+)", workflow.views.restart), - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', admin.site.urls), url(r'^admin/invent/', include(invent.urls)), url(r'^admin/basedata/', include(basedata.urls)), url(r'^admin/selfhelp/', include(selfhelp.urls)), From eab40246536ceb52ce22acc84348c57531a5a3a5 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 15 Jun 2020 11:40:51 +0800 Subject: [PATCH 10/65] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=B8=BAPython3=20Djan?= =?UTF-8?q?go3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新数据库迁移文件 - 更新Pipfile - 修复前端引用的静态资源路径 - 更新note.md笔记 --- Pipfile | 3 +- Pipfile.lock | 25 +- .../migrations/0002_auto_20200615_1024.py | 225 ++++++++++++++++++ basedata/models.py | 4 +- hr/migrations/0002_auto_20200615_1024.py | 58 +++++ invent/migrations/0002_auto_20200615_1024.py | 61 +++++ midware/cuser.py | 8 +- mis/__init__.py | 4 +- mis/settings.py | 20 +- note.md | 9 +- organ/migrations/0002_auto_20200615_1024.py | 38 +++ .../migrations/0002_auto_20200615_1024.py | 45 ++++ sale/migrations/0002_auto_20200615_1024.py | 60 +++++ .../migrations/0002_auto_20200615_1024.py | 80 +++++++ templates/admin/base.html | 2 +- templates/admin/change_form.html | 2 +- templates/admin/index.html | 2 +- .../invent/initialinventory/change_form.html | 2 +- .../admin/invent/inventory/change_form.html | 2 +- .../admin/invent/stockin/change_form.html | 2 +- .../admin/invent/stockout/change_form.html | 2 +- .../admin/invent/wareadjust/change_form.html | 2 +- .../admin/invent/warereturn/change_form.html | 2 +- .../admin/selfhelp/workorder/change_form.html | 2 +- .../admin/workflow/node/change_form.html | 2 +- .../migrations/0002_auto_20200615_1024.py | 25 ++ 26 files changed, 653 insertions(+), 34 deletions(-) create mode 100644 basedata/migrations/0002_auto_20200615_1024.py create mode 100644 hr/migrations/0002_auto_20200615_1024.py create mode 100644 invent/migrations/0002_auto_20200615_1024.py create mode 100644 organ/migrations/0002_auto_20200615_1024.py create mode 100644 purchase/migrations/0002_auto_20200615_1024.py create mode 100644 sale/migrations/0002_auto_20200615_1024.py create mode 100644 selfhelp/migrations/0002_auto_20200615_1024.py create mode 100644 workflow/migrations/0002_auto_20200615_1024.py diff --git a/Pipfile b/Pipfile index 73e50b7..882393d 100644 --- a/Pipfile +++ b/Pipfile @@ -6,10 +6,11 @@ verify_ssl = true [dev-packages] [packages] -django = ">=2.0,<3.0" +django = ">=3.0,<4.0" xlwt = "*" xlrd = "*" pymysql = "*" +mysqlclient = "*" [requires] python_version = "3.6" diff --git a/Pipfile.lock b/Pipfile.lock index b768adb..7618054 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "24bf2118ee868e0d36346fdb7b4bc4412126f303efb0a39b671b9a6e533ad9b0" + "sha256": "df86cedd26bd0cbf17d94cf0c60b8a6f8e1eb454d6caac680904a7359b3e2382" }, "pipfile-spec": 6, "requires": { @@ -16,13 +16,30 @@ ] }, "default": { + "asgiref": { + "hashes": [ + "sha256:8036f90603c54e93521e5777b2b9a39ba1bad05773fcf2d208f0299d1df58ce5", + "sha256:9ca8b952a0a9afa61d30aa6d3d9b570bb3fd6bafcf7ec9e6bed43b936133db1c" + ], + "version": "==3.2.7" + }, "django": { "hashes": [ - "sha256:84f370f6acedbe1f3c41e1a02de44ac206efda3355e427139ecb785b5f596d80", - "sha256:e8fe3c2b2212dce6126becab7a693157f1a441a07b62ec994c046c76af5bb66d" + "sha256:5052b34b34b3425233c682e0e11d658fd6efd587d11335a0203d827224ada8f2", + "sha256:e1630333248c9b3d4e38f02093a26f1e07b271ca896d73097457996e0fae12e8" + ], + "index": "pypi", + "version": "==3.0.7" + }, + "mysqlclient": { + "hashes": [ + "sha256:4c82187dd6ab3607150fbb1fa5ef4643118f3da122b8ba31c3149ddd9cf0cb39", + "sha256:9e6080a7aee4cc6a06b58b59239f20f1d259c1d2fddf68ddeed242d2311c7087", + "sha256:f3fdaa9a38752a3b214a6fe79d7cae3653731a53e577821f9187e67cbecb2e16", + "sha256:f646f8d17d02be0872291f258cce3813497bc7888cd4712a577fd1e719b2f213" ], "index": "pypi", - "version": "==2.2.13" + "version": "==1.4.6" }, "pymysql": { "hashes": [ diff --git a/basedata/migrations/0002_auto_20200615_1024.py b/basedata/migrations/0002_auto_20200615_1024.py new file mode 100644 index 0000000..d34a76d --- /dev/null +++ b/basedata/migrations/0002_auto_20200615_1024.py @@ -0,0 +1,225 @@ +# Generated by Django 3.0.7 on 2020-06-15 10:24 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('basedata', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='address', + name='address_type', + field=models.CharField(choices=[], default='01', max_length=2, verbose_name='address type'), + ), + migrations.AlterField( + model_name='dataimport', + name='attach', + field=models.FileField(blank=True, null=True, upload_to='data', verbose_name='attach'), + ), + migrations.AlterField( + model_name='dataimport', + name='content_type', + field=models.ForeignKey(limit_choices_to={'app_label__in': ['basedata', 'organ', 'auth']}, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType', verbose_name='content type'), + ), + migrations.AlterField( + model_name='dataimport', + name='status', + field=models.CharField(choices=[('0', 'NEW'), ('1', 'EXECUTED')], default='0', max_length=2, verbose_name='status'), + ), + migrations.AlterField( + model_name='document', + name='attach', + field=models.FileField(blank=True, null=True, upload_to='doc', verbose_name='attach'), + ), + migrations.AlterField( + model_name='document', + name='business_domain', + field=models.CharField(choices=[], default='OT', max_length=4, verbose_name='business domain'), + ), + migrations.AlterField( + model_name='document', + name='status', + field=models.CharField(choices=[('0', 'draft'), ('1', 'published')], default='0', max_length=2, verbose_name='status'), + ), + migrations.AlterField( + model_name='document', + name='tp', + field=models.CharField(choices=[('00', 'SYSTEM MANUAL'), ('10', 'BUSINESS DOC')], default='10', max_length=2, verbose_name='type'), + ), + migrations.AlterField( + model_name='education', + name='degree', + field=models.CharField(blank=True, choices=[], default='4', max_length=2, null=True, verbose_name='major degree'), + ), + migrations.AlterField( + model_name='education', + name='edu_type', + field=models.CharField(choices=[], default='1', max_length=2, verbose_name='edu type'), + ), + migrations.AlterField( + model_name='employee', + name='category', + field=models.CharField(blank=True, choices=[], default='21', max_length=2, null=True, verbose_name='employ category'), + ), + migrations.AlterField( + model_name='employee', + name='country', + field=models.CharField(blank=True, choices=[], default='CN', max_length=2, null=True, verbose_name='nationality'), + ), + migrations.AlterField( + model_name='employee', + name='degree', + field=models.CharField(blank=True, choices=[], default='4', max_length=2, null=True, verbose_name='major degree'), + ), + migrations.AlterField( + model_name='employee', + name='gender', + field=models.CharField(choices=[], default='1', max_length=2, verbose_name='gender'), + ), + migrations.AlterField( + model_name='employee', + name='health', + field=models.CharField(blank=True, choices=[], default='1', max_length=2, null=True, verbose_name='health'), + ), + migrations.AlterField( + model_name='employee', + name='literacy', + field=models.CharField(blank=True, choices=[], default='10', max_length=2, null=True, verbose_name='literacy'), + ), + migrations.AlterField( + model_name='employee', + name='major', + field=models.CharField(blank=True, choices=[], default='99', max_length=2, null=True, verbose_name='major type'), + ), + migrations.AlterField( + model_name='employee', + name='marital', + field=models.CharField(blank=True, choices=[], default='10', max_length=2, null=True, verbose_name='marital status'), + ), + migrations.AlterField( + model_name='employee', + name='nation', + field=models.CharField(blank=True, choices=[], default='01', max_length=2, null=True, verbose_name='nation'), + ), + migrations.AlterField( + model_name='employee', + name='party', + field=models.CharField(blank=True, choices=[], default='13', max_length=2, null=True, verbose_name='political party'), + ), + migrations.AlterField( + model_name='employee', + name='rank', + field=models.CharField(choices=[], default='00', max_length=2, verbose_name='employee rank'), + ), + migrations.AlterField( + model_name='employee', + name='religion', + field=models.CharField(blank=True, choices=[], default='00', max_length=2, null=True, verbose_name='religion'), + ), + migrations.AlterField( + model_name='employee', + name='spjob', + field=models.CharField(blank=True, choices=[], default='00', max_length=2, null=True, verbose_name='special job'), + ), + migrations.AlterField( + model_name='employee', + name='status', + field=models.CharField(blank=True, choices=[], default='10', max_length=2, null=True, verbose_name='employ status'), + ), + migrations.AlterField( + model_name='employee', + name='tag1', + field=models.CharField(blank=True, choices=[], default='99', max_length=2, null=True, verbose_name='tag1 fzjr'), + ), + migrations.AlterField( + model_name='employee', + name='tag2', + field=models.CharField(blank=True, choices=[], default='9', max_length=2, null=True, verbose_name='tag2 dwld'), + ), + migrations.AlterField( + model_name='employee', + name='tag3', + field=models.CharField(blank=True, choices=[], default='00', max_length=2, null=True, verbose_name='tag3 dsjs'), + ), + migrations.AlterField( + model_name='employee', + name='tag4', + field=models.CharField(blank=True, choices=[], default='0', max_length=2, null=True, verbose_name='tag4 byzk'), + ), + migrations.AlterField( + model_name='employee', + name='ygxs', + field=models.CharField(blank=True, choices=[], default='2', max_length=2, null=True, verbose_name='employ ygxs'), + ), + migrations.AlterField( + model_name='expenseaccount', + name='category', + field=models.CharField(choices=[('HR', 'HR-DOMAIN'), ('OF', 'OFFICE-DOMAIN'), ('PU', 'PUBLIS-DOMAIN'), ('MU', 'MUNADOMAIN'), ('BU', 'BUSINESS'), ('OT', 'OTHER')], default='PU', max_length=4, verbose_name='category'), + ), + migrations.AlterField( + model_name='extraparam', + name='data_type', + field=models.CharField(choices=[('CHAR', 'CHAR'), ('NUM', 'NUMBER'), ('DATE', 'DATE')], default='CHAR', max_length=6, verbose_name='data type'), + ), + migrations.AlterField( + model_name='family', + name='relation', + field=models.CharField(blank=True, choices=[], max_length=2, null=True, verbose_name='family title'), + ), + migrations.AlterField( + model_name='family', + name='status', + field=models.CharField(blank=True, choices=[], default='17', max_length=2, null=True, verbose_name='social status'), + ), + migrations.AlterField( + model_name='material', + name='tp', + field=models.CharField(blank=True, choices=[], default='10', max_length=2, null=True, verbose_name='mt type'), + ), + migrations.AlterField( + model_name='partner', + name='level', + field=models.CharField(choices=[('A', 'A'), ('B', 'B'), ('C', 'C'), ('D', 'D')], default='C', max_length=2, verbose_name='level'), + ), + migrations.AlterField( + model_name='partner', + name='partner_type', + field=models.CharField(choices=[('C', 'Customer'), ('S', 'Supplier')], default='C', max_length=2, verbose_name='type'), + ), + migrations.AlterField( + model_name='project', + name='blueprint', + field=models.FileField(blank=True, null=True, upload_to='project', verbose_name='blueprint'), + ), + migrations.AlterField( + model_name='project', + name='business', + field=models.FileField(blank=True, null=True, upload_to='project', verbose_name='business document'), + ), + migrations.AlterField( + model_name='project', + name='offer', + field=models.FileField(blank=True, null=True, upload_to='offer sheet', verbose_name='offer sheet'), + ), + migrations.AlterField( + model_name='project', + name='partner', + field=models.ForeignKey(blank=True, limit_choices_to={'partner_type': 'C'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Partner', verbose_name='partner'), + ), + migrations.AlterField( + model_name='project', + name='prj_type', + field=models.CharField(blank=True, choices=[], default='00', max_length=2, null=True, verbose_name='project type'), + ), + migrations.AlterField( + model_name='project', + name='status', + field=models.CharField(blank=True, choices=[], default='00', max_length=2, null=True, verbose_name='status'), + ), + ] diff --git a/basedata/models.py b/basedata/models.py index 5bf4a2d..0cf377e 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -79,7 +79,7 @@ def get_value_list(group): if group: try: return tuple([(item.code, item.name) for item in ValueListItem.objects.filter(group_code__exact=group,status=1)]) - except OperationalError: + except Exception: return None else: return None @@ -483,7 +483,7 @@ class Employee(generic.BO): tag1 = models.CharField(_("tag1 fzjr"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S039'),default='99') tag2 = models.CharField(_("tag2 dwld"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S040'),default='9') - tag3 = models.CharField(_("tag3 dsjs"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S041'),default='00') + tag3 = models.CharField(_("tag3 dsjs"),max_length=const.DB_CHAR_CODE_10,blank=True,null=True,choices=const.get_value_list('S041'),default='00') tag4 = models.CharField(_("tag4 byzk"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S027'),default='0') user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) diff --git a/hr/migrations/0002_auto_20200615_1024.py b/hr/migrations/0002_auto_20200615_1024.py new file mode 100644 index 0000000..628eaad --- /dev/null +++ b/hr/migrations/0002_auto_20200615_1024.py @@ -0,0 +1,58 @@ +# Generated by Django 3.0.7 on 2020-06-15 10:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('hr', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='employeesalaryitem', + name='calculate_way', + field=models.CharField(choices=[], default='10', max_length=2, verbose_name='calculate way'), + ), + migrations.AlterField( + model_name='entry', + name='category', + field=models.CharField(blank=True, choices=[], default='21', max_length=2, null=True, verbose_name='employ category'), + ), + migrations.AlterField( + model_name='entry', + name='gender', + field=models.CharField(choices=[], default='1', max_length=2, verbose_name='gender'), + ), + migrations.AlterField( + model_name='entry', + name='probation_months', + field=models.CharField(choices=[], default='3', max_length=2, verbose_name='probation months'), + ), + migrations.AlterField( + model_name='entry', + name='profile', + field=models.FileField(blank=True, null=True, upload_to='hr profile', verbose_name='profile'), + ), + migrations.AlterField( + model_name='entry', + name='rank', + field=models.CharField(choices=[], default='00', max_length=2, verbose_name='employee rank'), + ), + migrations.AlterField( + model_name='entry', + name='ygxs', + field=models.CharField(blank=True, choices=[], default='2', max_length=2, null=True, verbose_name='employ ygxs'), + ), + migrations.AlterField( + model_name='salaryitem', + name='classification', + field=models.CharField(choices=[], default='10', max_length=2, verbose_name='classification'), + ), + migrations.AlterField( + model_name='salaryitem', + name='plus_or_minus', + field=models.CharField(choices=[], default='+', max_length=2, verbose_name='plus or minus'), + ), + ] diff --git a/invent/migrations/0002_auto_20200615_1024.py b/invent/migrations/0002_auto_20200615_1024.py new file mode 100644 index 0000000..a7233d0 --- /dev/null +++ b/invent/migrations/0002_auto_20200615_1024.py @@ -0,0 +1,61 @@ +# Generated by Django 3.0.7 on 2020-06-15 10:24 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('basedata', '0002_auto_20200615_1024'), + ('purchase', '0002_auto_20200615_1024'), + ('invent', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='initialinventory', + name='attach', + field=models.FileField(blank=True, help_text='参考FD0002模板文档', null=True, upload_to='inventory', verbose_name='attach'), + ), + migrations.AlterField( + model_name='initialinventory', + name='status', + field=models.CharField(choices=[('0', 'NEW'), ('9', 'EXECUTED')], default='0', max_length=2, verbose_name='status'), + ), + migrations.AlterField( + model_name='inoutdetail', + name='material', + field=models.ForeignKey(blank=True, limit_choices_to={'is_virtual': '0'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='material'), + ), + migrations.AlterField( + model_name='inoutdetail', + name='prop', + field=models.CharField(choices=[('+', 'PLUS'), ('-', 'MINUS')], default='+', max_length=2, verbose_name='plus or minus property'), + ), + migrations.AlterField( + model_name='stockin', + name='po', + field=models.ForeignKey(blank=True, limit_choices_to={'entry_status': '0'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='purchase.PurchaseOrder', verbose_name='purchase order'), + ), + migrations.AlterField( + model_name='stockin', + name='status', + field=models.CharField(choices=[('0', 'NEW'), ('1', 'QUALITY TESTING'), ('9', 'EXECUTED')], default='0', max_length=2, verbose_name='status'), + ), + migrations.AlterField( + model_name='stockout', + name='status', + field=models.CharField(choices=[('0', 'NEW'), ('1', 'IN PROGRESS'), ('9', 'EXECUTED')], default='0', max_length=2, verbose_name='status'), + ), + migrations.AlterField( + model_name='wareadjust', + name='status', + field=models.CharField(choices=[('0', 'NEW'), ('1', 'IN PROGRESS'), ('9', 'EXECUTED')], default='0', max_length=2, verbose_name='status'), + ), + migrations.AlterField( + model_name='warereturn', + name='status', + field=models.CharField(choices=[('0', 'NEW'), ('1', 'IN PROGRESS'), ('9', 'EXECUTED')], default='0', max_length=2, verbose_name='status'), + ), + ] diff --git a/midware/cuser.py b/midware/cuser.py index e61ce70..90b2413 100644 --- a/midware/cuser.py +++ b/midware/cuser.py @@ -21,7 +21,7 @@ class MiddlewareMixin(object): from django.http import Http404, HttpResponseRedirect from django.template.engine import Engine from django.template.response import TemplateResponse -from django.utils import six +# from django.utils import six from django.utils.text import capfirst from django.utils.translation import ugettext as _, ugettext_lazy from django.views.decorators.cache import never_cache @@ -86,7 +86,8 @@ def process_view(self, request, view_func, view_args, view_kwargs): 'weight':app_weight.get(app_label,99) } - app_list = list(six.itervalues(app_dict)) + # app_list = list(six.itervalues(app_dict)) + app_list = list(app_dict.values()) app_list.sort(key=lambda x: x['weight']) for app in app_list: @@ -165,7 +166,8 @@ def process_view(self, request, view_func, view_args, view_kwargs): # Sort the models alphabetically within each app. app_dict['models'].sort(key=lambda x: x['weight']) - app_lib = list(six.itervalues(lib_dict)) + # app_lib = list(six.itervalues(lib_dict)) + app_lib = list(lib_dict.values()) app_lib.sort(key=lambda x: x['weight']) context = dict( diff --git a/mis/__init__.py b/mis/__init__.py index c621205..452a4ef 100644 --- a/mis/__init__.py +++ b/mis/__init__.py @@ -1,5 +1,5 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -import pymysql -pymysql.install_as_MySQLdb() +# import pymysql +# pymysql.install_as_MySQLdb() #解决mysql-python的历史遗留问题(Yuri_2017-04-29) diff --git a/mis/settings.py b/mis/settings.py index b6037f9..3eaa6b0 100644 --- a/mis/settings.py +++ b/mis/settings.py @@ -87,17 +87,17 @@ # https://docs.djangoproject.com/en/1.8/ref/settings/#databases DATABASES = { - # 'default': { - # 'ENGINE': 'django.db.backends.mysql', - # 'HOST': 'localhost', - # 'NAME': 'mis', - # 'USER': 'root', - # 'PASSWORD': 'root', - # } 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - }, + 'ENGINE': 'django.db.backends.mysql', + 'HOST': 'localhost', + 'NAME': 'mis', + 'USER': 'root', + 'PASSWORD': 'root', + } + # 'default': { + # 'ENGINE': 'django.db.backends.sqlite3', + # 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + # }, } diff --git a/note.md b/note.md index a913bdf..7106621 100644 --- a/note.md +++ b/note.md @@ -3,6 +3,13 @@ pipenv install pipenv shell # python manage.py makemigrations sale purchase invent hr selfhelp workflow organ basedata syscfg - python manage.py migrate + python manage.py migrate + + # 使用mysql的话，在这里执行 `install/SQL/mis.sql` 语句 + + # 创建管理员或者修改管理员密码 + # python manage.py changepassword admin python manage.py createsuperuser + python manage.py runserver + diff --git a/organ/migrations/0002_auto_20200615_1024.py b/organ/migrations/0002_auto_20200615_1024.py new file mode 100644 index 0000000..78817ad --- /dev/null +++ b/organ/migrations/0002_auto_20200615_1024.py @@ -0,0 +1,38 @@ +# Generated by Django 3.0.7 on 2020-06-15 10:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organ', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='organization', + name='certificate', + field=models.FileField(blank=True, null=True, upload_to='organ', verbose_name='organization code certificate'), + ), + migrations.AlterField( + model_name='organization', + name='license', + field=models.FileField(blank=True, null=True, upload_to='organ', verbose_name='business license'), + ), + migrations.AlterField( + model_name='position', + name='document', + field=models.FileField(blank=True, null=True, upload_to='', verbose_name='reference'), + ), + migrations.AlterField( + model_name='position', + name='grade', + field=models.CharField(choices=[], default='01', max_length=2, verbose_name='position grade'), + ), + migrations.AlterField( + model_name='position', + name='series', + field=models.CharField(choices=[], default='A', max_length=1, verbose_name='position series'), + ), + ] diff --git a/purchase/migrations/0002_auto_20200615_1024.py b/purchase/migrations/0002_auto_20200615_1024.py new file mode 100644 index 0000000..9bf0f4b --- /dev/null +++ b/purchase/migrations/0002_auto_20200615_1024.py @@ -0,0 +1,45 @@ +# Generated by Django 3.0.7 on 2020-06-15 10:24 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('basedata', '0002_auto_20200615_1024'), + ('purchase', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='invoice', + name='file', + field=models.FileField(blank=True, null=True, upload_to='invoice', verbose_name='invoice file'), + ), + migrations.AlterField( + model_name='poitem', + name='material', + field=models.ForeignKey(limit_choices_to={'is_virtual': '0'}, on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='material'), + ), + migrations.AlterField( + model_name='poitem', + name='tax', + field=models.CharField(choices=[], default='0.00', max_length=6, verbose_name='tax rate'), + ), + migrations.AlterField( + model_name='purchaseorder', + name='attach', + field=models.FileField(blank=True, help_text='您可导入采购明细，模板请参考文档FD0008', null=True, upload_to='', verbose_name='attach'), + ), + migrations.AlterField( + model_name='purchaseorder', + name='partner', + field=models.ForeignKey(limit_choices_to={'partner_type': 'S'}, on_delete=django.db.models.deletion.CASCADE, to='basedata.Partner', verbose_name='partner'), + ), + migrations.AlterField( + model_name='purchaseorder', + name='status', + field=models.CharField(choices=[('0', 'NEW'), ('1', 'IN PROGRESS'), ('4', 'DROP'), ('9', 'APPROVED'), ('99', 'ALREADY STOCK IN')], default='0', max_length=2, verbose_name='status'), + ), + ] diff --git a/sale/migrations/0002_auto_20200615_1024.py b/sale/migrations/0002_auto_20200615_1024.py new file mode 100644 index 0000000..f50ee31 --- /dev/null +++ b/sale/migrations/0002_auto_20200615_1024.py @@ -0,0 +1,60 @@ +# Generated by Django 3.0.7 on 2020-06-15 10:24 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('basedata', '0002_auto_20200615_1024'), + ('sale', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='offeritem', + name='material', + field=models.ForeignKey(blank=True, limit_choices_to={'can_sale': '1', 'is_virtual': '0'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='material'), + ), + migrations.AlterField( + model_name='offeritem', + name='tax', + field=models.CharField(choices=[], default='0.00', max_length=6, verbose_name='tax rate'), + ), + migrations.AlterField( + model_name='offersheet', + name='attach', + field=models.FileField(blank=True, help_text='您可导入报价明细，模板请参考文档FD0006', null=True, upload_to='offer sheet', verbose_name='offer sheet file'), + ), + migrations.AlterField( + model_name='offersheet', + name='partner', + field=models.ForeignKey(limit_choices_to={'partner_type': 'C'}, on_delete=django.db.models.deletion.CASCADE, to='basedata.Partner', verbose_name='partner'), + ), + migrations.AlterField( + model_name='saleitem', + name='material', + field=models.ForeignKey(blank=True, limit_choices_to={'can_sale': '1', 'is_virtual': '0'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='material'), + ), + migrations.AlterField( + model_name='saleitem', + name='tax', + field=models.CharField(choices=[], default='0.00', max_length=6, verbose_name='tax rate'), + ), + migrations.AlterField( + model_name='saleorder', + name='invoice_type', + field=models.CharField(choices=[], default='10', max_length=6, verbose_name='invoice type'), + ), + migrations.AlterField( + model_name='saleorder', + name='partner', + field=models.ForeignKey(limit_choices_to={'partner_type': 'C'}, on_delete=django.db.models.deletion.CASCADE, to='basedata.Partner', verbose_name='partner'), + ), + migrations.AlterField( + model_name='saleorder', + name='status', + field=models.CharField(choices=[('0', 'NEW'), ('1', 'IN PROGRESS'), ('4', 'DROP'), ('9', 'APPROVED'), ('99', 'ALREADY STOCK OUT')], default='0', max_length=2, verbose_name='status'), + ), + ] diff --git a/selfhelp/migrations/0002_auto_20200615_1024.py b/selfhelp/migrations/0002_auto_20200615_1024.py new file mode 100644 index 0000000..296df35 --- /dev/null +++ b/selfhelp/migrations/0002_auto_20200615_1024.py @@ -0,0 +1,80 @@ +# Generated by Django 3.0.7 on 2020-06-15 10:24 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('basedata', '0002_auto_20200615_1024'), + ('selfhelp', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='activity', + name='attach', + field=models.FileField(blank=True, null=True, upload_to='activity', verbose_name='attach'), + ), + migrations.AlterField( + model_name='activity', + name='classification', + field=models.CharField(blank=True, choices=[('T', 'Train'), ('M', 'Meeting'), ('G', 'Community')], default='M', max_length=2, null=True, verbose_name='classification'), + ), + migrations.AlterField( + model_name='activity', + name='room', + field=models.ForeignKey(blank=True, limit_choices_to={'tp': 20}, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='room'), + ), + migrations.AlterField( + model_name='feedback', + name='rank', + field=models.CharField(blank=True, choices=[('A', 'A'), ('B', 'B'), ('C', 'C'), ('D', 'D')], default='B', max_length=2, null=True, verbose_name='rank'), + ), + migrations.AlterField( + model_name='loan', + name='status', + field=models.CharField(blank=True, choices=[('N', 'NEW'), ('I', 'IN PROGRESS'), ('A', 'APPROVED'), ('P', 'PAYED')], default='N', max_length=2, null=True, verbose_name='status'), + ), + migrations.AlterField( + model_name='reimbursement', + name='status', + field=models.CharField(blank=True, choices=[('N', 'NEW'), ('I', 'IN PROGRESS'), ('A', 'APPROVED'), ('P', 'PAYED')], default='N', max_length=2, null=True, verbose_name='status'), + ), + migrations.AlterField( + model_name='woitem', + name='material', + field=models.ForeignKey(blank=True, limit_choices_to={'is_virtual': '0'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='material'), + ), + migrations.AlterField( + model_name='workorder', + name='attach', + field=models.FileField(blank=True, help_text='工单附件，不导入明细。', null=True, upload_to='', verbose_name='attach'), + ), + migrations.AlterField( + model_name='workorder', + name='business_domain', + field=models.CharField(choices=[], default='OT', max_length=4, verbose_name='business domain'), + ), + migrations.AlterField( + model_name='workorder', + name='classification', + field=models.CharField(choices=[], default='D', max_length=4, verbose_name='classification'), + ), + migrations.AlterField( + model_name='workorder', + name='detail', + field=models.FileField(blank=True, help_text='您可导入需求明细，模板请参考文档FD0007', null=True, upload_to='', verbose_name='to be imported detail'), + ), + migrations.AlterField( + model_name='workorder', + name='service', + field=models.ForeignKey(blank=True, limit_choices_to={'is_virtual': '1'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='basedata.Material', verbose_name='service name'), + ), + migrations.AlterField( + model_name='workorder', + name='status', + field=models.CharField(blank=True, choices=[], default='NEW', max_length=6, null=True, verbose_name='status'), + ), + ] diff --git a/templates/admin/base.html b/templates/admin/base.html index 4166ecd..14dbbcf 100644 --- a/templates/admin/base.html +++ b/templates/admin/base.html @@ -1,4 +1,4 @@ -{% load i18n admin_static %} +{% load i18n static %} {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %} diff --git a/templates/admin/change_form.html b/templates/admin/change_form.html index 93045f1..6f5e458 100644 --- a/templates/admin/change_form.html +++ b/templates/admin/change_form.html @@ -1,5 +1,5 @@ {% extends "admin/base_site.html" %} -{% load i18n admin_urls admin_static admin_modify %} +{% load i18n admin_urls static admin_modify %} {% block extrahead %}{{ block.super }} diff --git a/templates/admin/index.html b/templates/admin/index.html index bd1212c..2228672 100644 --- a/templates/admin/index.html +++ b/templates/admin/index.html @@ -1,5 +1,5 @@ {% extends "admin/base_site.html" %} -{% load i18n admin_static %} +{% load i18n static %} {% block extrastyle %}{{ block.super }} diff --git a/templates/admin/invent/initialinventory/change_form.html b/templates/admin/invent/initialinventory/change_form.html index 27b1a4e..05a7748 100644 --- a/templates/admin/invent/initialinventory/change_form.html +++ b/templates/admin/invent/initialinventory/change_form.html @@ -1,5 +1,5 @@ {% extends "admin/base_site.html" %} -{% load i18n admin_urls admin_static admin_modify %} +{% load i18n admin_urls static admin_modify %} {% block extrahead %}{{ block.super }} diff --git a/templates/admin/invent/inventory/change_form.html b/templates/admin/invent/inventory/change_form.html index a5f742b..7976ef8 100644 --- a/templates/admin/invent/inventory/change_form.html +++ b/templates/admin/invent/inventory/change_form.html @@ -1,5 +1,5 @@ {% extends "admin/base_site.html" %} -{% load i18n admin_urls admin_static admin_modify %} +{% load i18n admin_urls static admin_modify %} {% block extrahead %}{{ block.super }} diff --git a/templates/admin/invent/stockin/change_form.html b/templates/admin/invent/stockin/change_form.html index 97362e6..5418990 100644 --- a/templates/admin/invent/stockin/change_form.html +++ b/templates/admin/invent/stockin/change_form.html @@ -1,5 +1,5 @@ {% extends "admin/base_site.html" %} -{% load i18n admin_urls admin_static admin_modify %} +{% load i18n admin_urls static admin_modify %} {% block extrahead %}{{ block.super }} diff --git a/templates/admin/invent/stockout/change_form.html b/templates/admin/invent/stockout/change_form.html index 20c61e9..a629d95 100644 --- a/templates/admin/invent/stockout/change_form.html +++ b/templates/admin/invent/stockout/change_form.html @@ -1,5 +1,5 @@ {% extends "admin/base_site.html" %} -{% load i18n admin_urls admin_static admin_modify %} +{% load i18n admin_urls static admin_modify %} {% block extrahead %}{{ block.super }} diff --git a/templates/admin/invent/wareadjust/change_form.html b/templates/admin/invent/wareadjust/change_form.html index df74b91..99ddfc8 100644 --- a/templates/admin/invent/wareadjust/change_form.html +++ b/templates/admin/invent/wareadjust/change_form.html @@ -1,5 +1,5 @@ {% extends "admin/base_site.html" %} -{% load i18n admin_urls admin_static admin_modify %} +{% load i18n admin_urls static admin_modify %} {% block extrahead %}{{ block.super }} diff --git a/templates/admin/invent/warereturn/change_form.html b/templates/admin/invent/warereturn/change_form.html index ddcb90f..4463c02 100644 --- a/templates/admin/invent/warereturn/change_form.html +++ b/templates/admin/invent/warereturn/change_form.html @@ -1,5 +1,5 @@ {% extends "admin/base_site.html" %} -{% load i18n admin_urls admin_static admin_modify %} +{% load i18n admin_urls static admin_modify %} {% block extrahead %}{{ block.super }} diff --git a/templates/admin/selfhelp/workorder/change_form.html b/templates/admin/selfhelp/workorder/change_form.html index 02f9efc..80ca737 100644 --- a/templates/admin/selfhelp/workorder/change_form.html +++ b/templates/admin/selfhelp/workorder/change_form.html @@ -1,5 +1,5 @@ {% extends "admin/base_site.html" %} -{% load i18n admin_urls admin_static admin_modify %} +{% load i18n admin_urls static admin_modify %} {% block extrahead %}{{ block.super }} diff --git a/templates/admin/workflow/node/change_form.html b/templates/admin/workflow/node/change_form.html index 4358e4d..4f8e13c 100644 --- a/templates/admin/workflow/node/change_form.html +++ b/templates/admin/workflow/node/change_form.html @@ -1,5 +1,5 @@ {% extends "admin/base_site.html" %} -{% load i18n admin_urls admin_static admin_modify %} +{% load i18n admin_urls static admin_modify %} {% block extrahead %}{{ block.super }} diff --git a/workflow/migrations/0002_auto_20200615_1024.py b/workflow/migrations/0002_auto_20200615_1024.py new file mode 100644 index 0000000..ec79350 --- /dev/null +++ b/workflow/migrations/0002_auto_20200615_1024.py @@ -0,0 +1,25 @@ +# Generated by Django 3.0.7 on 2020-06-15 10:24 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('workflow', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='instance', + name='object_id', + field=models.PositiveIntegerField(verbose_name='object id'), + ), + migrations.AlterField( + model_name='modal', + name='content_type', + field=models.ForeignKey(limit_choices_to={'app_label__in': ['basedata', 'organ']}, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType', verbose_name='content type'), + ), + ] From 05657df898a7aeb2e183aa34bb5595ba40161070 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 15 Jun 2020 14:01:49 +0800 Subject: [PATCH 11/65] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=90=84?= =?UTF-8?q?=E4=B8=AA=E6=A8=A1=E5=9D=97=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .flake8 | 2 +- Pipfile | 1 + Pipfile.lock | 26 +- basedata/admin.py | 339 ++++++++----- basedata/apps.py | 4 +- basedata/models.py | 1132 +++++++++++++++++++++++++++++++++---------- basedata/urls.py | 2 +- basedata/views.py | 15 +- common/const.py | 8 +- common/generic.py | 163 ++++--- hr/admin.py | 29 +- hr/apps.py | 2 +- hr/models.py | 105 ++-- invent/admin.py | 115 +++-- invent/apps.py | 2 +- invent/models.py | 273 ++++++----- invent/urls.py | 2 +- invent/views.py | 52 +- midware/cuser.py | 37 +- mis/__init__.py | 2 +- mis/production.py | 2 +- mis/settings.py | 10 +- mis/urls.py | 4 +- note.md | 4 + organ/admin.py | 45 +- organ/apps.py | 4 +- organ/models.py | 126 ++--- plugin/__init__.py | 2 +- plugin/wfactions.py | 16 +- plugin/wfnodes.py | 14 +- plugin/wfusers.py | 18 +- plugin/xls.py | 71 ++- purchase/admin.py | 60 ++- purchase/apps.py | 2 +- purchase/models.py | 146 +++--- sale/admin.py | 61 +-- sale/apps.py | 2 +- sale/models.py | 228 +++++---- selfhelp/admin.py | 112 ++--- selfhelp/apps.py | 2 +- selfhelp/models.py | 279 ++++++----- selfhelp/urls.py | 2 +- selfhelp/views.py | 18 +- syscfg/admin.py | 16 +- syscfg/apps.py | 4 +- syscfg/models.py | 52 +- workflow/admin.py | 62 +-- workflow/apps.py | 4 +- workflow/models.py | 162 ++++--- workflow/views.py | 150 +++--- 50 files changed, 2496 insertions(+), 1493 deletions(-) diff --git a/.flake8 b/.flake8 index 41dd444..c5547b9 100644 --- a/.flake8 +++ b/.flake8 @@ -1,6 +1,6 @@ [flake8] exclude = .git,*migrations,*venv* -max-line-length = 120 +max-line-length = 128 # ignore module level import not at top of file ignore = E402 diff --git a/Pipfile b/Pipfile index 882393d..515796a 100644 --- a/Pipfile +++ b/Pipfile @@ -4,6 +4,7 @@ url = "https://pypi.org/simple" verify_ssl = true [dev-packages] +autopep8 = "*" [packages] django = ">=3.0,<4.0" diff --git a/Pipfile.lock b/Pipfile.lock index 7618054..5e6fc74 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "df86cedd26bd0cbf17d94cf0c60b8a6f8e1eb454d6caac680904a7359b3e2382" + "sha256": "6df505ed9b5ab37d0e060fcf59f73704d95175da665e9df850c43a2cbc8bf9b0" }, "pipfile-spec": 6, "requires": { @@ -80,5 +80,27 @@ "version": "==1.3.0" } }, - "develop": {} + "develop": { + "autopep8": { + "hashes": [ + "sha256:60fd8c4341bab59963dafd5d2a566e94f547e660b9b396f772afe67d8481dbf0" + ], + "index": "pypi", + "version": "==1.5.3" + }, + "pycodestyle": { + "hashes": [ + "sha256:2295e7b2f6b5bd100585ebcb1f616591b652db8a741695b3d8f5d28bdc934367", + "sha256:c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e" + ], + "version": "==2.6.0" + }, + "toml": { + "hashes": [ + "sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f", + "sha256:bda89d5935c2eac546d648028b9901107a595863cb36bae0c73ac804a9b4ce88" + ], + "version": "==0.10.1" + } + } } diff --git a/basedata/admin.py b/basedata/admin.py index 48ec3d5..95e3539 100644 --- a/basedata/admin.py +++ b/basedata/admin.py @@ -1,14 +1,14 @@ # coding=utf-8 from django.contrib import admin from django.forms import models -from django.forms import fields,TextInput,Textarea +from django.forms import fields, TextInput, Textarea from django.contrib import messages from django.utils.translation import ugettext_lazy as _ from django.contrib.contenttypes.admin import GenericTabularInline from common import generic -from basedata.models import ValueList,ValueListItem,Address,Partner,BankAccount,Project,Measure,Material,Brand,\ - Category,Warehouse,TechnicalParameterName,TechnicalParameterValue,Trade,ExpenseAccount,Employee,Family,Education,\ - WorkExperience,ExtraParam,DataImport,Document +from basedata.models import ValueList, ValueListItem, Address, Partner, BankAccount, Project, Measure, Material, Brand,\ + Category, Warehouse, TechnicalParameterName, TechnicalParameterValue, Trade, ExpenseAccount, Employee, Family, Education,\ + WorkExperience, ExtraParam, DataImport, Document class ValueListItemInline(admin.TabularInline): @@ -26,31 +26,48 @@ class ValueListAdmin(generic.BOAdmin): CODE_NUMBER_WIDTH = 3 CODE_PREFIX = 'S' list_display = ['code', 'name', 'module', 'status'] - fields = (('code',),('name',),('module',),('status','init','locked',),('locked_by','lock_time',)) + fields = (('code',), ('name',), ('module',), ('status', + 'init', 'locked',), ('locked_by', 'lock_time',)) raw_id_fields = ['module'] - readonly_fields = ['locked_by','lock_time'] + readonly_fields = ['locked_by', 'lock_time'] inlines = [ValueListItemInline] - search_fields = ['code','name'] + search_fields = ['code', 'name'] def save_model(self, request, obj, form, change): - super(ValueListAdmin,self).save_model(request,obj,form,change) + super(ValueListAdmin, self).save_model(request, obj, form, change) obj.valuelistitem_set.update(group_code=obj.code) class AddressAdmin(generic.BOAdmin): - list_display = ['address','phone','contacts'] - exclude = ['content_type','object_id','creator','modifier','creation','modification','begin','end'] + list_display = ['address', 'phone', 'contacts'] + exclude = [ + 'content_type', + 'object_id', + 'creator', + 'modifier', + 'creation', + 'modification', + 'begin', + 'end'] class AddressInline(GenericTabularInline): model = Address - exclude = ['content_type','object_id','creator','modifier','creation','modification','begin','end'] + exclude = [ + 'content_type', + 'object_id', + 'creator', + 'modifier', + 'creation', + 'modification', + 'begin', + 'end'] extra = 1 class BankAccountInline(admin.TabularInline): model = BankAccount - fields = ['account','title','memo'] + fields = ['account', 'title', 'memo'] def get_extra(self, request, obj=None, **kwargs): if obj: @@ -60,8 +77,20 @@ def get_extra(self, request, obj=None, **kwargs): class PartnerForm(models.ModelForm): - tax_address = fields.CharField(widget=TextInput(attrs={'size': 119,}),required=False,label=_("tax address")) - memo = fields.CharField(widget=Textarea(attrs={'rows':3,'cols':85}),required=False,label=_("memo")) + tax_address = fields.CharField( + widget=TextInput( + attrs={ + 'size': 119, + }), + required=False, + label=_("tax address")) + memo = fields.CharField( + widget=Textarea( + attrs={ + 'rows': 3, + 'cols': 85}), + required=False, + label=_("memo")) class Meta: model = Partner @@ -69,28 +98,43 @@ class Meta: class PartnerAdmin(generic.BOAdmin): - list_display = ['code','name','partner_type','level'] - list_display_links = ['code','name'] + list_display = ['code', 'name', 'partner_type', 'level'] + list_display_links = ['code', 'name'] - fields = (('code','name',),('short','pinyin',),('partner_type','level'),('tax_num','tax_account',), - ('tax_address',),('contacts','phone',),('memo',),) - search_fields = ['code','name','pinyin'] + fields = (('code', 'name',), ('short', 'pinyin',), ('partner_type', 'level'), + ('tax_num', 'tax_account',), ('tax_address',), ('contacts', 'phone',), ('memo',),) + search_fields = ['code', 'name', 'pinyin'] form = PartnerForm save_on_top = True - inlines = [AddressInline,BankAccountInline] + inlines = [AddressInline, BankAccountInline] def get_queryset(self, request): - if request.user.is_superuser or (request.user.has_perm('basedate.view_all_customer') and request.user.has_perm('basedate.view_all_supplier')): - return super(PartnerAdmin,self).get_queryset(request) + if request.user.is_superuser or (request.user.has_perm('basedate.view_all_customer') + and request.user.has_perm('basedate.view_all_supplier')): + return super(PartnerAdmin, self).get_queryset(request) elif request.user.has_perm('basedata.view_all_customer'): - return super(PartnerAdmin,self).get_queryset(request).filter(partner_type='C') + return super( + PartnerAdmin, + self).get_queryset(request).filter( + partner_type='C') else: - return super(PartnerAdmin,self).get_queryset(request).filter(partner_type='S') + return super( + PartnerAdmin, + self).get_queryset(request).filter( + partner_type='S') class ProjectForm(models.ModelForm): - income = fields.DecimalField(required=False,widget=TextInput(attrs={'readonly':'true'})) - expand = fields.DecimalField(required=False,widget=TextInput(attrs={'readonly':'true'})) + income = fields.DecimalField( + required=False, + widget=TextInput( + attrs={ + 'readonly': 'true'})) + expand = fields.DecimalField( + required=False, + widget=TextInput( + attrs={ + 'readonly': 'true'})) class Meta: model = Project @@ -99,15 +143,15 @@ class Meta: class ProjectAdmin(generic.BOAdmin): CODE_PREFIX = 'PJ' - list_display = ['code','name','status','income','expand'] - list_display_links = ['code','name'] + list_display = ['code', 'name', 'status', 'income', 'expand'] + list_display_links = ['code', 'name'] fields = ( - ('code','name',),('short','pinyin',), - ('partner',),('status','prj_type',), + ('code', 'name',), ('short', 'pinyin',), + ('partner',), ('status', 'prj_type',), ('description',), - ('budget','income','expand',),('blueprint',),('offer',),('business',),('users',), + ('budget', 'income', 'expand',), ('blueprint',), ('offer',), ('business',), ('users',), ) - search_fields = ['code','name'] + search_fields = ['code', 'name'] readonly_fields = ['status'] raw_id_fields = ['partner'] filter_horizontal = ['users'] @@ -115,51 +159,60 @@ class ProjectAdmin(generic.BOAdmin): class WarehouseAdmin(admin.ModelAdmin): - list_display = ['code','name','location'] + list_display = ['code', 'name', 'location'] filter_horizontal = ['users'] def save_model(self, request, obj, form, change): - super(WarehouseAdmin,self).save_model(request,obj,form,change) + super(WarehouseAdmin, self).save_model(request, obj, form, change) try: - code = getattr(obj,'code') + code = getattr(obj, 'code') if not code: - obj.code = '%s%02d' % ('A',obj.id) + obj.code = '%s%02d' % ('A', obj.id) obj.save() except Exception as e: - self.message_user(request,'ERROR:%s' % e,level=messages.ERROR) + self.message_user(request, 'ERROR:%s' % e, level=messages.ERROR) class BrandAdmin(admin.ModelAdmin): - list_display = ['name','pinyin'] + list_display = ['name', 'pinyin'] class MeasureAdmin(admin.ModelAdmin): - list_display = ['code','name','status'] + list_display = ['code', 'name', 'status'] class CategoryAdmin(admin.ModelAdmin): - list_display = ['code','name','path'] + list_display = ['code', 'name', 'path'] def save_model(self, request, obj, form, change): - super(CategoryAdmin,self).save_model(request,obj,form,change) + super(CategoryAdmin, self).save_model(request, obj, form, change) try: - code = getattr(obj,'code') + code = getattr(obj, 'code') if not code: - obj.code = '%s%02d' % ('F',obj.id) + obj.code = '%s%02d' % ('F', obj.id) obj.save() if obj.parent: if obj.parent.path: - obj.path = obj.parent.path + '/'+obj.parent.name + obj.path = obj.parent.path + '/' + obj.parent.name else: obj.path = obj.parent.name obj.save() except Exception as e: - self.message_user(request,'ERROR:%s' % e,level=messages.ERROR) + self.message_user(request, 'ERROR:%s' % e, level=messages.ERROR) class MaterialForm(models.ModelForm): - name = fields.CharField(widget=TextInput(attrs={"size":"119"}),label=_("material name")) - spec = fields.CharField(widget=TextInput(attrs={"size":"119"}),required=False,label=_("specifications")) + name = fields.CharField( + widget=TextInput( + attrs={ + "size": "119"}), + label=_("material name")) + spec = fields.CharField( + widget=TextInput( + attrs={ + "size": "119"}), + required=False, + label=_("specifications")) class Mata: model = Material @@ -168,7 +221,7 @@ class Mata: class ExtraParamInline(admin.TabularInline): model = ExtraParam - fields = ['name','data_type','data_source'] + fields = ['name', 'data_type', 'data_source'] def get_extra(self, request, obj=None, **kwargs): if obj: @@ -180,14 +233,14 @@ def get_extra(self, request, obj=None, **kwargs): class MaterialAdmin(generic.BOAdmin): CODE_PREFIX = 'IT' CODE_NUMBER_WIDTH = 5 - list_display = ['code','name','spec','tp'] - list_display_links = ['code','name'] - list_filter = ['brand','tp'] - search_fields = ['code','name'] + list_display = ['code', 'name', 'spec', 'tp'] + list_display_links = ['code', 'name'] + list_filter = ['brand', 'tp'] + search_fields = ['code', 'name'] fields = ( - ('code','barcode'),('name',),('spec',), - ('brand',),('category',),('status','is_equip','can_sale','is_virtual',), - ('warehouse',),('tp',),('measure',),('stock_price','purchase_price','sale_price',), + ('code', 'barcode'), ('name',), ('spec',), + ('brand',), ('category',), ('status', 'is_equip', 'can_sale', 'is_virtual',), + ('warehouse',), ('tp',), ('measure',), ('stock_price', 'purchase_price', 'sale_price',), ) filter_horizontal = ['measure'] inlines = [ExtraParamInline] @@ -199,25 +252,33 @@ class TechParamValueInline(admin.TabularInline): class TechParamNameAdmin(admin.ModelAdmin): - list_display = ['name','category'] + list_display = ['name', 'category'] inlines = [TechParamValueInline] class TradeAdmin(admin.ModelAdmin): - list_display = ['code','name','parent'] + list_display = ['code', 'name', 'parent'] class ExpenseAdmin(generic.BOAdmin): CODE_PREFIX = 'FC' - list_display = ['code','name','category'] - list_display_links = ['code','name'] + list_display = ['code', 'name', 'category'] + list_display_links = ['code', 'name'] list_filter = ['category'] search_fields = ['name'] class FamilyForm(models.ModelForm): - name = fields.CharField(widget=TextInput(attrs={"size":"25"}),label=_("name")) - phone = fields.CharField(widget=TextInput(attrs={"size":"25"}),label=_("phone")) + name = fields.CharField( + widget=TextInput( + attrs={ + "size": "25"}), + label=_("name")) + phone = fields.CharField( + widget=TextInput( + attrs={ + "size": "25"}), + label=_("phone")) class Meta: model = Family @@ -226,70 +287,109 @@ class Meta: class FamilyInline(admin.TabularInline): model = Family - exclude = ['creator','modifier','creation','modification','begin','end'] + exclude = [ + 'creator', + 'modifier', + 'creation', + 'modification', + 'begin', + 'end'] form = FamilyForm extra = 1 class EducationInline(admin.TabularInline): model = Education - exclude = ['creator','modifier','creation','modification'] + exclude = ['creator', 'modifier', 'creation', 'modification'] extra = 0 class WorkExperienceInline(admin.TabularInline): model = WorkExperience - exclude = ['creator','modifier','creation','modification'] + exclude = ['creator', 'modifier', 'creation', 'modification'] extra = 1 class EmployeeAdmin(generic.BOAdmin): CODE_PREFIX = '1' - list_display = ['code','name','position','gender','idcard','age','work_age','literacy','phone','email'] - search_fields = ['code','name','idcard','pinyin'] + list_display = [ + 'code', + 'name', + 'position', + 'gender', + 'idcard', + 'age', + 'work_age', + 'literacy', + 'phone', + 'email'] + search_fields = ['code', 'name', 'idcard', 'pinyin'] fieldsets = [ - (None,{'fields':[('code','phone',),('name','pinyin',),('gender','birthday',),('idcard','country',), - ('position',),('rank','category'),('status','ygxs',),('workday','startday',)]}), - (_('other info'),{'fields':[('hometown','address',),('banknum','bankname',),('email','office',), - ('emergency','literacy',),('religion','marital',),('party','nation',),('spjob','health',), - ('major','degree',),('tag1','tag2',),('tag3','tag4',),('user',),],'classes':['collapse']}), + (None, {'fields': [('code', 'phone',), ('name', 'pinyin',), ('gender', 'birthday',), ('idcard', 'country',), + ('position',), ('rank', 'category'), ('status', 'ygxs',), ('workday', 'startday',)]}), + (_('other info'), {'fields': [('hometown', 'address',), ('banknum', 'bankname',), ('email', 'office',), + ('emergency', 'literacy',), ('religion', 'marital',), ('party', 'nation',), ('spjob', 'health',), + ('major', 'degree',), ('tag1', 'tag2',), ('tag3', 'tag4',), ('user',), ], 'classes':['collapse']}), ] - readonly_fields = ['status','ygxs','rank','category'] - inlines = [FamilyInline,EducationInline,WorkExperienceInline] + readonly_fields = ['status', 'ygxs', 'rank', 'category'] + inlines = [FamilyInline, EducationInline, WorkExperienceInline] raw_id_fields = ['user'] def get_queryset(self, request): - if request.user.is_superuser or request.user.has_perm('basedata.view_all_employee'): - return super(EmployeeAdmin,self).get_queryset(request) + if request.user.is_superuser or request.user.has_perm( + 'basedata.view_all_employee'): + return super(EmployeeAdmin, self).get_queryset(request) else: - return super(EmployeeAdmin,self).get_queryset(request).filter(user=request.user) + return super( + EmployeeAdmin, + self).get_queryset(request).filter( + user=request.user) def get_readonly_fields(self, request, obj=None): if request.user.is_superuser: return [] else: - return ['status','ygxs','rank','category','position','user'] + return ['status', 'ygxs', 'rank', 'category', 'position', 'user'] class DataImportAdmin(generic.BOAdmin): - list_display = ['imp_date','title','status'] - list_display_links = ['imp_date','title'] + list_display = ['imp_date', 'title', 'status'] + list_display_links = ['imp_date', 'title'] raw_id_fields = ['content_type'] readonly_fields = ['status'] - extra_buttons = [{'href':'action','title':_('import')}] - - def changeform_view(self, request, object_id=None, form_url='', extra_context=None): + extra_buttons = [{'href': 'action', 'title': _('import')}] + + def changeform_view( + self, + request, + object_id=None, + form_url='', + extra_context=None): if object_id: obj = DataImport.objects.get(id=object_id) if obj.status == '1': extra_context = extra_context or {} extra_context.update(dict(readonly=True)) - return super(DataImportAdmin,self).changeform_view(request,object_id,form_url,extra_context) + return super( + DataImportAdmin, + self).changeform_view( + request, + object_id, + form_url, + extra_context) class DocumentForm(models.ModelForm): - title = fields.CharField(widget=TextInput(attrs={"size":"119"}),label=_("title")) - keywords = fields.CharField(widget=TextInput(attrs={"size":"119"}),label=_("keywords")) + title = fields.CharField( + widget=TextInput( + attrs={ + "size": "119"}), + label=_("title")) + keywords = fields.CharField( + widget=TextInput( + attrs={ + "size": "119"}), + label=_("keywords")) class Meta: model = Document @@ -299,41 +399,62 @@ class Meta: class DocumentAdmin(generic.BOAdmin): CODE_PREFIX = 'FD' CODE_NUMBER_WIDTH = 4 - list_display = ['code','title','keywords','tp','business_domain','status','creation'] - list_display_links = ['code','title'] - fields = (('code','status',),('title',),('keywords',),('description',),('business_domain','tp',),('attach',)) + list_display = [ + 'code', + 'title', + 'keywords', + 'tp', + 'business_domain', + 'status', + 'creation'] + list_display_links = ['code', 'title'] + fields = (('code', 'status',), ('title',), ('keywords',), + ('description',), ('business_domain', 'tp',), ('attach',)) readonly_fields = ['status'] - list_filter = ['tp','business_domain'] - search_fields = ['title','keywords','code'] + list_filter = ['tp', 'business_domain'] + search_fields = ['title', 'keywords', 'code'] form = DocumentForm actions = ['publish'] date_hierarchy = 'begin' def get_readonly_fields(self, request, obj=None): - if obj and obj.status=='1': - return ['code','status','title','keywords','description','business_domain','tp','attach',] + if obj and obj.status == '1': + return [ + 'code', + 'status', + 'title', + 'keywords', + 'description', + 'business_domain', + 'tp', + 'attach', + ] else: return ['status'] - def publish(self,request,queryset): + def publish(self, request, queryset): import datetime - cnt = queryset.filter(status='0').update(status='1',pub_date=datetime.datetime.now()) - self.message_user(request,u'%s 个文档发布成功'%cnt) + cnt = queryset.filter( + status='0').update( + status='1', + pub_date=datetime.datetime.now()) + self.message_user(request, u'%s 个文档发布成功' % cnt) publish.short_description = _('publish selected %(verbose_name_plural)s') + # admin.site.register(Address,AddressAdmin) -admin.site.register(ValueList,ValueListAdmin) -admin.site.register(Partner,PartnerAdmin) -admin.site.register(Project,ProjectAdmin) -admin.site.register(Material,MaterialAdmin) -admin.site.register(Warehouse,WarehouseAdmin) -admin.site.register(Brand,BrandAdmin) -admin.site.register(Measure,MeasureAdmin) -admin.site.register(Category,CategoryAdmin) -admin.site.register(TechnicalParameterName,TechParamNameAdmin) -admin.site.register(Trade,TradeAdmin) -admin.site.register(ExpenseAccount,ExpenseAdmin) -admin.site.register(Employee,EmployeeAdmin) -admin.site.register(DataImport,DataImportAdmin) -admin.site.register(Document,DocumentAdmin) \ No newline at end of file +admin.site.register(ValueList, ValueListAdmin) +admin.site.register(Partner, PartnerAdmin) +admin.site.register(Project, ProjectAdmin) +admin.site.register(Material, MaterialAdmin) +admin.site.register(Warehouse, WarehouseAdmin) +admin.site.register(Brand, BrandAdmin) +admin.site.register(Measure, MeasureAdmin) +admin.site.register(Category, CategoryAdmin) +admin.site.register(TechnicalParameterName, TechParamNameAdmin) +admin.site.register(Trade, TradeAdmin) +admin.site.register(ExpenseAccount, ExpenseAdmin) +admin.site.register(Employee, EmployeeAdmin) +admin.site.register(DataImport, DataImportAdmin) +admin.site.register(Document, DocumentAdmin) diff --git a/basedata/apps.py b/basedata/apps.py index cbd8dc6..4748b34 100644 --- a/basedata/apps.py +++ b/basedata/apps.py @@ -1,9 +1,9 @@ __author__ = 'zhugl' -# created at 15-4-22 +# created at 15-4-22 from django.apps.config import AppConfig from django.utils.translation import ugettext_lazy as _ class BaseDataConfig(AppConfig): name = 'basedata' - verbose_name = _('BaseData') \ No newline at end of file + verbose_name = _('BaseData') diff --git a/basedata/models.py b/basedata/models.py index 0cf377e..aa5e3c5 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -8,8 +8,8 @@ from common import const from common import generic from common.generic import ToStringMixin -from syscfg.models import Module,Site -from organ.models import Organization,Position +from syscfg.models import Module, Site +from organ.models import Organization, Position import datetime from plugin.xls import ExcelManager @@ -19,21 +19,41 @@ class ValueList(generic.BO): 值列表 """ index_weight = 9 - code = models.CharField(_("list code"),max_length=const.DB_CHAR_CODE_6,blank=True,null=True) - name = models.CharField(_("list name"),max_length=const.DB_CHAR_NAME_40) - module = models.ForeignKey(Module,verbose_name=_("module"),blank=True,null=True,on_delete=models.CASCADE) - status = models.BooleanField(_("in use"),default=True) - init = models.BooleanField(_("is init"),default=False) - locked = models.BooleanField(_("is locked"),default=False) - locked_by = models.ForeignKey(User,verbose_name=_("locked by"),blank=True,null=True,on_delete=models.CASCADE) - lock_time = models.DateTimeField(_("locked time"),null=True,blank=True) + code = models.CharField( + _("list code"), + max_length=const.DB_CHAR_CODE_6, + blank=True, + null=True) + name = models.CharField(_("list name"), max_length=const.DB_CHAR_NAME_40) + module = models.ForeignKey( + Module, + verbose_name=_("module"), + blank=True, + null=True, + on_delete=models.CASCADE) + status = models.BooleanField(_("in use"), default=True) + init = models.BooleanField(_("is init"), default=False) + locked = models.BooleanField(_("is locked"), default=False) + locked_by = models.ForeignKey( + User, + verbose_name=_("locked by"), + blank=True, + null=True, + on_delete=models.CASCADE) + lock_time = models.DateTimeField(_("locked time"), null=True, blank=True) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): - super(ValueList,self).save(force_insert,force_update,using,update_fields) + super( + ValueList, + self).save( + force_insert, + force_update, + using, + update_fields) sql = 'update basedata_valuelistitem set group_code = %s where groud_id=%s' - params = [self.code,self.id] - generic.update(sql,params) + params = [self.code, self.id] + generic.update(sql, params) class Meta: verbose_name = _('value list') @@ -44,29 +64,45 @@ class ValueListItem(ToStringMixin, models.Model): """ 值列表项 """ - group = models.ForeignKey(ValueList,verbose_name=_("list group"),on_delete=models.CASCADE) - group_code = models.CharField(max_length=const.DB_CHAR_CODE_6,blank=True,null=True) - code = models.CharField(_("item code"),max_length=const.DB_CHAR_CODE_6,blank=True,null=True) - name = models.CharField(_("item name"),max_length=const.DB_CHAR_NAME_40) - status = models.BooleanField(_("in use"),default=True) - weight = models.IntegerField(_("weight"),null=True,default=9) + group = models.ForeignKey( + ValueList, + verbose_name=_("list group"), + on_delete=models.CASCADE) + group_code = models.CharField( + max_length=const.DB_CHAR_CODE_6, + blank=True, + null=True) + code = models.CharField( + _("item code"), + max_length=const.DB_CHAR_CODE_6, + blank=True, + null=True) + name = models.CharField(_("item name"), max_length=const.DB_CHAR_NAME_40) + status = models.BooleanField(_("in use"), default=True) + weight = models.IntegerField(_("weight"), null=True, default=9) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): if not self.code: - cnt = self.group.valuelistitem_set.count()+1 + cnt = self.group.valuelistitem_set.count() + 1 self.code = "%02d" % cnt self.group_code = self.group.code - super(ValueListItem,self).save(force_insert,force_update,using,update_fields) + super( + ValueListItem, + self).save( + force_insert, + force_update, + using, + update_fields) def __unicode__(self): - return "%s-%s" % (self.code,self.name) + return "%s-%s" % (self.code, self.name) class Meta: verbose_name = _('list item') verbose_name_plural = _('list item') - ordering = ['weight','code'] - index_together = ['group','group_code'] + ordering = ['weight', 'code'] + index_together = ['group', 'group_code'] def get_value_list(group): @@ -78,7 +114,8 @@ def get_value_list(group): from django.db.utils import OperationalError if group: try: - return tuple([(item.code, item.name) for item in ValueListItem.objects.filter(group_code__exact=group,status=1)]) + return tuple([(item.code, item.name) for item in ValueListItem.objects.filter( + group_code__exact=group, status=1)]) except Exception: return None else: @@ -90,14 +127,34 @@ class Address(generic.BO): 地址 """ ADDRESS_TYPE = get_value_list('S011') - address_type = models.CharField(_("address type"),max_length=const.DB_CHAR_CODE_2,choices=ADDRESS_TYPE,default='01') - address = models.CharField(_("address"),max_length=const.DB_CHAR_NAME_120) - zipcode = models.CharField(_("zipcode"),max_length=const.DB_CHAR_CODE_8,blank=True,null=True) - phone = models.CharField(_("phone"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - contacts = models.CharField(_("contacts"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - - content_type = models.ForeignKey(ContentType,blank=True,null=True,on_delete=models.CASCADE) - object_id = models.PositiveIntegerField(blank=True,null=True) + address_type = models.CharField( + _("address type"), + max_length=const.DB_CHAR_CODE_2, + choices=ADDRESS_TYPE, + default='01') + address = models.CharField(_("address"), max_length=const.DB_CHAR_NAME_120) + zipcode = models.CharField( + _("zipcode"), + max_length=const.DB_CHAR_CODE_8, + blank=True, + null=True) + phone = models.CharField( + _("phone"), + max_length=const.DB_CHAR_NAME_20, + blank=True, + null=True) + contacts = models.CharField( + _("contacts"), + max_length=const.DB_CHAR_NAME_40, + blank=True, + null=True) + + content_type = models.ForeignKey( + ContentType, + blank=True, + null=True, + on_delete=models.CASCADE) + object_id = models.PositiveIntegerField(blank=True, null=True) content_object = GenericForeignKey('content_type', 'object_id') class Meta: @@ -116,33 +173,80 @@ class Partner(generic.BO): ) LEVEL = ( - ('A','A'), - ('B','B'), - ('C','C'), - ('D','D'), + ('A', 'A'), + ('B', 'B'), + ('C', 'C'), + ('D', 'D'), ) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) - code = models.CharField(_("partner code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - name = models.CharField(_("partner name"),max_length=const.DB_CHAR_NAME_120) - short = models.CharField(_("short name"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - pinyin = models.CharField(_("pinyin"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - partner_type = models.CharField(_("type"),max_length=const.DB_CHAR_CODE_2,choices=PARTNER_TYPE,default='C') - level = models.CharField(_("level"),max_length=const.DB_CHAR_CODE_2,choices=LEVEL,default='C') - - tax_num = models.CharField(_("tax num"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - tax_address = models.CharField(_("tax address"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - tax_account = models.CharField(_("tax account"),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) - - contacts = models.CharField(_("contacts"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - phone = models.CharField(_("phone"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - memo = models.TextField(_("memo"),blank=True,null=True) + org = models.ForeignKey( + Organization, + verbose_name=_("organization"), + blank=True, + null=True, + on_delete=models.CASCADE) + code = models.CharField( + _("partner code"), + max_length=const.DB_CHAR_NAME_20, + blank=True, + null=True) + name = models.CharField( + _("partner name"), + max_length=const.DB_CHAR_NAME_120) + short = models.CharField( + _("short name"), + max_length=const.DB_CHAR_NAME_20, + blank=True, + null=True) + pinyin = models.CharField( + _("pinyin"), + max_length=const.DB_CHAR_NAME_120, + blank=True, + null=True) + partner_type = models.CharField( + _("type"), + max_length=const.DB_CHAR_CODE_2, + choices=PARTNER_TYPE, + default='C') + level = models.CharField( + _("level"), + max_length=const.DB_CHAR_CODE_2, + choices=LEVEL, + default='C') + + tax_num = models.CharField( + _("tax num"), + max_length=const.DB_CHAR_NAME_40, + blank=True, + null=True) + tax_address = models.CharField( + _("tax address"), + max_length=const.DB_CHAR_NAME_40, + blank=True, + null=True) + tax_account = models.CharField( + _("tax account"), + max_length=const.DB_CHAR_NAME_80, + blank=True, + null=True) + + contacts = models.CharField( + _("contacts"), + max_length=const.DB_CHAR_NAME_40, + blank=True, + null=True) + phone = models.CharField( + _("phone"), + max_length=const.DB_CHAR_NAME_40, + blank=True, + null=True) + memo = models.TextField(_("memo"), blank=True, null=True) class Meta: verbose_name = _('partner') verbose_name_plural = _('partner') permissions = ( - ('view_all_customer',_("view all customer")), - ('view_all_supplier',_("view all supplier")), + ('view_all_customer', _("view all customer")), + ('view_all_supplier', _("view all supplier")), ) @@ -150,11 +254,27 @@ class BankAccount(generic.BO): """ 银行账户 organization """ - account = models.CharField(_("account num"),max_length=const.DB_CHAR_NAME_40) - title = models.CharField(_("bank name"),max_length=const.DB_CHAR_NAME_40) - memo = models.CharField(_("memo"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - partner = models.ForeignKey(Partner,verbose_name=_("partner"),blank=True,null=True,on_delete=models.CASCADE) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) + account = models.CharField( + _("account num"), + max_length=const.DB_CHAR_NAME_40) + title = models.CharField(_("bank name"), max_length=const.DB_CHAR_NAME_40) + memo = models.CharField( + _("memo"), + max_length=const.DB_CHAR_NAME_20, + blank=True, + null=True) + partner = models.ForeignKey( + Partner, + verbose_name=_("partner"), + blank=True, + null=True, + on_delete=models.CASCADE) + org = models.ForeignKey( + Organization, + verbose_name=_("organization"), + blank=True, + null=True, + on_delete=models.CASCADE) def __unicode__(self): name = '' @@ -162,7 +282,7 @@ def __unicode__(self): name = self.org.name elif self.partner: name = self.partner.name - return u"%s %s %s" % (name,self.account,self.title) + return u"%s %s %s" % (name, self.account, self.title) class Meta: verbose_name = _('bank account') @@ -177,27 +297,93 @@ class Project(generic.BO): TYPES = get_value_list('S013') index_weight = 1 - code = models.CharField(_("project code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - name = models.CharField(_("project name"),max_length=const.DB_CHAR_NAME_120) - short = models.CharField(_("short name"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - pinyin = models.CharField(_("pinyin"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - - partner = models.ForeignKey(Partner,blank=True,null=True,verbose_name=_("partner"),limit_choices_to={"partner_type":"C"},on_delete=models.CASCADE) - status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,default='00',choices=STATUS) - prj_type = models.CharField(_("project type"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=TYPES,default='00') - - description = models.TextField(_("description"),blank=True,null=True) - - budget = models.DecimalField(_("budget"),max_digits=10,decimal_places=2,blank=True,null=True) - income = models.DecimalField(_("income"),max_digits=10,decimal_places=2,blank=True,null=True) - expand = models.DecimalField(_("expand"),max_digits=10,decimal_places=2,blank=True,null=True) - - blueprint = models.FileField(_("blueprint"),upload_to='project',blank=True,null=True) - offer = models.FileField(_("offer sheet"),upload_to='offer sheet',blank=True,null=True) - business = models.FileField(_("business document"),upload_to='project',blank=True,null=True) - - users = models.ManyToManyField(User,verbose_name=_("related users"),blank=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) + code = models.CharField( + _("project code"), + max_length=const.DB_CHAR_NAME_20, + blank=True, + null=True) + name = models.CharField( + _("project name"), + max_length=const.DB_CHAR_NAME_120) + short = models.CharField( + _("short name"), + max_length=const.DB_CHAR_NAME_20, + blank=True, + null=True) + pinyin = models.CharField( + _("pinyin"), + max_length=const.DB_CHAR_NAME_120, + blank=True, + null=True) + + partner = models.ForeignKey( + Partner, + blank=True, + null=True, + verbose_name=_("partner"), + limit_choices_to={ + "partner_type": "C"}, + on_delete=models.CASCADE) + status = models.CharField( + _("status"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + default='00', + choices=STATUS) + prj_type = models.CharField( + _("project type"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=TYPES, + default='00') + + description = models.TextField(_("description"), blank=True, null=True) + + budget = models.DecimalField( + _("budget"), + max_digits=10, + decimal_places=2, + blank=True, + null=True) + income = models.DecimalField( + _("income"), + max_digits=10, + decimal_places=2, + blank=True, + null=True) + expand = models.DecimalField( + _("expand"), + max_digits=10, + decimal_places=2, + blank=True, + null=True) + + blueprint = models.FileField( + _("blueprint"), + upload_to='project', + blank=True, + null=True) + offer = models.FileField( + _("offer sheet"), + upload_to='offer sheet', + blank=True, + null=True) + business = models.FileField( + _("business document"), + upload_to='project', + blank=True, + null=True) + + users = models.ManyToManyField( + User, verbose_name=_("related users"), blank=True) + org = models.ForeignKey( + Organization, + verbose_name=_("organization"), + blank=True, + null=True, + on_delete=models.CASCADE) class Meta: verbose_name = _('project') @@ -209,12 +395,26 @@ class Warehouse(ToStringMixin, models.Model): 仓库 """ index_weight = 6 - code = models.CharField(_("code"),max_length=const.DB_CHAR_CODE_6,blank=True,null=True) - name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_40) - status = models.BooleanField(_("in use"),default=True) - location = models.CharField(_("location"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - users = models.ManyToManyField(User,verbose_name=_("related users"),blank=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) + code = models.CharField( + _("code"), + max_length=const.DB_CHAR_CODE_6, + blank=True, + null=True) + name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_40) + status = models.BooleanField(_("in use"), default=True) + location = models.CharField( + _("location"), + max_length=const.DB_CHAR_NAME_120, + blank=True, + null=True) + users = models.ManyToManyField( + User, verbose_name=_("related users"), blank=True) + org = models.ForeignKey( + Organization, + verbose_name=_("organization"), + blank=True, + null=True, + on_delete=models.CASCADE) def __unicode__(self): return '%s' % self.name @@ -229,9 +429,13 @@ class Measure(ToStringMixin, models.Model): 计量单位 """ index_weight = 5 - code = models.CharField(_("code"),max_length=const.DB_CHAR_CODE_6,blank=True,null=True) - name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_20) - status = models.BooleanField(_("in use"),default=True) + code = models.CharField( + _("code"), + max_length=const.DB_CHAR_CODE_6, + blank=True, + null=True) + name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_20) + status = models.BooleanField(_("in use"), default=True) def __unicode__(self): return '%s' % self.name @@ -246,10 +450,19 @@ class Trade(ToStringMixin, models.Model): 国民经济行业分类 """ index_weight = 102 - code = models.CharField(_("code"),max_length=const.DB_CHAR_CODE_6) - name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_120) - memo = models.CharField(_("memo"),max_length=const.DB_CHAR_NAME_120,null=True,blank=True) - parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True,on_delete=models.CASCADE) + code = models.CharField(_("code"), max_length=const.DB_CHAR_CODE_6) + name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_120) + memo = models.CharField( + _("memo"), + max_length=const.DB_CHAR_NAME_120, + null=True, + blank=True) + parent = models.ForeignKey( + 'self', + verbose_name=_("parent"), + null=True, + blank=True, + on_delete=models.CASCADE) def __unicode__(self): return '%s' % self.name @@ -265,10 +478,23 @@ class Brand(ToStringMixin, models.Model): 品牌 """ index_weight = 101 - trade = models.ForeignKey(Trade,verbose_name=_("trade"),null=True,blank=True,on_delete=models.CASCADE) - name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_120) - pinyin = models.CharField(_("pinyin"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - weight = models.IntegerField(_("weight"),blank=True,null=True,default=99) + trade = models.ForeignKey( + Trade, + verbose_name=_("trade"), + null=True, + blank=True, + on_delete=models.CASCADE) + name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_120) + pinyin = models.CharField( + _("pinyin"), + max_length=const.DB_CHAR_NAME_120, + blank=True, + null=True) + weight = models.IntegerField( + _("weight"), + blank=True, + null=True, + default=99) def __unicode__(self): return '%s' % self.name @@ -283,11 +509,29 @@ class Category(ToStringMixin, models.Model): 分类 """ index_weight = 100 - trade = models.ForeignKey(Trade,verbose_name=_("trade"),null=True,blank=True,on_delete=models.CASCADE) - parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True,on_delete=models.CASCADE) - code = models.CharField(_("code"),max_length=const.DB_CHAR_CODE_6,null=True,blank=True) - name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_120) - path = models.CharField(_("path"),max_length=const.DB_CHAR_NAME_200,null=True,blank=True) + trade = models.ForeignKey( + Trade, + verbose_name=_("trade"), + null=True, + blank=True, + on_delete=models.CASCADE) + parent = models.ForeignKey( + 'self', + verbose_name=_("parent"), + null=True, + blank=True, + on_delete=models.CASCADE) + code = models.CharField( + _("code"), + max_length=const.DB_CHAR_CODE_6, + null=True, + blank=True) + name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_120) + path = models.CharField( + _("path"), + max_length=const.DB_CHAR_NAME_200, + null=True, + blank=True) def __unicode__(self): return '%s' % self.name @@ -302,9 +546,12 @@ class TechnicalParameterName(ToStringMixin, models.Model): 技术参数-名称，将技术参数绑定于物料分类上，在此分类下的物料自动继承全部技术参数 """ index_weight = 7 - category = models.ForeignKey(Category,verbose_name=_("material category"),on_delete=models.CASCADE) - name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_40) - status = models.BooleanField(_("in use"),default=True) + category = models.ForeignKey( + Category, + verbose_name=_("material category"), + on_delete=models.CASCADE) + name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_40) + status = models.BooleanField(_("in use"), default=True) def __unicode__(self): return '%s' % self.name @@ -318,9 +565,16 @@ class TechnicalParameterValue(ToStringMixin, models.Model): """ 技术参数-值，将技术参数绑定于物料分类上，在此分类下的物料自动继承全部技术参数 """ - tech_name = models.ForeignKey(TechnicalParameterName,verbose_name=_("technical name"),on_delete=models.CASCADE) - value = models.CharField(_("value"),max_length=const.DB_CHAR_NAME_80) - description = models.CharField(_("description"),max_length=const.DB_CHAR_NAME_80,null=True,blank=True) + tech_name = models.ForeignKey( + TechnicalParameterName, + verbose_name=_("technical name"), + on_delete=models.CASCADE) + value = models.CharField(_("value"), max_length=const.DB_CHAR_NAME_80) + description = models.CharField( + _("description"), + max_length=const.DB_CHAR_NAME_80, + null=True, + blank=True) def __unicode__(self): return '%s' % self.value @@ -335,46 +589,114 @@ class Material(generic.BO): 物料 """ index_weight = 4 - code = models.CharField(_("material code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - barcode = models.CharField(_("bar code"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - name = models.CharField(_("material name"),max_length=const.DB_CHAR_NAME_120) - spec = models.CharField(_("specifications"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - pinyin = models.CharField(_("pinyin"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - brand = models.ForeignKey(Brand,blank=True,null=True,verbose_name=_("brand"),on_delete=models.CASCADE) - category = models.ForeignKey(Category,blank=True,null=True,verbose_name=_("category"),on_delete=models.CASCADE) - tp = models.CharField(_('mt type'),blank=True,null=True,max_length=const.DB_CHAR_CODE_2,choices=const.get_value_list('S054'),default='10') - status = models.BooleanField(_("in use"),default=True) - is_equip = models.BooleanField(_("is equipment"),default=False) - can_sale = models.BooleanField(_("can sale"),default=True) - is_virtual = models.BooleanField(_("is virtual"),default=False) - - warehouse = models.ForeignKey(Warehouse,blank=True,null=True,verbose_name=_("warehouse"),on_delete=models.CASCADE) - measure = models.ManyToManyField(Measure,verbose_name=_("measure")) - - params = models.ManyToManyField(TechnicalParameterValue,verbose_name=_("technical parameter"),through='MaterialParam') - - stock_price = models.DecimalField(_("stock price"),max_digits=14,decimal_places=4,blank=True,null=True) - purchase_price = models.DecimalField(_("purchase price"),max_digits=14,decimal_places=4,blank=True,null=True) - sale_price = models.DecimalField(_("sale price"),max_digits=14,decimal_places=4,blank=True,null=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) + code = models.CharField( + _("material code"), + max_length=const.DB_CHAR_NAME_20, + blank=True, + null=True) + barcode = models.CharField( + _("bar code"), + max_length=const.DB_CHAR_NAME_40, + blank=True, + null=True) + name = models.CharField( + _("material name"), + max_length=const.DB_CHAR_NAME_120) + spec = models.CharField( + _("specifications"), + max_length=const.DB_CHAR_NAME_120, + blank=True, + null=True) + pinyin = models.CharField( + _("pinyin"), + max_length=const.DB_CHAR_NAME_120, + blank=True, + null=True) + brand = models.ForeignKey( + Brand, + blank=True, + null=True, + verbose_name=_("brand"), + on_delete=models.CASCADE) + category = models.ForeignKey( + Category, + blank=True, + null=True, + verbose_name=_("category"), + on_delete=models.CASCADE) + tp = models.CharField( + _('mt type'), + blank=True, + null=True, + max_length=const.DB_CHAR_CODE_2, + choices=const.get_value_list('S054'), + default='10') + status = models.BooleanField(_("in use"), default=True) + is_equip = models.BooleanField(_("is equipment"), default=False) + can_sale = models.BooleanField(_("can sale"), default=True) + is_virtual = models.BooleanField(_("is virtual"), default=False) + + warehouse = models.ForeignKey( + Warehouse, + blank=True, + null=True, + verbose_name=_("warehouse"), + on_delete=models.CASCADE) + measure = models.ManyToManyField(Measure, verbose_name=_("measure")) + + params = models.ManyToManyField( + TechnicalParameterValue, + verbose_name=_("technical parameter"), + through='MaterialParam') + + stock_price = models.DecimalField( + _("stock price"), + max_digits=14, + decimal_places=4, + blank=True, + null=True) + purchase_price = models.DecimalField( + _("purchase price"), + max_digits=14, + decimal_places=4, + blank=True, + null=True) + sale_price = models.DecimalField( + _("sale price"), + max_digits=14, + decimal_places=4, + blank=True, + null=True) + org = models.ForeignKey( + Organization, + verbose_name=_("organization"), + blank=True, + null=True, + on_delete=models.CASCADE) def __unicode__(self): - return "%s %s" % (self.code,self.name) + return "%s %s" % (self.code, self.name) class Meta: verbose_name = _('material') verbose_name_plural = _('material') - ordering = ['tp','code'] + ordering = ['tp', 'code'] class MaterialParam(ToStringMixin, models.Model): """ """ - material = models.ForeignKey(Material,on_delete=models.CASCADE) - param_value = models.ForeignKey(TechnicalParameterValue,on_delete=models.CASCADE) - param_name = models.ForeignKey(TechnicalParameterName,blank=Trade,null=True,on_delete=models.CASCADE) + material = models.ForeignKey(Material, on_delete=models.CASCADE) + param_value = models.ForeignKey( + TechnicalParameterValue, + on_delete=models.CASCADE) + param_name = models.ForeignKey( + TechnicalParameterName, + blank=Trade, + null=True, + on_delete=models.CASCADE) creation = models.DateField(auto_now_add=True) def __unicode__(self): @@ -390,14 +712,25 @@ class ExtraParam(ToStringMixin, models.Model): """ DATA_TYPE = ( - ('CHAR',_('CHAR')), - ('NUM',_('NUMBER')), - ('DATE',_('DATE')), + ('CHAR', _('CHAR')), + ('NUM', _('NUMBER')), + ('DATE', _('DATE')), ) - material = models.ForeignKey(Material,verbose_name=_("material"),on_delete=models.CASCADE) - name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_40) - data_type = models.CharField(_("data type"),default='CHAR',choices=DATA_TYPE,max_length=const.DB_CHAR_CODE_6) - data_source = models.CharField(_("data source"),blank=True,null=True,max_length=const.DB_CHAR_NAME_40) + material = models.ForeignKey( + Material, + verbose_name=_("material"), + on_delete=models.CASCADE) + name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_40) + data_type = models.CharField( + _("data type"), + default='CHAR', + choices=DATA_TYPE, + max_length=const.DB_CHAR_CODE_6) + data_source = models.CharField( + _("data source"), + blank=True, + null=True, + max_length=const.DB_CHAR_NAME_40) def __unicode__(self): return "%s" % self.name @@ -412,26 +745,44 @@ class ExpenseAccount(generic.BO): 费用科目 """ CATEGORY = ( - ('HR',_('HR-DOMAIN')), - ('OF',_('OFFICE-DOMAIN')), - ('PU',_('PUBLIS-DOMAIN')), - ('MU',_('MUNADOMAIN')), - ('BU',_('BUSINESS')), - ('OT',_('OTHER')), + ('HR', _('HR-DOMAIN')), + ('OF', _('OFFICE-DOMAIN')), + ('PU', _('PUBLIS-DOMAIN')), + ('MU', _('MUNADOMAIN')), + ('BU', _('BUSINESS')), + ('OT', _('OTHER')), ) index_weight = 10 - code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_120) - category = models.CharField(_("category"),max_length=const.DB_CHAR_CODE_4,choices=CATEGORY,default='PU') - description = models.TextField(_("description"),blank=True,null=True) - parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True,on_delete=models.CASCADE) - status = models.BooleanField(_("in use"),default=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) + code = models.CharField( + _("code"), + max_length=const.DB_CHAR_NAME_20, + blank=True, + null=True) + name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_120) + category = models.CharField( + _("category"), + max_length=const.DB_CHAR_CODE_4, + choices=CATEGORY, + default='PU') + description = models.TextField(_("description"), blank=True, null=True) + parent = models.ForeignKey( + 'self', + verbose_name=_("parent"), + null=True, + blank=True, + on_delete=models.CASCADE) + status = models.BooleanField(_("in use"), default=True) + org = models.ForeignKey( + Organization, + verbose_name=_("organization"), + blank=True, + null=True, + on_delete=models.CASCADE) class Meta: verbose_name = _('expenses account') verbose_name_plural = _('expenses account') - ordering = ['category','code'] + ordering = ['category', 'code'] class Employee(generic.BO): @@ -439,69 +790,235 @@ class Employee(generic.BO): 职员信息 """ index_weight = 2 - code = models.CharField(_("employee number"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - phone = models.CharField(_("phone"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - organization = models.ForeignKey(Organization,verbose_name = _('organization'),null=True,blank=True,on_delete=models.CASCADE) - name = models.CharField(_("employee name"),max_length=const.DB_CHAR_NAME_120) - pinyin = models.CharField(_("pinyin"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - birthday = models.DateField(_("birthday"),blank=True,null=True) - - gender = models.CharField(_("gender"),max_length=const.DB_CHAR_CODE_2,choices=const.get_value_list('gender'),default='1') - idcard = models.CharField(_("id card"),max_length=const.DB_CHAR_NAME_20) - - country = models.CharField(_("nationality"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,default='CN',choices=const.get_value_list('S022')) - hometown = models.CharField(_("hometown"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - address = models.CharField(_("home address"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - banknum = models.CharField(_("bank account"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - bankname = models.CharField(_("bank name"),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) - emergency = models.CharField(_("emergency contacts"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - email = models.CharField(_("email"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - office = models.CharField(_("office phone"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - - position = models.ForeignKey(Position,verbose_name = _('position'),on_delete=models.CASCADE) - rank = models.CharField(_("employee rank"),max_length=const.DB_CHAR_CODE_2,default='00',choices=const.get_value_list('S017')) - - workday = models.DateField(_("workday"),blank=True,null=True) - startday = models.DateField(_("start date"),blank=True,null=True) - - religion = models.CharField(_("religion"),max_length=const.DB_CHAR_CODE_2,default='00',choices=const.get_value_list('S020'),blank=True,null=True,) - marital = models.CharField(_("marital status"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S023'),default='10') - - party = models.CharField(_("political party"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S026'),default='13') - nation = models.CharField(_("nation"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S021'),default='01') - - ygxs = models.CharField(_("employ ygxs"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S019'),default='2') - status = models.CharField(_("employ status"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S016'),default='10') - category = models.CharField(_("employ category"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S018'),default='21') - - literacy = models.CharField(_("literacy"),max_length=const.DB_CHAR_CODE_2,default='10',choices=const.get_value_list('S024'),blank=True,null=True) - major = models.CharField(_("major type"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S038'),default='99') - degree = models.CharField(_("major degree"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S037'),default='4') - - spjob = models.CharField(_("special job"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S042'),default='00') - health = models.CharField(_("health"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S043'),default='1') - - tag1 = models.CharField(_("tag1 fzjr"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S039'),default='99') - tag2 = models.CharField(_("tag2 dwld"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S040'),default='9') - tag3 = models.CharField(_("tag3 dsjs"),max_length=const.DB_CHAR_CODE_10,blank=True,null=True,choices=const.get_value_list('S041'),default='00') - tag4 = models.CharField(_("tag4 byzk"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S027'),default='0') - - user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) + code = models.CharField( + _("employee number"), + max_length=const.DB_CHAR_NAME_20, + blank=True, + null=True) + phone = models.CharField( + _("phone"), + max_length=const.DB_CHAR_NAME_20, + blank=True, + null=True) + organization = models.ForeignKey( + Organization, + verbose_name=_('organization'), + null=True, + blank=True, + on_delete=models.CASCADE) + name = models.CharField( + _("employee name"), + max_length=const.DB_CHAR_NAME_120) + pinyin = models.CharField( + _("pinyin"), + max_length=const.DB_CHAR_NAME_120, + blank=True, + null=True) + birthday = models.DateField(_("birthday"), blank=True, null=True) + + gender = models.CharField( + _("gender"), + max_length=const.DB_CHAR_CODE_2, + choices=const.get_value_list('gender'), + default='1') + idcard = models.CharField(_("id card"), max_length=const.DB_CHAR_NAME_20) + + country = models.CharField( + _("nationality"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + default='CN', + choices=const.get_value_list('S022')) + hometown = models.CharField( + _("hometown"), + max_length=const.DB_CHAR_NAME_40, + blank=True, + null=True) + address = models.CharField( + _("home address"), + max_length=const.DB_CHAR_NAME_120, + blank=True, + null=True) + banknum = models.CharField( + _("bank account"), + max_length=const.DB_CHAR_NAME_40, + blank=True, + null=True) + bankname = models.CharField( + _("bank name"), + max_length=const.DB_CHAR_NAME_80, + blank=True, + null=True) + emergency = models.CharField( + _("emergency contacts"), + max_length=const.DB_CHAR_NAME_40, + blank=True, + null=True) + email = models.CharField( + _("email"), + max_length=const.DB_CHAR_NAME_20, + blank=True, + null=True) + office = models.CharField( + _("office phone"), + max_length=const.DB_CHAR_NAME_20, + blank=True, + null=True) + + position = models.ForeignKey( + Position, + verbose_name=_('position'), + on_delete=models.CASCADE) + rank = models.CharField( + _("employee rank"), + max_length=const.DB_CHAR_CODE_2, + default='00', + choices=const.get_value_list('S017')) + + workday = models.DateField(_("workday"), blank=True, null=True) + startday = models.DateField(_("start date"), blank=True, null=True) + + religion = models.CharField( + _("religion"), + max_length=const.DB_CHAR_CODE_2, + default='00', + choices=const.get_value_list('S020'), + blank=True, + null=True, + ) + marital = models.CharField( + _("marital status"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S023'), + default='10') + + party = models.CharField( + _("political party"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S026'), + default='13') + nation = models.CharField( + _("nation"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S021'), + default='01') + + ygxs = models.CharField( + _("employ ygxs"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S019'), + default='2') + status = models.CharField( + _("employ status"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S016'), + default='10') + category = models.CharField( + _("employ category"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S018'), + default='21') + + literacy = models.CharField( + _("literacy"), + max_length=const.DB_CHAR_CODE_2, + default='10', + choices=const.get_value_list('S024'), + blank=True, + null=True) + major = models.CharField( + _("major type"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S038'), + default='99') + degree = models.CharField( + _("major degree"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S037'), + default='4') + + spjob = models.CharField( + _("special job"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S042'), + default='00') + health = models.CharField( + _("health"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S043'), + default='1') + + tag1 = models.CharField( + _("tag1 fzjr"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S039'), + default='99') + tag2 = models.CharField( + _("tag2 dwld"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S040'), + default='9') + tag3 = models.CharField( + _("tag3 dsjs"), + max_length=const.DB_CHAR_CODE_10, + blank=True, + null=True, + choices=const.get_value_list('S041'), + default='00') + tag4 = models.CharField( + _("tag4 byzk"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S027'), + default='0') + + user = models.ForeignKey( + User, + verbose_name=_("user"), + blank=True, + null=True, + on_delete=models.CASCADE) def age(self): import datetime if self.birthday: - cnt = datetime.date.today().year-self.birthday.year + cnt = datetime.date.today().year - self.birthday.year return cnt def work_age(self): import datetime if self.birthday and self.workday: - cnt = datetime.date.today().year-self.workday.year + cnt = datetime.date.today().year - self.workday.year return cnt def __unicode__(self): - return u'%s %s'%(self.code,self.name) + return u'%s %s' % (self.code, self.name) age.short_description = u'年龄' work_age.short_description = u'工龄' @@ -510,7 +1027,7 @@ class Meta: verbose_name = _("employee") verbose_name_plural = _("employee") permissions = ( - ('view_all_employee',_("view all employee")), + ('view_all_employee', _("view all employee")), ) @@ -518,14 +1035,36 @@ class Family(generic.BO): """ 家庭成员 """ - relation = models.CharField(_("family title"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S025')) - status = models.CharField(_("social status"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S029'),default='17') - name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_60) - birthday = models.DateField(_("birthday"),blank=True,null=True) - organization = models.CharField(_("organization"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - phone = models.CharField(_("phone"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - emergency = models.BooleanField(_("emergency"),default=False) - employee = models.ForeignKey(Employee,verbose_name=_("employee"),on_delete=models.CASCADE) + relation = models.CharField( + _("family title"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S025')) + status = models.CharField( + _("social status"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S029'), + default='17') + name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_60) + birthday = models.DateField(_("birthday"), blank=True, null=True) + organization = models.CharField( + _("organization"), + max_length=const.DB_CHAR_NAME_120, + blank=True, + null=True) + phone = models.CharField( + _("phone"), + max_length=const.DB_CHAR_NAME_120, + blank=True, + null=True) + emergency = models.BooleanField(_("emergency"), default=False) + employee = models.ForeignKey( + Employee, + verbose_name=_("employee"), + on_delete=models.CASCADE) class Meta: verbose_name = _("family member") @@ -536,11 +1075,28 @@ class Education(generic.BO): """ 教育履历 """ - edu_type = models.CharField(_("edu type"),max_length=const.DB_CHAR_CODE_2,choices=const.get_value_list('S035'),default='1') - school = models.CharField(_("school"),max_length=const.DB_CHAR_NAME_120) - major = models.CharField(_("major"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - degree = models.CharField(_("major degree"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S037'),default='4') - employee = models.ForeignKey(Employee,verbose_name=_("employee"),on_delete=models.CASCADE) + edu_type = models.CharField( + _("edu type"), + max_length=const.DB_CHAR_CODE_2, + choices=const.get_value_list('S035'), + default='1') + school = models.CharField(_("school"), max_length=const.DB_CHAR_NAME_120) + major = models.CharField( + _("major"), + max_length=const.DB_CHAR_NAME_120, + blank=True, + null=True) + degree = models.CharField( + _("major degree"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=const.get_value_list('S037'), + default='4') + employee = models.ForeignKey( + Employee, + verbose_name=_("employee"), + on_delete=models.CASCADE) class Meta: verbose_name = _("education experience") @@ -551,9 +1107,16 @@ class WorkExperience(generic.BO): """ 工作履历 """ - organization = models.CharField(_("organization"),max_length=const.DB_CHAR_NAME_120) - position = models.CharField(_("position"),max_length=const.DB_CHAR_NAME_120) - employee = models.ForeignKey(Employee,verbose_name=_("employee"),on_delete=models.CASCADE) + organization = models.CharField( + _("organization"), + max_length=const.DB_CHAR_NAME_120) + position = models.CharField( + _("position"), + max_length=const.DB_CHAR_NAME_120) + employee = models.ForeignKey( + Employee, + verbose_name=_("employee"), + on_delete=models.CASCADE) class Meta: verbose_name = _("work experience") @@ -568,32 +1131,56 @@ class DataImport(generic.BO): actions = {} STATUS = ( - ('0',_('NEW')), - ('1',_('EXECUTED')), + ('0', _('NEW')), + ('1', _('EXECUTED')), ) - imp_date = models.DateField(_('date'),blank=True,null=True,default=datetime.datetime.today) - title = models.CharField(_('title'),max_length=const.DB_CHAR_NAME_40) - description = models.TextField(_('description'),blank=True,null=True) - content_type = models.ForeignKey(ContentType,verbose_name=_("content type"),limit_choices_to={"app_label__in":['basedata','organ','auth']},on_delete=models.CASCADE) - attach = models.FileField(_('attach'),blank=True,null=True,upload_to='data') - is_clear = models.BooleanField(_('clear old data?'),default=0) - handler = models.CharField(_('handler class'),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) - status = models.CharField(_('status'),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) - - def action_import(self,request): + imp_date = models.DateField( + _('date'), + blank=True, + null=True, + default=datetime.datetime.today) + title = models.CharField(_('title'), max_length=const.DB_CHAR_NAME_40) + description = models.TextField(_('description'), blank=True, null=True) + content_type = models.ForeignKey( + ContentType, + verbose_name=_("content type"), + limit_choices_to={ + "app_label__in": [ + 'basedata', + 'organ', + 'auth']}, + on_delete=models.CASCADE) + attach = models.FileField( + _('attach'), + blank=True, + null=True, + upload_to='data') + is_clear = models.BooleanField(_('clear old data?'), default=0) + handler = models.CharField( + _('handler class'), + max_length=const.DB_CHAR_NAME_80, + blank=True, + null=True) + status = models.CharField( + _('status'), + max_length=const.DB_CHAR_CODE_2, + default='0', + choices=STATUS) + + def action_import(self, request): from django.db import transaction if self.attach: if self.handler: klass = ExcelManager().handlers.get(self.handler) with transaction.atomic(): - klass.handle(self,self.attach) + klass.handle(self, self.attach) self.status = 1 self.save() else: import xlrd import os from mis import settings - path = os.path.join(settings.MEDIA_ROOT,self.attach.name) + path = os.path.join(settings.MEDIA_ROOT, self.attach.name) workbook = xlrd.open_workbook(path) sheet = workbook.sheet_by_index(0) row_count = sheet.nrows @@ -614,9 +1201,9 @@ def action_import(self,request): for name in cols: index = cols.index(name) v = values[index] - if type(v) == str: + if isinstance(v, str): v = force_text(v.decode('gbk')) - params[name]=v + params[name] = v # print 'name is %s value is %s'%(name,v) try: params.pop('') @@ -637,25 +1224,58 @@ class Document(generic.BO): 文档管理 """ TP = ( - ('00',_('SYSTEM MANUAL')), - ('10',_('BUSINESS DOC')), + ('00', _('SYSTEM MANUAL')), + ('10', _('BUSINESS DOC')), ) STATUS = ( - ('0',_('draft')), - ('1',_('published')) + ('0', _('draft')), + ('1', _('published')) ) index_weight = 8 - code = models.CharField(_('code'),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - title = models.CharField(_('title'),max_length=const.DB_CHAR_NAME_120) - keywords = models.CharField(_('keywords'),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - description = models.TextField(_('description'),blank=True,null=True) - tp = models.CharField(_('type'),max_length=const.DB_CHAR_CODE_2,default='10',choices=TP) - business_domain = models.CharField(_("business domain"),max_length=const.DB_CHAR_CODE_4,choices=const.get_value_list('S045'),default='OT') - user = models.ForeignKey(User,verbose_name=_('user'),blank=True,null=True,on_delete=models.CASCADE) - status = models.CharField(_('status'),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) - pub_date = models.DateTimeField(_('publish date'),blank=True,null=True) - size = models.CharField(_('size'),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - attach = models.FileField(_('attach'),blank=True,null=True,upload_to='doc') + code = models.CharField( + _('code'), + max_length=const.DB_CHAR_NAME_20, + blank=True, + null=True) + title = models.CharField(_('title'), max_length=const.DB_CHAR_NAME_120) + keywords = models.CharField( + _('keywords'), + max_length=const.DB_CHAR_NAME_120, + blank=True, + null=True) + description = models.TextField(_('description'), blank=True, null=True) + tp = models.CharField( + _('type'), + max_length=const.DB_CHAR_CODE_2, + default='10', + choices=TP) + business_domain = models.CharField( + _("business domain"), + max_length=const.DB_CHAR_CODE_4, + choices=const.get_value_list('S045'), + default='OT') + user = models.ForeignKey( + User, + verbose_name=_('user'), + blank=True, + null=True, + on_delete=models.CASCADE) + status = models.CharField( + _('status'), + max_length=const.DB_CHAR_CODE_2, + default='0', + choices=STATUS) + pub_date = models.DateTimeField(_('publish date'), blank=True, null=True) + size = models.CharField( + _('size'), + max_length=const.DB_CHAR_NAME_20, + blank=True, + null=True) + attach = models.FileField( + _('attach'), + blank=True, + null=True, + upload_to='doc') class Meta: verbose_name = _("document") diff --git a/basedata/urls.py b/basedata/urls.py index 5a59f9f..0ae8fd7 100644 --- a/basedata/urls.py +++ b/basedata/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url,static +from django.conf.urls import include, url, static import basedata.views urlpatterns = [ diff --git a/basedata/views.py b/basedata/views.py index 80acbbe..74e6031 100644 --- a/basedata/views.py +++ b/basedata/views.py @@ -8,7 +8,7 @@ from django.utils.translation import ugettext_lazy as _ -def action_import(request,object_id): +def action_import(request, object_id): """ 数据导入操作 :param request: @@ -24,11 +24,13 @@ def action_import(request,object_id): obj.action_import(request) try: - messages.success(request,_('data import successfully')) + messages.success(request, _('data import successfully')) except Exception as e: - messages.error(request,e) + messages.error(request, e) - return HttpResponseRedirect("/admin/basedata/dataimport/%s"%(object_id)) + return HttpResponseRedirect( + "/admin/basedata/dataimport/%s" % + (object_id)) context = dict( site.each_context(request), @@ -39,4 +41,7 @@ def action_import(request,object_id): ) request.current_app = site.name - return TemplateResponse(request,'admin/invent/stockin/in_confirmation.html', context) + return TemplateResponse( + request, + 'admin/invent/stockin/in_confirmation.html', + context) diff --git a/common/const.py b/common/const.py index a1b11d3..958be2a 100644 --- a/common/const.py +++ b/common/const.py @@ -18,8 +18,8 @@ STATUS_ON_OFF = ( - (0,_('OFF')), - (0,_('ON')), + (0, _('OFF')), + (0, _('ON')), ) @@ -30,9 +30,9 @@ def get_value_list(group): if group: try: cursor = connection.cursor() - cursor.execute('SELECT code,name FROM basedata_valuelistitem WHERE group_code=%s AND status=1',[group]) + cursor.execute('SELECT code,name FROM basedata_valuelistitem WHERE group_code=%s AND status=1', [group]) rows = cursor.fetchall() - return tuple([(code,name) for code,name in rows]) + return tuple([(code, name) for code, name in rows]) except Exception as e: return None else: diff --git a/common/generic.py b/common/generic.py index d569a1f..ecc040f 100644 --- a/common/generic.py +++ b/common/generic.py @@ -7,11 +7,11 @@ import xlwt import re from django.db import models -from django.db import connection,transaction +from django.db import connection, transaction from django.db.models import fields from django.db.models.fields import related from django.contrib import admin -from django.http import HttpRequest,HttpResponse +from django.http import HttpRequest, HttpResponse from django.contrib.contenttypes.models import ContentType from django.utils.encoding import smart_str, force_text, force_str from django.utils.http import urlquote @@ -30,17 +30,18 @@ def update(sql, params=None): with transaction.atomic(): try: if params: - cursor.execute(sql,params) + cursor.execute(sql, params) else: cursor.execute(sql) except Exception as e: logging.error('', exc_info=e) + def get_app_model_info_from_request(request): """ """ - if request and isinstance(request,HttpRequest): + if request and isinstance(request, HttpRequest): import re pattern = re.compile(r"/(admin)/(\w+)/(\w+)/(\d+)") match = pattern.match(request.path) @@ -49,9 +50,9 @@ def get_app_model_info_from_request(request): app = match.group(2) model = match.group(3) oid = match.group(4) - ct = ContentType.objects.get(app_label=app,model=model) + ct = ContentType.objects.get(app_label=app, model=model) obj = ct.get_object_for_this_type(id=oid) - return {'app':app,'model':model,'id':oid,'obj':obj} + return {'app': app, 'model': model, 'id': oid, 'obj': obj} return None @@ -59,15 +60,17 @@ class MineBOManager(models.Manager): """ get the objects created by current login user """ + def get_query_set(self): - return super(MineBOManager,self).get_query_set().filter(creator=cuser.getuser()) + return super(MineBOManager, self).get_query_set().filter(creator=cuser.getuser()) class BOManager(models.Manager): """ """ + def get_query_set(self): - return super(BOManager,self).get_query_set() + return super(BOManager, self).get_query_set() class ToStringMixin(object): @@ -83,17 +86,17 @@ class BO(ToStringMixin, models.Model): """ All business object derive from this class """ - begin = models.DateField(_('begin date'),blank=True,null=True) - end = models.DateField(_('end date'),blank=True,null=True) - creator = models.CharField(_("creator"),blank=True,null=True,max_length=const.DB_CHAR_NAME_20) - modifier = models.CharField(_("modifier"),blank=True,null=True,max_length=const.DB_CHAR_NAME_20) - creation = models.DateTimeField(_('creation'),auto_now_add=True,blank=True,null=True) - modification = models.DateTimeField(_('modification'),auto_now=True,blank=True,null=True) + begin = models.DateField(_('begin date'), blank=True, null=True) + end = models.DateField(_('end date'), blank=True, null=True) + creator = models.CharField(_("creator"), blank=True, null=True, max_length=const.DB_CHAR_NAME_20) + modifier = models.CharField(_("modifier"), blank=True, null=True, max_length=const.DB_CHAR_NAME_20) + creation = models.DateTimeField(_('creation'), auto_now_add=True, blank=True, null=True) + modification = models.DateTimeField(_('modification'), auto_now=True, blank=True, null=True) # mine = MineBOManager() objects = models.Manager() def __unicode__(self): - display = getattr(self,'name',None) or getattr(self,'title',None) or getattr(self,'description',None) + display = getattr(self, 'name', None) or getattr(self, 'title', None) or getattr(self, 'description', None) if not display: display = ' ' return u'%s' % display @@ -110,7 +113,7 @@ class BOAdmin(admin.ModelAdmin): CODE_PREFIX = '9' extra_buttons = [] - exclude = ['creator','modifier','creation','modification','begin','end'] + exclude = ['creator', 'modifier', 'creation', 'modification', 'begin', 'end'] list_per_page = 18 actions = ['export_selected_data'] @@ -135,25 +138,25 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No # print app_info if app_info: try: - modal = ContentType.objects.get(app_label='workflow',model='modal') - workflow_modal = modal.get_object_for_this_type(app_name=app_info['app'],model_name=app_info['model']) + modal = ContentType.objects.get(app_label='workflow', model='modal') + workflow_modal = modal.get_object_for_this_type(app_name=app_info['app'], model_name=app_info['model']) has_workflow_modal = True # print workflow_modal.code - instance = ContentType.objects.get(app_label='workflow',model='instance') - workflow_instance = instance.get_object_for_this_type(modal=workflow_modal,object_id=app_info['id']) + instance = ContentType.objects.get(app_label='workflow', model='instance') + workflow_instance = instance.get_object_for_this_type(modal=workflow_modal, object_id=app_info['id']) has_workflow_instance = True - todo = ContentType.objects.get(app_label='workflow',model='todolist') - todo_list = todo.model_class().objects.filter(inst=workflow_instance,status=0,user=request.user) + todo = ContentType.objects.get(app_label='workflow', model='todolist') + todo_list = todo.model_class().objects.filter(inst=workflow_instance, status=0, user=request.user) x = todo_list.all() - if x and len(x)>0: + if x and len(x) > 0: can_edit = x[0].node.can_edit if todo_list.count() > 0: # print 'we fount it' unread = todo_list.filter(is_read=0) show_workflow_line = True if unread.count() > 0: - unread.update(is_read=1,read_time=datetime.datetime.now()) + unread.update(is_read=1, read_time=datetime.datetime.now()) if workflow_instance.status == 3 and request.user == workflow_instance.starter: can_restart = True show_workflow_line = True @@ -165,23 +168,23 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No show_submit_button = True extra_context = extra_context or {} ctx = dict( - has_workflow_instance = has_workflow_instance, - has_workflow_modal = has_workflow_modal, - workflow_modal = workflow_modal, - workflow_instance = workflow_instance, - show_workflow_line = show_workflow_line, - can_restart = can_restart, - can_edit = can_edit, - show_submit_button = show_submit_button, + has_workflow_instance=has_workflow_instance, + has_workflow_modal=has_workflow_modal, + workflow_modal=workflow_modal, + workflow_instance=workflow_instance, + show_workflow_line=show_workflow_line, + can_restart=can_restart, + can_edit=can_edit, + show_submit_button=show_submit_button, ) if len(self.extra_buttons) > 0: buttons = dict( - extra_buttons = self.extra_buttons + extra_buttons=self.extra_buttons ) ctx.update(buttons) extra_context.update(ctx) # print extra_context - return super(BOAdmin,self).changeform_view(request,object_id,form_url,extra_context) + return super(BOAdmin, self).changeform_view(request, object_id, form_url, extra_context) def history_view(self, request, object_id, extra_context=None): """ @@ -195,61 +198,61 @@ def history_view(self, request, object_id, extra_context=None): # print app_info if app_info: try: - modal = ContentType.objects.get(app_label='workflow',model='modal') - workflow_modal = modal.get_object_for_this_type(app_name=app_info['app'],model_name=app_info['model']) + modal = ContentType.objects.get(app_label='workflow', model='modal') + workflow_modal = modal.get_object_for_this_type(app_name=app_info['app'], model_name=app_info['model']) has_workflow_modal = True - instance = ContentType.objects.get(app_label='workflow',model='instance') - workflow_instance = instance.get_object_for_this_type(modal=workflow_modal,object_id=app_info['id']) + instance = ContentType.objects.get(app_label='workflow', model='instance') + workflow_instance = instance.get_object_for_this_type(modal=workflow_modal, object_id=app_info['id']) has_workflow_instance = True - history = ContentType.objects.get(app_label='workflow',model='history') + history = ContentType.objects.get(app_label='workflow', model='history') history_list = history.model_class().objects.filter(inst=workflow_instance) has_history = True - todo = ContentType.objects.get(app_label='workflow',model='todolist') - todo_list = todo.model_class().objects.filter(inst=workflow_instance,status=0).exclude(node=None) + todo = ContentType.objects.get(app_label='workflow', model='todolist') + todo_list = todo.model_class().objects.filter(inst=workflow_instance, status=0).exclude(node=None) extra_context = extra_context or {} ctx = dict( - has_workflow_instance = has_workflow_instance, - has_workflow_modal = has_workflow_modal, - workflow_modal = workflow_modal, - workflow_instance = workflow_instance, - history_list = history_list, - has_history = has_history, - todo_list = todo_list, + has_workflow_instance=has_workflow_instance, + has_workflow_modal=has_workflow_modal, + workflow_modal=workflow_modal, + workflow_instance=workflow_instance, + history_list=history_list, + has_history=has_history, + todo_list=todo_list, ) # print history_list extra_context.update(ctx) except Exception: pass - return super(BOAdmin,self).history_view(request,object_id,extra_context) + return super(BOAdmin, self).history_view(request, object_id, extra_context) def get_changeform_initial_data(self, request): import datetime - return {'begin':datetime.date.today,'end':datetime.date(9999,12,31)} + return {'begin': datetime.date.today, 'end': datetime.date(9999, 12, 31)} def save_model(self, request, obj, form, change): if change: - setattr(obj,'modifier',request.user.username) + setattr(obj, 'modifier', request.user.username) else: - setattr(obj,'creator',request.user.username) - setattr(obj,'begin',datetime.date.today()) - setattr(obj,'end',datetime.date(9999,12,31)) + setattr(obj, 'creator', request.user.username) + setattr(obj, 'begin', datetime.date.today()) + setattr(obj, 'end', datetime.date(9999, 12, 31)) try: - setattr(obj,'user',request.user) + setattr(obj, 'user', request.user) except Exception: pass - super(BOAdmin,self).save_model(request,obj,form,change) + super(BOAdmin, self).save_model(request, obj, form, change) # print '=========it is here=========' try: - code = getattr(obj,'code') + code = getattr(obj, 'code') # print code if code is None or len(code) == 0: - fmt = '%s%0'+str(self.CODE_NUMBER_WIDTH)+'d' - code = fmt % (self.CODE_PREFIX,obj.id) + fmt = '%s%0' + str(self.CODE_NUMBER_WIDTH) + 'd' + code = fmt % (self.CODE_PREFIX, obj.id) table = obj._meta.db_table - sql = 'update %s set code = \'%s\' where id=%s' % (table,code,obj.id) + sql = 'update %s set code = \'%s\' where id=%s' % (table, code, obj.id) update(sql) except Exception: pass @@ -257,13 +260,13 @@ def save_model(self, request, obj, form, change): # def response_change(self, request, obj): # return HttpResponseRedirect('') - def export_selected_data(self,request,queryset): + def export_selected_data(self, request, queryset): ops = self.model._meta workbook = xlwt.Workbook(encoding='utf-8') dd = datetime.date.today().strftime('%Y%m%d') - file_name = force_text(ops.verbose_name+dd) + file_name = force_text(ops.verbose_name + dd) sheet = workbook.add_sheet(force_text(ops.verbose_name)) - obj_fields = getattr(self,'export_fields',None) or self.list_display or self.fields + obj_fields = getattr(self, 'export_fields', None) or self.list_display or self.fields head_col_index = 0 for field in obj_fields: @@ -272,11 +275,11 @@ def export_selected_data(self,request,queryset): f = ops.get_field(field) col_name = f.verbose_name except Exception: - f = getattr(self.model,field) - if hasattr(f,'short_description'): + f = getattr(self.model, field) + if hasattr(f, 'short_description'): col_name = f.short_description - sheet.write(0,head_col_index,force_text(col_name)) - head_col_index+=1 + sheet.write(0, head_col_index, force_text(col_name)) + head_col_index += 1 row_index = 1 for obj in queryset: col_index = 0 @@ -286,35 +289,35 @@ def export_selected_data(self,request,queryset): f = ops.get_field(field) except Exception: pass - v = getattr(obj,field,'') - if hasattr(v,'__call__') or callable(v): + v = getattr(obj, field, '') + if hasattr(v, '__call__') or callable(v): v = v() - elif type(f) == fields.DateField: + elif isinstance(f, fields.DateField): v = v.strftime('%Y-%m-%d') - elif type(f) == fields.DateTimeField: + elif isinstance(f, fields.DateTimeField): v = v.strftime('%Y-%m-%d %H:%M') - elif type(f) == fields.CharField and f.choices: - fc = 'get_'+field+'_display' - v = getattr(obj,fc)() - elif type(f) == related.ForeignKey: + elif isinstance(f, fields.CharField) and f.choices: + fc = 'get_' + field + '_display' + v = getattr(obj, fc)() + elif isinstance(f, related.ForeignKey): v = str(v) - sheet.write(row_index,col_index,v) + sheet.write(row_index, col_index, v) col_index += 1 row_index += 1 response = HttpResponse(content_type='application/vnd.ms-excel') agent = request.META.get('HTTP_USER_AGENT') nn = smart_str(file_name) - if agent and re.search('MSIE',agent): + if agent and re.search('MSIE', agent): nn = urlquote(file_name) - response['Content-Disposition'] = 'attachment; filename=%s.xls'%nn + response['Content-Disposition'] = 'attachment; filename=%s.xls' % nn workbook.save(response) return response - #self.message_user(request,'SUCCESS') + # self.message_user(request,'SUCCESS') export_selected_data.short_description = _("export selected %(verbose_name_plural)s") class Meta: ordering = ['-creation'] class Media: - css = {'all':('css/maximus.css',)} + css = {'all': ('css/maximus.css',)} js = ('js/maximus.js',) diff --git a/hr/admin.py b/hr/admin.py index af662e2..392f27d 100644 --- a/hr/admin.py +++ b/hr/admin.py @@ -3,12 +3,12 @@ from django.utils.translation import ugettext_lazy as _ from common import generic from common import const -from hr.models import Entry,SalaryItem,EmployeeSalaryItem +from hr.models import Entry, SalaryItem, EmployeeSalaryItem class SalaryItemAdmin(admin.ModelAdmin): - list_display = ['code','classification','name','plus_or_minus','required'] - list_display_links = ['code','name'] + list_display = ['code', 'classification', 'name', 'plus_or_minus', 'required'] + list_display_links = ['code', 'name'] list_per_page = 20 @@ -20,7 +20,7 @@ def formfield_for_foreignkey(self, db_field, request=None, **kwargs): if db_field.name == 'salary_item': kwargs['queryset'] = SalaryItem.objects.filter(required=1) - return super(EmployeeSalaryItemInline,self).formfield_for_foreignkey(db_field,request,**kwargs) + return super(EmployeeSalaryItemInline, self).formfield_for_foreignkey(db_field, request, **kwargs) def get_extra(self, request, obj=None, **kwargs): if obj: @@ -30,18 +30,21 @@ def get_extra(self, request, obj=None, **kwargs): class EntryAdmin(generic.BOAdmin): - list_display = ['code','name','gender','position','rank','probation_months','probation_end'] + list_display = ['code', 'name', 'gender', 'position', 'rank', 'probation_months', 'probation_end'] inlines = [EmployeeSalaryItemInline] fieldsets = [ - (None,{'fields':[('code','position',),('name','pinyin',),('address','zipcode',),('idcard','phone',),('memo',),('profile',)]}), - (_('org distribute'),{'fields':[('guider',),('rank','ygxs',),('category','probation_months',),('probation_begin','probation_end',)],'classes': ['collapse']}) - ] - raw_id_fields = ['position','guider'] + (None, { + 'fields': [ + ('code', 'position',), ('name', 'pinyin',), ('address', 'zipcode',), ('idcard', 'phone',), ('memo',), ('profile',)]}), (_('org distribute'), { + 'fields': [ + ('guider',), ('rank', 'ygxs',), ('category', 'probation_months',), ('probation_begin', 'probation_end',)], 'classes': ['collapse']})] + raw_id_fields = ['position', 'guider'] + def get_changeform_initial_data(self, request): import datetime - end = datetime.date.today()+datetime.timedelta(90) - return {'probation_end':end} + end = datetime.date.today() + datetime.timedelta(90) + return {'probation_end': end} -admin.site.register(SalaryItem,SalaryItemAdmin) -admin.site.register(Entry,EntryAdmin) \ No newline at end of file +admin.site.register(SalaryItem, SalaryItemAdmin) +admin.site.register(Entry, EntryAdmin) diff --git a/hr/apps.py b/hr/apps.py index 5325f71..2dc863e 100644 --- a/hr/apps.py +++ b/hr/apps.py @@ -1,4 +1,4 @@ -# created at 15-5-23 +# created at 15-5-23 # coding=utf-8 __author__ = 'zhugl' diff --git a/hr/models.py b/hr/models.py index b62edd0..20281b9 100644 --- a/hr/models.py +++ b/hr/models.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from common import generic from common import const -from basedata.models import Position,Employee +from basedata.models import Position, Employee from common.generic import ToStringMixin from organ.models import OrgUnit import datetime @@ -13,7 +13,7 @@ class SalaryItemHandler: code = None - def __init__(self,employee): + def __init__(self, employee): self.employee = employee def value(self): @@ -32,16 +32,24 @@ def add_formula(cls, code, handler): @classmethod def get_formula(cls): - return SalaryItem.formulas.get(cls.code,None) - - code = models.CharField(_("code"),max_length=const.DB_CHAR_CODE_10,null=True) - name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_120) - classification = models.CharField(_("classification"),max_length=const.DB_CHAR_CODE_2,choices=const.get_value_list('S048'),default='10') - plus_or_minus = models.CharField(_("plus or minus"),max_length=const.DB_CHAR_CODE_2,choices=const.get_value_list('S049'),default='+') - required = models.BooleanField(_("is required"),default=0) + return SalaryItem.formulas.get(cls.code, None) + + code = models.CharField(_("code"), max_length=const.DB_CHAR_CODE_10, null=True) + name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_120) + classification = models.CharField( + _("classification"), + max_length=const.DB_CHAR_CODE_2, + choices=const.get_value_list('S048'), + default='10') + plus_or_minus = models.CharField( + _("plus or minus"), + max_length=const.DB_CHAR_CODE_2, + choices=const.get_value_list('S049'), + default='+') + required = models.BooleanField(_("is required"), default=0) def __unicode__(self): - return "%s %s" % (self.code,self.name) + return "%s %s" % (self.code, self.name) class Meta: verbose_name = _('salary item') @@ -53,34 +61,40 @@ class Entry(generic.BO): """ 人员入职 """ - code = models.CharField(_("employee number"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - name = models.CharField(_("employee name"),max_length=const.DB_CHAR_NAME_120) - pinyin = models.CharField(_("pinyin"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - birthday = models.DateField(_("birthday"),blank=True,null=True) - gender = models.CharField(_("gender"),max_length=const.DB_CHAR_CODE_2,choices=const.get_value_list('gender'),default='1') - idcard = models.CharField(_("id card"),max_length=const.DB_CHAR_NAME_20) - address = models.CharField(_("mail address"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - zipcode = models.CharField(_("zipcode"),max_length=const.DB_CHAR_CODE_8) - phone = models.CharField(_("phone"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - - guider = models.ForeignKey(Employee,verbose_name=_("guider"),on_delete=models.CASCADE) - position = models.ForeignKey(Position,verbose_name = _('designate position'),on_delete=models.CASCADE) - rank = models.CharField(_("employee rank"),max_length=const.DB_CHAR_CODE_2,default='00',choices=const.get_value_list('S017')) - ygxs = models.CharField(_("employ ygxs"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S019'),default='2') - category = models.CharField(_("employ category"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=const.get_value_list('S018'),default='21') - - probation_months = models.CharField(_("probation months"),max_length=2,default='3',choices=const.get_value_list('S047')) - probation_begin = models.DateField(_("probation begin"),default=datetime.date.today) - probation_end = models.DateField(_("probation end"),blank=True,null=True) - - memo = models.TextField(_("memo"),blank=True,null=True) - profile = models.FileField(_("profile"),blank=True,null=True,upload_to='hr profile') + code = models.CharField(_("employee number"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + name = models.CharField(_("employee name"), max_length=const.DB_CHAR_NAME_120) + pinyin = models.CharField(_("pinyin"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + birthday = models.DateField(_("birthday"), blank=True, null=True) + gender = models.CharField(_("gender"), max_length=const.DB_CHAR_CODE_2, choices=const.get_value_list('gender'), default='1') + idcard = models.CharField(_("id card"), max_length=const.DB_CHAR_NAME_20) + address = models.CharField(_("mail address"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + zipcode = models.CharField(_("zipcode"), max_length=const.DB_CHAR_CODE_8) + phone = models.CharField(_("phone"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + + guider = models.ForeignKey(Employee, verbose_name=_("guider"), on_delete=models.CASCADE) + position = models.ForeignKey(Position, verbose_name=_('designate position'), on_delete=models.CASCADE) + rank = models.CharField( + _("employee rank"), + max_length=const.DB_CHAR_CODE_2, + default='00', + choices=const.get_value_list('S017')) + ygxs = models.CharField(_("employ ygxs"), max_length=const.DB_CHAR_CODE_2, blank=True, + null=True, choices=const.get_value_list('S019'), default='2') + category = models.CharField(_("employ category"), max_length=const.DB_CHAR_CODE_2, blank=True, + null=True, choices=const.get_value_list('S018'), default='21') + + probation_months = models.CharField(_("probation months"), max_length=2, default='3', choices=const.get_value_list('S047')) + probation_begin = models.DateField(_("probation begin"), default=datetime.date.today) + probation_end = models.DateField(_("probation end"), blank=True, null=True) + + memo = models.TextField(_("memo"), blank=True, null=True) + profile = models.FileField(_("profile"), blank=True, null=True, upload_to='hr profile') class Meta: verbose_name = _("employee entry") verbose_name_plural = _("employee entries") permissions = ( - ('modify_salary_item',_("modify salary item")), + ('modify_salary_item', _("modify salary item")), ) @@ -88,14 +102,18 @@ class EmployeeSalaryItem(models.Model): """ """ - entry = models.ForeignKey(Entry,verbose_name=_("employee entry"),on_delete=models.CASCADE) - employee = models.ForeignKey(Employee,verbose_name=_("employee"),blank=True,null=True,on_delete=models.CASCADE) - salary_item = models.ForeignKey(SalaryItem,verbose_name=_("salary item"),on_delete=models.CASCADE) - calculate_way = models.CharField(_("calculate way"),max_length=const.DB_CHAR_CODE_2,choices=const.get_value_list('S050'),default='10') - fixed_value = models.DecimalField(_("fixed value"),blank=True,null=True,max_digits=10,decimal_places=2) - base_value = models.DecimalField(_("base value"),blank=True,null=True,max_digits=10,decimal_places=2) - org_percent = models.DecimalField(_("org percent"),blank=True,null=True,max_digits=4,decimal_places=2) - employee_percent = models.DecimalField(_("employee percent"),blank=True,null=True,max_digits=4,decimal_places=2) + entry = models.ForeignKey(Entry, verbose_name=_("employee entry"), on_delete=models.CASCADE) + employee = models.ForeignKey(Employee, verbose_name=_("employee"), blank=True, null=True, on_delete=models.CASCADE) + salary_item = models.ForeignKey(SalaryItem, verbose_name=_("salary item"), on_delete=models.CASCADE) + calculate_way = models.CharField( + _("calculate way"), + max_length=const.DB_CHAR_CODE_2, + choices=const.get_value_list('S050'), + default='10') + fixed_value = models.DecimalField(_("fixed value"), blank=True, null=True, max_digits=10, decimal_places=2) + base_value = models.DecimalField(_("base value"), blank=True, null=True, max_digits=10, decimal_places=2) + org_percent = models.DecimalField(_("org percent"), blank=True, null=True, max_digits=4, decimal_places=2) + employee_percent = models.DecimalField(_("employee percent"), blank=True, null=True, max_digits=4, decimal_places=2) class Meta: verbose_name = _("salary item") @@ -107,7 +125,7 @@ class Transfer(generic.BO): """ 人员调动 """ - employee = models.ForeignKey(Employee,verbose_name=_("employee"),on_delete=models.CASCADE) + employee = models.ForeignKey(Employee, verbose_name=_("employee"), on_delete=models.CASCADE) class Meta: verbose_name = _("employee transfer") @@ -118,9 +136,8 @@ class Departure(generic.BO): """ 人员离职 """ - employee = models.ForeignKey(Employee,verbose_name=_("employee"),on_delete=models.CASCADE) + employee = models.ForeignKey(Employee, verbose_name=_("employee"), on_delete=models.CASCADE) class Meta: verbose_name = _("employee departure") verbose_name_plural = _("employee departures") - diff --git a/invent/admin.py b/invent/admin.py index e5601de..68a55ea 100644 --- a/invent/admin.py +++ b/invent/admin.py @@ -2,8 +2,8 @@ from django.utils.translation import ugettext_lazy as _ from common import generic from basedata.models import Material -from invent.models import StockIn,StockOut,InitialInventory,InItem,OutItem,InitItem,Inventory,InItemForm,InOutDetail,\ - WareReturn,ReturnItem,WareAdjust,AdjustItem +from invent.models import StockIn, StockOut, InitialInventory, InItem, OutItem, InitItem, Inventory, InItemForm, InOutDetail,\ + WareReturn, ReturnItem, WareAdjust, AdjustItem class InItemInline(admin.TabularInline): @@ -27,12 +27,12 @@ def get_readonly_fields(self, request, obj=None): def formfield_for_foreignkey(self, db_field, request=None, **kwargs): if db_field.name == 'material': kwargs['queryset'] = Material.objects.filter(is_virtual=0) - return super(InItemInline,self).formfield_for_foreignkey(db_field,request,**kwargs) + return super(InItemInline, self).formfield_for_foreignkey(db_field, request, **kwargs) class OutItemInline(admin.TabularInline): model = OutItem - fields = ('inventory', 'measure', 'cnt', 'price','warehouse',) + fields = ('inventory', 'measure', 'cnt', 'price', 'warehouse',) raw_id_fields = ['inventory'] readonly_fields = ['measure', 'price', 'warehouse'] @@ -63,42 +63,51 @@ def get_extra(self, request, obj=None, **kwargs): def formfield_for_foreignkey(self, db_field, request=None, **kwargs): if db_field.name == 'material': kwargs['queryset'] = Material.objects.filter(is_virtual=0) - return super(InitItemInline,self).formfield_for_foreignkey(db_field,request,**kwargs) + return super(InitItemInline, self).formfield_for_foreignkey(db_field, request, **kwargs) class StockInAdmin(generic.BOAdmin): CODE_PREFIX = 'RK' CODE_NUMBER_WIDTH = 5 - list_display = ['code','title','money_of_amount','status','entry_time'] + list_display = ['code', 'title', 'money_of_amount', 'status', 'entry_time'] inlines = [InItemInline] raw_id_fields = ['po'] fields = ( - ('code',),('title',),('po',),('warehouse',),('batch',),('status','amount',) + ('code',), ('title',), ('po',), ('warehouse',), ('batch',), ('status', 'amount',) ) date_hierarchy = 'begin' - extra_buttons = [{'href':'cin','title':_('Action Stock In')}] + extra_buttons = [{'href': 'cin', 'title': _('Action Stock In')}] def save_model(self, request, obj, form, change): import decimal - super(StockInAdmin,self).save_model(request,obj,form,change) + super(StockInAdmin, self).save_model(request, obj, form, change) if obj and obj.po: po_items = obj.po.poitem_set.filter(left_cnt__gt=0).all() for item in po_items: try: - InItem.objects.get(po_item=item,master=obj) + InItem.objects.get(po_item=item, master=obj) continue except Exception as e: pp = item.discount_price or item.price if decimal.Decimal(item.tax) > decimal.Decimal(0): - pp = pp /(decimal.Decimal(1)+decimal.Decimal(item.tax)) - InItem.objects.create(warehouse=obj.warehouse,material=item.material,measure=item.measure,prop='+', - po_item=item,master=obj,cnt=item.left_cnt,price=pp,batch=obj.batch,source=obj.code) + pp = pp / (decimal.Decimal(1) + decimal.Decimal(item.tax)) + InItem.objects.create( + warehouse=obj.warehouse, + material=item.material, + measure=item.measure, + prop='+', + po_item=item, + master=obj, + cnt=item.left_cnt, + price=pp, + batch=obj.batch, + source=obj.code) def get_readonly_fields(self, request, obj=None): if obj and obj.status == 9: - return ['code','title','po','warehouse','batch','status'] + return ['code', 'title', 'po', 'warehouse', 'batch', 'status'] else: - return ['status','amount'] + return ['status', 'amount'] def changeform_view(self, request, object_id=None, form_url='', extra_context=None): extra_context = extra_context or {} @@ -106,24 +115,24 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No obj = StockIn.objects.get(id=object_id) if obj and obj.execute_time: extra_context.update(dict(readonly=True)) - return super(StockInAdmin,self).changeform_view(request,object_id,form_url,extra_context) + return super(StockInAdmin, self).changeform_view(request, object_id, form_url, extra_context) class StockOutAdmin(generic.BOAdmin): CODE_PREFIX = 'CK' CODE_NUMBER_WIDTH = 5 - list_display = ['code','title','project','status','out_time','out_amount'] - list_display_links = ['code','title'] + list_display = ['code', 'title', 'project', 'status', 'out_time', 'out_amount'] + list_display_links = ['code', 'title'] date_hierarchy = 'begin' inlines = [OutItemInline] - raw_id_fields = ['project','wo','user'] + raw_id_fields = ['project', 'wo', 'user'] fields = ( - ('code', 'status',),('project', ),('wo','user'), - ('title','amount',),('description',), + ('code', 'status',), ('project', ), ('wo', 'user'), + ('title', 'amount',), ('description',), ) readonly_fields = ['status'] - extra_buttons = [{'href':'out','title':_('Action Stock Out')}] - search_fields = ['code','title','user__username'] + extra_buttons = [{'href': 'out', 'title': _('Action Stock Out')}] + search_fields = ['code', 'title', 'user__username'] def changeform_view(self, request, object_id=None, form_url='', extra_context=None): extra_context = extra_context or {} @@ -131,22 +140,22 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No obj = StockOut.objects.get(id=object_id) if obj and obj.execute_time: extra_context.update(dict(readonly=True)) - return super(StockOutAdmin,self).changeform_view(request,object_id,form_url,extra_context) + return super(StockOutAdmin, self).changeform_view(request, object_id, form_url, extra_context) def save_model(self, request, obj, form, change): if obj and obj.user is None: obj.user = request.user - super(StockOutAdmin,self).save_model(request,obj,form,change) + super(StockOutAdmin, self).save_model(request, obj, form, change) class InitialInventoryAdmin(generic.BOAdmin): CODE_PREFIX = 'QC' CODE_NUMBER_WIDTH = 3 - list_display = ['code','title','status'] + list_display = ['code', 'title', 'status'] inlines = [InitItemInline] - fields = ('code','title','org','status','amount','attach') - readonly_fields = ['status','amount'] - extra_buttons = [{'href':'cin','title':_('Action Stock In')}] + fields = ('code', 'title', 'org', 'status', 'amount', 'attach') + readonly_fields = ['status', 'amount'] + extra_buttons = [{'href': 'cin', 'title': _('Action Stock In')}] def changeform_view(self, request, object_id=None, form_url='', extra_context=None): extra_context = extra_context or {} @@ -154,12 +163,12 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No obj = InitialInventory.objects.get(id=object_id) if obj and obj.execute_time: extra_context.update(dict(readonly=True)) - return super(InitialInventoryAdmin,self).changeform_view(request,object_id,form_url,extra_context) + return super(InitialInventoryAdmin, self).changeform_view(request, object_id, form_url, extra_context) class InventoryAdmin(generic.BOAdmin): - list_display = ['material','measure','warehouse','cnt','price'] - search_fields = ['material__name','material__code'] + list_display = ['material', 'measure', 'warehouse', 'cnt', 'price'] + search_fields = ['material__name', 'material__code'] def changeform_view(self, request, object_id=None, form_url='', extra_context=None): extra_context = extra_context or {} @@ -168,16 +177,16 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No inventory = Inventory.objects.get(id=object_id) material = inventory.material warehouse = inventory.warehouse - detail = InOutDetail.objects.filter(material=material,warehouse=warehouse) + detail = InOutDetail.objects.filter(material=material, warehouse=warehouse) extra_context.update(dict(detail=detail)) - return super(InventoryAdmin,self).changeform_view(request,object_id,form_url,extra_context) + return super(InventoryAdmin, self).changeform_view(request, object_id, form_url, extra_context) class ReturnItemInline(admin.TabularInline): model = ReturnItem - fields = ['material','measure','warehouse','out_cnt','cnt'] - readonly_fields = ['material','measure','warehouse','out_cnt'] + fields = ['material', 'measure', 'warehouse', 'out_cnt', 'cnt'] + readonly_fields = ['material', 'measure', 'warehouse', 'out_cnt'] extra = 0 @@ -187,28 +196,28 @@ class WareReturnAdmin(generic.BOAdmin): """ CODE_PREFIX = 'FK' CODE_NUMBER_WIDTH = 4 - list_display = ['code','title','out'] + list_display = ['code', 'title', 'out'] fields = ( - ('code',),('title',),('out',),('amount',),('status',) + ('code',), ('title',), ('out',), ('amount',), ('status',) ) readonly_fields = ['status'] raw_id_fields = ['out'] inlines = [ReturnItemInline] - extra_buttons = [{'href':'cin','title':_('Action Ware Return')}] + extra_buttons = [{'href': 'cin', 'title': _('Action Ware Return')}] def changeform_view(self, request, object_id=None, form_url='', extra_context=None): - if object_id : + if object_id: obj = WareReturn.objects.get(id=object_id) if obj.status == '9': extra_context = extra_context or {} extra_context.update(dict(readonly=True)) - return super(WareReturnAdmin,self).changeform_view(request,object_id,form_url,extra_context) + return super(WareReturnAdmin, self).changeform_view(request, object_id, form_url, extra_context) class AdjustItemInline(admin.TabularInline): model = AdjustItem - fields = ['inventory','measure','warehouse','prop','cnt'] - readonly_fields = ['measure','warehouse'] + fields = ['inventory', 'measure', 'warehouse', 'prop', 'cnt'] + readonly_fields = ['measure', 'warehouse'] raw_id_fields = ['inventory'] def get_extra(self, request, obj=None, **kwargs): @@ -221,13 +230,13 @@ def get_extra(self, request, obj=None, **kwargs): class WareAdjustAdmin(generic.BOAdmin): CODE_PREFIX = 'TZ' CODE_NUMBER_WIDTH = 3 - list_display = ['code','title','status'] + list_display = ['code', 'title', 'status'] fields = ( - ('code',),('title',),('description',),('status',) + ('code',), ('title',), ('description',), ('status',) ) readonly_fields = ['status'] inlines = [AdjustItemInline] - extra_buttons = [{'href':'adjust','title':_('Action Ware Adjust')}] + extra_buttons = [{'href': 'adjust', 'title': _('Action Ware Adjust')}] date_hierarchy = 'begin' def changeform_view(self, request, object_id=None, form_url='', extra_context=None): @@ -236,12 +245,12 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No if obj and obj.status == '9': extra_context = extra_context or {} extra_context.update(dict(readonly=True)) - return super(WareAdjustAdmin,self).changeform_view(request,object_id,form_url,extra_context) + return super(WareAdjustAdmin, self).changeform_view(request, object_id, form_url, extra_context) -admin.site.register(StockIn,StockInAdmin) -admin.site.register(StockOut,StockOutAdmin) -admin.site.register(InitialInventory,InitialInventoryAdmin) -admin.site.register(Inventory,InventoryAdmin) -admin.site.register(WareReturn,WareReturnAdmin) -admin.site.register(WareAdjust,WareAdjustAdmin) +admin.site.register(StockIn, StockInAdmin) +admin.site.register(StockOut, StockOutAdmin) +admin.site.register(InitialInventory, InitialInventoryAdmin) +admin.site.register(Inventory, InventoryAdmin) +admin.site.register(WareReturn, WareReturnAdmin) +admin.site.register(WareAdjust, WareAdjustAdmin) diff --git a/invent/apps.py b/invent/apps.py index 25d842a..44231e5 100644 --- a/invent/apps.py +++ b/invent/apps.py @@ -1,4 +1,4 @@ -# created at 15-5-23 +# created at 15-5-23 # coding=utf-8 __author__ = 'zhugl' diff --git a/invent/models.py b/invent/models.py index b95d40b..464da9d 100644 --- a/invent/models.py +++ b/invent/models.py @@ -12,9 +12,9 @@ from django.utils.translation import ugettext_lazy as _ from common import generic from common import const -from basedata.models import Material,Warehouse,Measure,Organization,Project +from basedata.models import Material, Warehouse, Measure, Organization, Project from selfhelp.models import WorkOrder -from purchase.models import PurchaseOrder,POItem +from purchase.models import PurchaseOrder, POItem class Inventory(generic.BO): @@ -22,17 +22,17 @@ class Inventory(generic.BO): 库存信息 """ index_weight = 1 - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) - warehouse = models.ForeignKey(Warehouse,verbose_name=_("warehouse"),on_delete=models.CASCADE) - material = models.ForeignKey(Material,verbose_name=_("material"),on_delete=models.CASCADE) - measure = models.ForeignKey(Measure,verbose_name=_("measure"),on_delete=models.CASCADE) - cnt = models.DecimalField(_("count"),max_digits=14,decimal_places=4) - batch = models.CharField(_("batch"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - price = models.DecimalField(_("price"),max_digits=14,decimal_places=4) + org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + warehouse = models.ForeignKey(Warehouse, verbose_name=_("warehouse"), on_delete=models.CASCADE) + material = models.ForeignKey(Material, verbose_name=_("material"), on_delete=models.CASCADE) + measure = models.ForeignKey(Measure, verbose_name=_("measure"), on_delete=models.CASCADE) + cnt = models.DecimalField(_("count"), max_digits=14, decimal_places=4) + batch = models.CharField(_("batch"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + price = models.DecimalField(_("price"), max_digits=14, decimal_places=4) def __unicode__(self): des = self.material.spec or '' - return u'%s %s %s' % (self.material.code,self.material.name,des) + return u'%s %s %s' % (self.material.code, self.material.name, des) class Meta: verbose_name = _("Inventory") @@ -49,27 +49,27 @@ class InitialInventory(generic.BO): ('9', _("EXECUTED")) ) index_weight = 9 - code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) - title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) - user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) - status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) - execute_time = models.DateTimeField(_("execute time"),blank=True,null=True) - attach = models.FileField(_('attach'),blank=True,null=True,upload_to='inventory',help_text=u'参考FD0002模板文档') - amount = models.DecimalField(_('money of amount'),max_digits=14,decimal_places=4,blank=True,null=True) + code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + user = models.ForeignKey(User, verbose_name=_("user"), blank=True, null=True, on_delete=models.CASCADE) + status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) + execute_time = models.DateTimeField(_("execute time"), blank=True, null=True) + attach = models.FileField(_('attach'), blank=True, null=True, upload_to='inventory', help_text=u'参考FD0002模板文档') + amount = models.DecimalField(_('money of amount'), max_digits=14, decimal_places=4, blank=True, null=True) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): - super(InitialInventory,self).save(force_insert,force_update,using,update_fields) + super(InitialInventory, self).save(force_insert, force_update, using, update_fields) count = InitItem.objects.filter(master=self).count() if self.attach and count == 0: - path = os.path.join(settings.MEDIA_ROOT,self.attach.name) - reader = csv.reader(open(path,'r')) + path = os.path.join(settings.MEDIA_ROOT, self.attach.name) + reader = csv.reader(open(path, 'r')) index = 0 with transaction.atomic(): - for code,name,description,unit_code,unit_name,warehouse_code,warehouse_name,price,cnt in reader: - index+=1 + for code, name, description, unit_code, unit_name, warehouse_code, warehouse_name, price, cnt in reader: + index += 1 if index == 1: continue @@ -80,22 +80,26 @@ def save(self, force_insert=False, force_update=False, using=None, try: measure = Measure.objects.get(code=unit_code) except Exception: - measure = Measure.objects.create(code=unit_code,name=force_text(unit_name.decode('gbk'))) + measure = Measure.objects.create(code=unit_code, name=force_text(unit_name.decode('gbk'))) try: house = Warehouse.objects.get(code=warehouse_code) except Exception: - house = Warehouse.objects.create(code=warehouse_code,name=force_text(warehouse_name.decode('gbk'))) + house = Warehouse.objects.create(code=warehouse_code, name=force_text(warehouse_name.decode('gbk'))) try: material = Material.objects.get(code=code) except Exception: - material = Material(code=code,name=force_text(name.decode('gbk')),spec=force_text(description.decode('gbk')),warehouse=house) + material = Material( + code=code, name=force_text( + name.decode('gbk')), spec=force_text( + description.decode('gbk')), warehouse=house) material.stock_price = price material.save() - InitItem.objects.create(master=self,material=material,price=price,cnt=cnt,warehouse=house,measure=measure,source=self.code) + InitItem.objects.create(master=self, material=material, price=price, cnt=cnt, + warehouse=house, measure=measure, source=self.code) - def init_entry(self,request=None): + def init_entry(self, request=None): """ 执行期初入库 """ @@ -104,7 +108,12 @@ def init_entry(self,request=None): with transaction.atomic(): total_amount = 0 for item in InitItem.objects.filter(master=self).all(): - Inventory.objects.create(material=item.material,price=item.price,cnt=item.cnt,warehouse=item.warehouse,measure=item.measure) + Inventory.objects.create( + material=item.material, + price=item.price, + cnt=item.cnt, + warehouse=item.warehouse, + measure=item.measure) item.status = 1 item.event_time = datetime.datetime.now() item.source = self.code @@ -113,7 +122,7 @@ def init_entry(self,request=None): if item.material.measure.count() == 0: item.material.measure.add(item.measure) item.material.save() - total_amount += item.price*item.cnt + total_amount += item.price * item.cnt self.amount = total_amount self.status = '9' self.execute_time = datetime.datetime.now() @@ -136,16 +145,23 @@ class StockIn(generic.BO): ('9', _("EXECUTED")) ) index_weight = 3 - code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) - warehouse = models.ForeignKey(Warehouse,verbose_name=_("warehouse"),on_delete=models.CASCADE) - title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) - user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) - status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) - execute_time = models.DateTimeField(_("execute time"),blank=True,null=True) - po = models.ForeignKey(PurchaseOrder,verbose_name=_("purchase order"),null=True,limit_choices_to={"entry_status":"0"},blank=True,on_delete=models.CASCADE) - amount = models.DecimalField(_("stock in money of amount"),max_digits=14,decimal_places=4,blank=True,null=True) - batch = models.CharField(_("batch"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) + code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + warehouse = models.ForeignKey(Warehouse, verbose_name=_("warehouse"), on_delete=models.CASCADE) + title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + user = models.ForeignKey(User, verbose_name=_("user"), blank=True, null=True, on_delete=models.CASCADE) + status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) + execute_time = models.DateTimeField(_("execute time"), blank=True, null=True) + po = models.ForeignKey( + PurchaseOrder, + verbose_name=_("purchase order"), + null=True, + limit_choices_to={ + "entry_status": "0"}, + blank=True, + on_delete=models.CASCADE) + amount = models.DecimalField(_("stock in money of amount"), max_digits=14, decimal_places=4, blank=True, null=True) + batch = models.CharField(_("batch"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) def money_of_amount(self): if self.amount: @@ -162,7 +178,7 @@ def entry_time(self): money_of_amount.short_description = _("stock in money of amount") entry_time.short_description = _("entry time") - def action_entry(self,request): + def action_entry(self, request): """ 执行入库操作 """ @@ -171,35 +187,36 @@ def action_entry(self,request): total_amount = decimal.Decimal(0) for item in self.initem_set.filter(status=0).all(): try: - inventory = Inventory.objects.get(warehouse=self.warehouse,material=item.material,measure=item.measure) + inventory = Inventory.objects.get( + warehouse=self.warehouse, material=item.material, measure=item.measure) if inventory.price != item.price: - at = decimal.Decimal(inventory.price*inventory.cnt+item.price*item.cnt) - ac = decimal.Decimal(inventory.cnt+item.cnt) - average = at/ac + at = decimal.Decimal(inventory.price * inventory.cnt + item.price * item.cnt) + ac = decimal.Decimal(inventory.cnt + item.cnt) + average = at / ac inventory.price = average item.material.stock_price = average item.material.save() inventory.cnt += item.cnt inventory.save() - total_amount += item.price*item.cnt + total_amount += item.price * item.cnt except Exception: - Inventory.objects.create(warehouse=self.warehouse,material=item.material,measure=item.measure, - cnt=item.cnt,price=item.price,org=self.org) + Inventory.objects.create(warehouse=self.warehouse, material=item.material, measure=item.measure, + cnt=item.cnt, price=item.price, org=self.org) item.material.stock_price = item.price item.material.save() - item.status=1 + item.status = 1 item.event_time = datetime.datetime.now() item.source = self.code item.save() - total_amount += item.price*item.cnt + total_amount += item.price * item.cnt # saving the purchase item item.po_item.is_in_stock = 1 item.po_item.in_stock_time = datetime.datetime.now() item.po_item.entry_cnt = item.cnt item.po_item.save() - none_zero_left = POItem.objects.filter(po=item.po_item.po,left_cnt__gt=0).count() + none_zero_left = POItem.objects.filter(po=item.po_item.po, left_cnt__gt=0).count() if none_zero_left == 0: item.po_item.po.status = '99' item.po_item.po.entry_status = 1 @@ -229,16 +246,16 @@ class StockOut(generic.BO): ('9', _("EXECUTED")) ) index_weight = 2 - code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) - title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) - project = models.ForeignKey(Project,verbose_name=_("project"),blank=True,null=True,on_delete=models.CASCADE) - wo = models.ForeignKey(WorkOrder,verbose_name=_("work order"),blank=True,null=True,on_delete=models.CASCADE) - description = models.TextField(_("description"),blank=True,null=True) - amount = models.DecimalField(_("money of amount"),max_digits=14,decimal_places=4,blank=True,null=True) - user = models.ForeignKey(User,verbose_name=_("out user"),blank=True,null=True,on_delete=models.CASCADE) - status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) - execute_time = models.DateTimeField(_("execute time"),blank=True,null=True) + code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + project = models.ForeignKey(Project, verbose_name=_("project"), blank=True, null=True, on_delete=models.CASCADE) + wo = models.ForeignKey(WorkOrder, verbose_name=_("work order"), blank=True, null=True, on_delete=models.CASCADE) + description = models.TextField(_("description"), blank=True, null=True) + amount = models.DecimalField(_("money of amount"), max_digits=14, decimal_places=4, blank=True, null=True) + user = models.ForeignKey(User, verbose_name=_("out user"), blank=True, null=True, on_delete=models.CASCADE) + status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) + execute_time = models.DateTimeField(_("execute time"), blank=True, null=True) def out_amount(self): return self.amount or '' @@ -249,7 +266,7 @@ def out_time(self): out_time.short_description = _('stock out time') out_amount.short_description = _('stock out amount') - def action_out(self,request=None): + def action_out(self, request=None): """ 执行出库操作 """ @@ -266,7 +283,7 @@ def action_out(self,request=None): item.price = item.inventory.price item.event_time = datetime.datetime.now() item.inventory.save() - item.source=self.code + item.source = self.code item.save() if total > 0: self.amount = total @@ -289,30 +306,37 @@ class WareReturn(generic.BO): ('9', _("EXECUTED")) ) index_weight = 5 - code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) - title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) - out = models.ForeignKey(StockOut,verbose_name=_('StockOut'),on_delete=models.CASCADE) - amount = models.DecimalField(_("money of amount"),max_digits=14,decimal_places=4,blank=True,null=True) - user = models.ForeignKey(User,verbose_name=_("out user"),blank=True,null=True,on_delete=models.CASCADE) - status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) - execute_time = models.DateTimeField(_("execute time"),blank=True,null=True) + code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + out = models.ForeignKey(StockOut, verbose_name=_('StockOut'), on_delete=models.CASCADE) + amount = models.DecimalField(_("money of amount"), max_digits=14, decimal_places=4, blank=True, null=True) + user = models.ForeignKey(User, verbose_name=_("out user"), blank=True, null=True, on_delete=models.CASCADE) + status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) + execute_time = models.DateTimeField(_("execute time"), blank=True, null=True) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): - super(WareReturn,self).save(force_insert,force_update,using,update_fields) + super(WareReturn, self).save(force_insert, force_update, using, update_fields) item_count = ReturnItem.objects.filter(master=self).count() if self.out and item_count == 0: for out_item in OutItem.objects.filter(master=self.out): - ReturnItem.objects.create(master=self,out_item=out_item,material=out_item.material,price=out_item.price, - measure=out_item.measure,warehouse=out_item.warehouse,out_cnt=out_item.cnt,cnt=out_item.cnt) - - def action_return(self,request): + ReturnItem.objects.create( + master=self, + out_item=out_item, + material=out_item.material, + price=out_item.price, + measure=out_item.measure, + warehouse=out_item.warehouse, + out_cnt=out_item.cnt, + cnt=out_item.cnt) + + def action_return(self, request): with transaction.atomic(): total_amount = decimal.Decimal(0) for item in ReturnItem.objects.filter(master=self): if item.cnt > item.out_item.cnt or item.cnt < 0: - raise Exception('%s cnt is invalid,out is %s,return is %s' % (item.material,item.out_cnt,item.cnt)) + raise Exception('%s cnt is invalid,out is %s,return is %s' % (item.material, item.out_cnt, item.cnt)) item.event_time = datetime.datetime.now() item.source = self.code item.status = 1 @@ -340,17 +364,17 @@ class WareAdjust(generic.BO): ('9', _("EXECUTED")) ) index_weight = 4 - code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) - title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) - description = models.TextField(_("description"),blank=True,null=True) - user = models.ForeignKey(User,verbose_name=_("out user"),blank=True,null=True,on_delete=models.CASCADE) - status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) - execute_time = models.DateTimeField(_("execute time"),blank=True,null=True) - - def action_adjust(self,request): + code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + description = models.TextField(_("description"), blank=True, null=True) + user = models.ForeignKey(User, verbose_name=_("out user"), blank=True, null=True, on_delete=models.CASCADE) + status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) + execute_time = models.DateTimeField(_("execute time"), blank=True, null=True) + + def action_adjust(self, request): with transaction.atomic(): - for item in AdjustItem.objects.filter(master=self,status=0): + for item in AdjustItem.objects.filter(master=self, status=0): inventory = item.inventory if item.prop == '+': inventory.cnt += item.cnt @@ -380,24 +404,31 @@ class InOutDetail(models.Model): ('-', _("MINUS")) ) - create_time = models.DateTimeField(_("create time"),auto_now_add=True) - status = models.BooleanField(_("executed"),default=0) - event_time = models.DateTimeField(_("event time"),blank=True,null=True) - warehouse = models.ForeignKey(Warehouse,verbose_name=_("warehouse"),blank=True,null=True,on_delete=models.CASCADE) - material = models.ForeignKey(Material,verbose_name=_("material"),limit_choices_to={"is_virtual":"0"},blank=True,null=True,on_delete=models.CASCADE) - measure = models.ForeignKey(Measure,verbose_name=_("measure"),blank=True,null=True,on_delete=models.CASCADE) - cnt = models.DecimalField(_("count"),max_digits=14,decimal_places=4,blank=True,null=True) - batch = models.CharField(_("batch"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - price = models.DecimalField(_("price"),max_digits=14,decimal_places=4,blank=True,null=True) - prop = models.CharField(_("plus or minus property"),max_length=const.DB_CHAR_CODE_2,choices=PROP,default='+') - source = models.CharField(_("source"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) + create_time = models.DateTimeField(_("create time"), auto_now_add=True) + status = models.BooleanField(_("executed"), default=0) + event_time = models.DateTimeField(_("event time"), blank=True, null=True) + warehouse = models.ForeignKey(Warehouse, verbose_name=_("warehouse"), blank=True, null=True, on_delete=models.CASCADE) + material = models.ForeignKey( + Material, + verbose_name=_("material"), + limit_choices_to={ + "is_virtual": "0"}, + blank=True, + null=True, + on_delete=models.CASCADE) + measure = models.ForeignKey(Measure, verbose_name=_("measure"), blank=True, null=True, on_delete=models.CASCADE) + cnt = models.DecimalField(_("count"), max_digits=14, decimal_places=4, blank=True, null=True) + batch = models.CharField(_("batch"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + price = models.DecimalField(_("price"), max_digits=14, decimal_places=4, blank=True, null=True) + prop = models.CharField(_("plus or minus property"), max_length=const.DB_CHAR_CODE_2, choices=PROP, default='+') + source = models.CharField(_("source"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) class InitItem(InOutDetail): """ 期初入库明细 """ - master = models.ForeignKey(InitialInventory,on_delete=models.CASCADE) + master = models.ForeignKey(InitialInventory, on_delete=models.CASCADE) class Meta: verbose_name = _("init item") @@ -408,17 +439,17 @@ class InItem(InOutDetail): """ 入库单明细 """ - master = models.ForeignKey(StockIn,on_delete=models.CASCADE) - po_item = models.ForeignKey(POItem,verbose_name=_("po item"),blank=True,null=True,on_delete=models.CASCADE) + master = models.ForeignKey(StockIn, on_delete=models.CASCADE) + po_item = models.ForeignKey(POItem, verbose_name=_("po item"), blank=True, null=True, on_delete=models.CASCADE) def get_new_price(self): if self.po_item and self.master.warehouse: try: - inventory = Inventory.objects.get(warehouse=self.master.warehouse,material=self.material,measure=self.measure) + inventory = Inventory.objects.get(warehouse=self.master.warehouse, material=self.material, measure=self.measure) if inventory and self.price != inventory.price: - total_amount = self.price*self.cnt+inventory.price*inventory.cnt - total_count = self.cnt+inventory.cnt - return total_amount/total_count + total_amount = self.price * self.cnt + inventory.price * inventory.cnt + total_count = self.cnt + inventory.cnt + return total_amount / total_count except Exception as e: pass return self.price or '' @@ -430,7 +461,7 @@ class Meta: class InItemForm(forms.ModelForm): - new_price = forms.CharField(label=_('new price'),required=False) + new_price = forms.CharField(label=_('new price'), required=False) class Meta: model = InItem @@ -441,8 +472,13 @@ class OutItem(InOutDetail): """ 出库单明细 """ - master = models.ForeignKey(StockOut,on_delete=models.CASCADE) - inventory = models.ForeignKey(Inventory,blank=True,null=True,verbose_name=_("inventory material"),on_delete=models.CASCADE) + master = models.ForeignKey(StockOut, on_delete=models.CASCADE) + inventory = models.ForeignKey( + Inventory, + blank=True, + null=True, + verbose_name=_("inventory material"), + on_delete=models.CASCADE) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): @@ -452,7 +488,7 @@ def save(self, force_insert=False, force_update=False, using=None, self.measure = self.inventory.measure self.warehouse = self.inventory.warehouse - super(OutItem,self).save(force_insert,force_update,using,update_fields) + super(OutItem, self).save(force_insert, force_update, using, update_fields) class Meta: verbose_name = _("out item") @@ -463,9 +499,9 @@ class ReturnItem(InOutDetail): """ 返库单明细 """ - master = models.ForeignKey(WareReturn,on_delete=models.CASCADE) - out_item = models.ForeignKey(OutItem,blank=True,null=True,verbose_name=_('out item'),on_delete=models.CASCADE) - out_cnt = models.DecimalField(_("out count"),max_digits=14,decimal_places=4) + master = models.ForeignKey(WareReturn, on_delete=models.CASCADE) + out_item = models.ForeignKey(OutItem, blank=True, null=True, verbose_name=_('out item'), on_delete=models.CASCADE) + out_cnt = models.DecimalField(_("out count"), max_digits=14, decimal_places=4) class Meta: verbose_name = _("return item") @@ -476,8 +512,13 @@ class AdjustItem(InOutDetail): """ 库存调整明细 """ - master = models.ForeignKey(WareAdjust,on_delete=models.CASCADE) - inventory = models.ForeignKey(Inventory,blank=True,null=True,verbose_name=_("inventory material"),on_delete=models.CASCADE) + master = models.ForeignKey(WareAdjust, on_delete=models.CASCADE) + inventory = models.ForeignKey( + Inventory, + blank=True, + null=True, + verbose_name=_("inventory material"), + on_delete=models.CASCADE) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): @@ -485,8 +526,8 @@ def save(self, force_insert=False, force_update=False, using=None, self.material = self.inventory.material self.measure = self.inventory.measure self.warehouse = self.inventory.warehouse - super(AdjustItem,self).save(force_insert,force_update,using,update_fields) + super(AdjustItem, self).save(force_insert, force_update, using, update_fields) class Meta: verbose_name = _("adjust item") - verbose_name_plural = _("adjust item") \ No newline at end of file + verbose_name_plural = _("adjust item") diff --git a/invent/urls.py b/invent/urls.py index b2e1020..13b637f 100644 --- a/invent/urls.py +++ b/invent/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url,static +from django.conf.urls import include, url, static import invent.views urlpatterns = [ diff --git a/invent/views.py b/invent/views.py index 79a3739..14b6d26 100644 --- a/invent/views.py +++ b/invent/views.py @@ -7,11 +7,11 @@ from django.template.response import TemplateResponse from django.contrib import messages from django.contrib.auth.models import User -from invent.models import StockIn,StockOut,InitialInventory,WareReturn,WareAdjust +from invent.models import StockIn, StockOut, InitialInventory, WareReturn, WareAdjust from django.utils.translation import ugettext_lazy as _ -def action_in(request,object_id): +def action_in(request, object_id): """ 入库操作 :param request: @@ -26,11 +26,11 @@ def action_in(request,object_id): if request.POST.get("post"): try: obj.action_entry(request) - messages.success(request,_('check in successfully')) + messages.success(request, _('check in successfully')) except Exception as e: - messages.error(request,e) + messages.error(request, e) - return HttpResponseRedirect("/admin/invent/stockin/%s"%(object_id)) + return HttpResponseRedirect("/admin/invent/stockin/%s" % (object_id)) context = dict( site.each_context(request), @@ -41,10 +41,10 @@ def action_in(request,object_id): ) request.current_app = site.name - return TemplateResponse(request,'admin/invent/stockin/in_confirmation.html', context) + return TemplateResponse(request, 'admin/invent/stockin/in_confirmation.html', context) -def action_out(request,object_id): +def action_out(request, object_id): """ 出库操作 :param request: @@ -59,10 +59,10 @@ def action_out(request,object_id): if request.POST.get("post"): try: obj.action_out(request) - messages.success(request,_('check out successfully')) + messages.success(request, _('check out successfully')) except Exception as e: - messages.error(request,e) - return HttpResponseRedirect("/admin/invent/stockout/%s"%(object_id)) + messages.error(request, e) + return HttpResponseRedirect("/admin/invent/stockout/%s" % (object_id)) context = dict( site.each_context(request), @@ -73,10 +73,10 @@ def action_out(request,object_id): ) request.current_app = site.name - return TemplateResponse(request,'admin/invent/stockout/out_confirmation.html', context) + return TemplateResponse(request, 'admin/invent/stockout/out_confirmation.html', context) -def action_init(request,object_id): +def action_init(request, object_id): """ 期初入库操作 :param request: @@ -91,11 +91,11 @@ def action_init(request,object_id): if request.POST.get("post"): try: obj.init_entry(request) - messages.success(request,_('check in successfully')) + messages.success(request, _('check in successfully')) except Exception as e: - messages.error(request,e) + messages.error(request, e) - return HttpResponseRedirect("/admin/invent/initialinventory/%s"%(object_id)) + return HttpResponseRedirect("/admin/invent/initialinventory/%s" % (object_id)) context = dict( site.each_context(request), @@ -106,10 +106,10 @@ def action_init(request,object_id): ) request.current_app = site.name - return TemplateResponse(request,'admin/invent/stockin/in_confirmation.html', context) + return TemplateResponse(request, 'admin/invent/stockin/in_confirmation.html', context) -def action_return(request,object_id): +def action_return(request, object_id): """ 返库操作 :param request: @@ -124,11 +124,11 @@ def action_return(request,object_id): if request.POST.get("post"): try: obj.action_return(request) - messages.success(request,_('check in successfully')) + messages.success(request, _('check in successfully')) except Exception as e: - messages.error(request,e) + messages.error(request, e) - return HttpResponseRedirect("/admin/invent/warereturn/%s"%(object_id)) + return HttpResponseRedirect("/admin/invent/warereturn/%s" % (object_id)) context = dict( site.each_context(request), @@ -139,10 +139,10 @@ def action_return(request,object_id): ) request.current_app = site.name - return TemplateResponse(request,'admin/invent/stockin/in_confirmation.html', context) + return TemplateResponse(request, 'admin/invent/stockin/in_confirmation.html', context) -def action_adjust(request,object_id): +def action_adjust(request, object_id): """ 调整操作 :param request: @@ -157,11 +157,11 @@ def action_adjust(request,object_id): if request.POST.get("post"): try: obj.action_adjust(request) - messages.success(request,_('check in successfully')) + messages.success(request, _('check in successfully')) except Exception as e: - messages.error(request,e) + messages.error(request, e) - return HttpResponseRedirect("/admin/invent/wareadjust/%s"%(object_id)) + return HttpResponseRedirect("/admin/invent/wareadjust/%s" % (object_id)) context = dict( site.each_context(request), @@ -172,4 +172,4 @@ def action_adjust(request,object_id): ) request.current_app = site.name - return TemplateResponse(request,'admin/invent/stockin/in_confirmation.html', context) \ No newline at end of file + return TemplateResponse(request, 'admin/invent/stockin/in_confirmation.html', context) diff --git a/midware/cuser.py b/midware/cuser.py index 90b2413..a85c35f 100644 --- a/midware/cuser.py +++ b/midware/cuser.py @@ -1,6 +1,6 @@ __author__ = 'zhugl' -# created at 15-4-21 -#python import +# created at 15-4-21 +# python import from threading import local from django.contrib import admin from django.apps import apps @@ -15,6 +15,7 @@ from django.utils.deprecation import MiddlewareMixin else: from django.core.urlresolvers import NoReverseMatch, reverse + class MiddlewareMixin(object): pass from django.db.models.base import ModelBase @@ -31,19 +32,27 @@ class MiddlewareMixin(object): def getuser(): - return getattr(_thread_local,'user',None) + return getattr(_thread_local, 'user', None) class RequestUser(MiddlewareMixin): - def process_request(self,request): - django_user = getattr(request,'user',None) + def process_request(self, request): + django_user = getattr(request, 'user', None) if django_user is not None: _thread_local.user = django_user def process_view(self, request, view_func, view_args, view_kwargs): - app_weight = {'selfhelp':1,'purchase':3,'sale':2,'invent':4,'organ':5,'basedata':6,'syscfg':7,'workflow':8} + app_weight = { + 'selfhelp': 1, + 'purchase': 3, + 'sale': 2, + 'invent': 4, + 'organ': 5, + 'basedata': 6, + 'syscfg': 7, + 'workflow': 8} if view_func.__name__ == 'index': app_dict = {} for model, model_admin in admin.site._registry.items(): @@ -58,7 +67,7 @@ def process_view(self, request, view_func, view_args, view_kwargs): 'name': capfirst(model._meta.verbose_name_plural), 'object_name': model._meta.object_name, 'perms': perms, - 'weight':getattr(model,'index_weight',99) + 'weight': getattr(model, 'index_weight', 99) } if perms.get('change', False): try: @@ -83,7 +92,7 @@ def process_view(self, request, view_func, view_args, view_kwargs): ), 'has_module_perms': has_module_perms, 'models': [model_dict], - 'weight':app_weight.get(app_label,99) + 'weight': app_weight.get(app_label, 99) } # app_list = list(six.itervalues(app_dict)) @@ -98,7 +107,7 @@ def process_view(self, request, view_func, view_args, view_kwargs): ) try: todolist = self.get_my_task(request) - context.update(dict(todolist = todolist)) + context.update(dict(todolist=todolist)) except Exception: pass # print context @@ -123,8 +132,8 @@ def process_view(self, request, view_func, view_args, view_kwargs): kwargs={'app_label': label}, current_app=admin.site.name, ), - 'weight':app_weight.get(label,99), - 'is_current':is_current, + 'weight': app_weight.get(label, 99), + 'is_current': is_current, } if app_label == model._meta.app_label: has_module_perms = model_admin.has_module_permission(request) @@ -139,7 +148,7 @@ def process_view(self, request, view_func, view_args, view_kwargs): 'name': capfirst(model._meta.verbose_name_plural), 'object_name': model._meta.object_name, 'perms': perms, - 'weight':getattr(model,'index_weight',99) + 'weight': getattr(model, 'index_weight', 99) } if perms.get('change'): try: @@ -176,10 +185,10 @@ def process_view(self, request, view_func, view_args, view_kwargs): ) view_kwargs['extra_context'] = context - def get_my_task(self,request): + def get_my_task(self, request): from workflow.models import TodoList if request and request.user: - query = TodoList.objects.filter(user=request.user,status=0) + query = TodoList.objects.filter(user=request.user, status=0) if query.count() == 0: return None else: diff --git a/mis/__init__.py b/mis/__init__.py index 452a4ef..7a93652 100644 --- a/mis/__init__.py +++ b/mis/__init__.py @@ -2,4 +2,4 @@ # -*- coding: utf-8 -*- # import pymysql # pymysql.install_as_MySQLdb() -#解决mysql-python的历史遗留问题(Yuri_2017-04-29) +# 解决mysql-python的历史遗留问题(Yuri_2017-04-29) diff --git a/mis/production.py b/mis/production.py index 088c320..7825e06 100644 --- a/mis/production.py +++ b/mis/production.py @@ -122,5 +122,5 @@ ('img', os.path.join(STATIC_ROOT, 'img')), ) -MEDIA_ROOT = os.path.join(BASE_DIR,'upload') +MEDIA_ROOT = os.path.join(BASE_DIR, 'upload') MEDIA_URL = '/upload/' diff --git a/mis/settings.py b/mis/settings.py index 3eaa6b0..62d7254 100644 --- a/mis/settings.py +++ b/mis/settings.py @@ -121,12 +121,12 @@ # https://docs.djangoproject.com/en/1.8/howto/static-files/ STATIC_URL = '/static/' -STATIC_ROOT = os.path.join(BASE_DIR,'static') +STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATICFILES_DIRS = ( - ('css',os.path.join(STATIC_ROOT,'css')), - ('js',os.path.join(STATIC_ROOT,'js')), - ('img',os.path.join(STATIC_ROOT,'img')), + ('css', os.path.join(STATIC_ROOT, 'css')), + ('js', os.path.join(STATIC_ROOT, 'js')), + ('img', os.path.join(STATIC_ROOT, 'img')), ) -MEDIA_ROOT = os.path.join(BASE_DIR,'upload') +MEDIA_ROOT = os.path.join(BASE_DIR, 'upload') MEDIA_URL = '/upload/' diff --git a/mis/urls.py b/mis/urls.py index b71d01a..78806a7 100644 --- a/mis/urls.py +++ b/mis/urls.py @@ -17,5 +17,5 @@ url(r'^admin/basedata/', include(basedata.urls)), url(r'^admin/selfhelp/', include(selfhelp.urls)), ] -urlpatterns += static.static(settings.STATIC_URL,document_root=settings.STATIC_ROOT) -urlpatterns += static.static(settings.MEDIA_URL,document_root=settings.MEDIA_ROOT) +urlpatterns += static.static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) +urlpatterns += static.static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/note.md b/note.md index 7106621..0e234a3 100644 --- a/note.md +++ b/note.md @@ -1,3 +1,7 @@ +# 笔记 + +本分支由Python2 Django1迁移过来 + ## 快速开始 pipenv install diff --git a/organ/admin.py b/organ/admin.py index bf142f4..51b4e37 100644 --- a/organ/admin.py +++ b/organ/admin.py @@ -1,7 +1,7 @@ # coding=utf-8 from django.contrib import admin from common import generic -from organ.models import Organization,OrgUnit,Position +from organ.models import Organization, OrgUnit, Position from basedata.models import BankAccount from basedata.admin import BankAccountInline import datetime @@ -10,13 +10,13 @@ class OrgAdmin(generic.BOAdmin): CODE_PREFIX = 'O' CODE_NUMBER_WIDTH = 2 - list_display = ['code','name','represent','lic_code','cer_code'] + list_display = ['code', 'name', 'represent', 'lic_code', 'cer_code'] fields = ( - ('name','code',),('short','pinyin',), - ('tax_num','tax_account',),('tax_address',),('represent','email',), - ('address','zipcode',),('contacts','phone',),('fax','website',), - ('lic_code','cer_code',),('license','certificate',),('status','weight',), + ('name', 'code',), ('short', 'pinyin',), + ('tax_num', 'tax_account',), ('tax_address',), ('represent', 'email',), + ('address', 'zipcode',), ('contacts', 'phone',), ('fax', 'website',), + ('lic_code', 'cer_code',), ('license', 'certificate',), ('status', 'weight',), ) inlines = [BankAccountInline] @@ -25,44 +25,45 @@ class OrgAdmin(generic.BOAdmin): class OrgUnitAdmin(generic.BOAdmin): CODE_PREFIX = 'S' CODE_NUMBER_WIDTH = 3 - list_display = ['code','name','unit_type','parent'] - list_display_links = ['code','name'] + list_display = ['code', 'name', 'unit_type', 'parent'] + list_display_links = ['code', 'name'] fields = ( - ('organization',),('parent',),('name','code',),('short','pinyin',), - ('unit_type',),('status','virtual',),('phone','fax',), - ('contacts','email',),('weight',), + ('organization',), ('parent',), ('name', 'code',), ('short', 'pinyin',), + ('unit_type',), ('status', 'virtual',), ('phone', 'fax',), + ('contacts', 'email',), ('weight',), ) def get_queryset(self, request): - return super(OrgUnitAdmin,self).get_queryset(request).filter(end__gt=datetime.date.today()) + return super(OrgUnitAdmin, self).get_queryset(request).filter(end__gt=datetime.date.today()) def save_model(self, request, obj, form, change): if obj.parent and obj.parent.organization: obj.organization = obj.parent.organization obj.save() - super(OrgUnitAdmin,self).save_model(request,obj,form,change) + super(OrgUnitAdmin, self).save_model(request, obj, form, change) class PositionAdmin(generic.BOAdmin): CODE_PREFIX = 'P' CODE_NUMBER_WIDTH = 4 - list_display = ['code','name','unit','series','grade','parent'] - list_display_links = ['code','name'] + list_display = ['code', 'name', 'unit', 'series', 'grade', 'parent'] + list_display_links = ['code', 'name'] fields = ( - ('unit',),('organization',),('parent',),('name','code',),('short','pinyin',),('series','grade',), - ('virtual','status'),('description',),('qualification',),('document',),('weight',), + ('unit',), ('organization',), ('parent',), ('name', 'code',), ('short', 'pinyin',), ('series', 'grade',), + ('virtual', 'status'), ('description',), ('qualification',), ('document',), ('weight',), ) readonly_fields = ['organization'] def get_queryset(self, request): - return super(PositionAdmin,self).get_queryset(request).filter(end__gt=datetime.date.today()) + return super(PositionAdmin, self).get_queryset(request).filter(end__gt=datetime.date.today()) def save_model(self, request, obj, form, change): if obj.unit: obj.organization = obj.unit.organization obj.save() - super(PositionAdmin,self).save_model(request,obj,form,change) + super(PositionAdmin, self).save_model(request, obj, form, change) -admin.site.register(Position,PositionAdmin) -admin.site.register(OrgUnit,OrgUnitAdmin) -admin.site.register(Organization,OrgAdmin) \ No newline at end of file + +admin.site.register(Position, PositionAdmin) +admin.site.register(OrgUnit, OrgUnitAdmin) +admin.site.register(Organization, OrgAdmin) diff --git a/organ/apps.py b/organ/apps.py index d3aceac..c37977a 100644 --- a/organ/apps.py +++ b/organ/apps.py @@ -1,9 +1,9 @@ __author__ = 'zhugl' -# created at 15-4-22 +# created at 15-4-22 from django.apps.config import AppConfig from django.utils.translation import ugettext_lazy as _ class OrganConfig(AppConfig): name = 'organ' - verbose_name = _('organization') \ No newline at end of file + verbose_name = _('organization') diff --git a/organ/models.py b/organ/models.py index d589978..97cbe4d 100644 --- a/organ/models.py +++ b/organ/models.py @@ -11,29 +11,29 @@ class Organization(generic.BO): 组织单位 """ index_weight = 1 - code = models.CharField(_("organ code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - name = models.CharField(_("organ name"),max_length=const.DB_CHAR_NAME_120) - short = models.CharField(_("short name"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - pinyin = models.CharField(_("pinyin"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - status = models.BooleanField(_("in use"),default=True) + code = models.CharField(_("organ code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + name = models.CharField(_("organ name"), max_length=const.DB_CHAR_NAME_120) + short = models.CharField(_("short name"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + pinyin = models.CharField(_("pinyin"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + status = models.BooleanField(_("in use"), default=True) - tax_num = models.CharField(_("tax num"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - tax_address = models.CharField(_("tax address"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - tax_account = models.CharField(_("tax account"),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) + tax_num = models.CharField(_("tax num"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + tax_address = models.CharField(_("tax address"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + tax_account = models.CharField(_("tax account"), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) - represent = models.CharField(_("representative "),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - address = models.CharField(_("address"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - zipcode = models.CharField(_("zipcode"),max_length=const.DB_CHAR_CODE_8,blank=True,null=True) - fax = models.CharField(_("fax"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - contacts = models.CharField(_("contacts"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - phone = models.CharField(_("phone"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - website = models.CharField(_("website"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - email = models.CharField(_("email"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - lic_code = models.CharField(_("license code"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - cer_code = models.CharField(_("certificate code"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - license = models.FileField(_("business license"),blank=True,null=True,upload_to='organ') - certificate = models.FileField(_("organization code certificate"),blank=True,null=True,upload_to='organ') - weight = models.IntegerField(_("weight"),default=9) + represent = models.CharField(_("representative "), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + address = models.CharField(_("address"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + zipcode = models.CharField(_("zipcode"), max_length=const.DB_CHAR_CODE_8, blank=True, null=True) + fax = models.CharField(_("fax"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + contacts = models.CharField(_("contacts"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + phone = models.CharField(_("phone"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + website = models.CharField(_("website"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + email = models.CharField(_("email"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + lic_code = models.CharField(_("license code"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + cer_code = models.CharField(_("certificate code"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + license = models.FileField(_("business license"), blank=True, null=True, upload_to='organ') + certificate = models.FileField(_("organization code certificate"), blank=True, null=True, upload_to='organ') + weight = models.IntegerField(_("weight"), default=9) class Meta: verbose_name = _('organization') @@ -45,27 +45,28 @@ class OrgUnit(generic.BO): 组织单元 """ UNIT_LEVEL = ( - (1,_('BRANCH')), - (2,_('DEPARTMENT')), - (3,_('OFFICE')), - (4,_('TEAM')), - (5,_('COMMITTEE')) + (1, _('BRANCH')), + (2, _('DEPARTMENT')), + (3, _('OFFICE')), + (4, _('TEAM')), + (5, _('COMMITTEE')) ) index_weight = 2 - parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True,on_delete=models.CASCADE) - organization = models.ForeignKey(Organization,verbose_name = _('organization'),null=True,blank=True,on_delete=models.CASCADE) - code = models.CharField(_("code"),max_length=const.DB_CHAR_CODE_8,blank=True,null=True) - name = models.CharField(_("name"),max_length=const.DB_CHAR_NAME_120) - short = models.CharField(_("short name"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - pinyin = models.CharField(_("pinyin"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - unit_type = models.IntegerField(_("type"),choices=UNIT_LEVEL,default=2) - status = models.BooleanField(_("in use"),default=True) - virtual = models.BooleanField(_("is virtual"),default=False) - fax = models.CharField(_("fax"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - phone = models.CharField(_("phone"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - contacts = models.CharField(_("contacts"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - email = models.CharField(_("email"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - weight = models.IntegerField(_("weight"),default=99) + parent = models.ForeignKey('self', verbose_name=_("parent"), null=True, blank=True, on_delete=models.CASCADE) + organization = models.ForeignKey(Organization, verbose_name=_('organization'), + null=True, blank=True, on_delete=models.CASCADE) + code = models.CharField(_("code"), max_length=const.DB_CHAR_CODE_8, blank=True, null=True) + name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_120) + short = models.CharField(_("short name"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + pinyin = models.CharField(_("pinyin"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + unit_type = models.IntegerField(_("type"), choices=UNIT_LEVEL, default=2) + status = models.BooleanField(_("in use"), default=True) + virtual = models.BooleanField(_("is virtual"), default=False) + fax = models.CharField(_("fax"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + phone = models.CharField(_("phone"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + contacts = models.CharField(_("contacts"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + email = models.CharField(_("email"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + weight = models.IntegerField(_("weight"), default=99) class Meta: verbose_name = _('org unit') @@ -77,10 +78,10 @@ class Position(generic.BO): 岗位 """ SERIES = ( - ('A',_("Admin Position")), - ('S',_("Sale Position")), - ('T',_("Technology Position")), - ('P',_("Produce Position")), + ('A', _("Admin Position")), + ('S', _("Sale Position")), + ('T', _("Technology Position")), + ('P', _("Produce Position")), ) GRADE = ( @@ -91,24 +92,29 @@ class Position(generic.BO): ('05', _("EXPERT")), ) index_weight = 3 - unit = models.ForeignKey(OrgUnit,verbose_name=_('org unit'),on_delete=models.CASCADE) - organization = models.ForeignKey(Organization,verbose_name=_('organization'),null=True,blank=True,on_delete=models.CASCADE) - parent = models.ForeignKey('self',verbose_name=_("parent"),null=True,blank=True,on_delete=models.CASCADE) - code = models.CharField(_("position code"),max_length=const.DB_CHAR_CODE_8,blank=True,null=True) - name = models.CharField(_("position name"),max_length=const.DB_CHAR_NAME_120) - short = models.CharField(_("short name"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - pinyin = models.CharField(_("pinyin"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - series = models.CharField(_("position series"),max_length=1,default='A',choices=const.get_value_list('S014')) - grade = models.CharField(_("position grade"),max_length=const.DB_CHAR_CODE_2,default='01',choices=const.get_value_list('S015')) - virtual = models.BooleanField(_("is virtual"),default=False) - status = models.BooleanField(_("in use"),default=True) - description = models.TextField(_("position description"),blank=True,null=True) - qualification = models.TextField(_("qualification"),blank=True,null=True) - document = models.FileField(_("reference"),blank=True,null=True) - weight = models.IntegerField(_("weight"),default=99) + unit = models.ForeignKey(OrgUnit, verbose_name=_('org unit'), on_delete=models.CASCADE) + organization = models.ForeignKey(Organization, verbose_name=_('organization'), + null=True, blank=True, on_delete=models.CASCADE) + parent = models.ForeignKey('self', verbose_name=_("parent"), null=True, blank=True, on_delete=models.CASCADE) + code = models.CharField(_("position code"), max_length=const.DB_CHAR_CODE_8, blank=True, null=True) + name = models.CharField(_("position name"), max_length=const.DB_CHAR_NAME_120) + short = models.CharField(_("short name"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + pinyin = models.CharField(_("pinyin"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + series = models.CharField(_("position series"), max_length=1, default='A', choices=const.get_value_list('S014')) + grade = models.CharField( + _("position grade"), + max_length=const.DB_CHAR_CODE_2, + default='01', + choices=const.get_value_list('S015')) + virtual = models.BooleanField(_("is virtual"), default=False) + status = models.BooleanField(_("in use"), default=True) + description = models.TextField(_("position description"), blank=True, null=True) + qualification = models.TextField(_("qualification"), blank=True, null=True) + document = models.FileField(_("reference"), blank=True, null=True) + weight = models.IntegerField(_("weight"), default=99) def __unicode__(self): - return u'%s %s' % (self.code,self.name) + return u'%s %s' % (self.code, self.name) class Meta: verbose_name = _('position') diff --git a/plugin/__init__.py b/plugin/__init__.py index ce3bd2f..28181da 100644 --- a/plugin/__init__.py +++ b/plugin/__init__.py @@ -1,3 +1,3 @@ -# created at 15-6-27 +# created at 15-6-27 # coding=utf-8 __author__ = 'zhugl' diff --git a/plugin/wfactions.py b/plugin/wfactions.py index bad9c89..0434df6 100644 --- a/plugin/wfactions.py +++ b/plugin/wfactions.py @@ -1,4 +1,4 @@ -# created at 15-6-30 +# created at 15-6-30 # coding=utf-8 import logging __author__ = 'zhugl' @@ -15,7 +15,7 @@ class WorkflowAction(object): name = '' description = '' - def action(self,request,obj,node_config,operation=Operation.APPROVE): + def action(self, request, obj, node_config, operation=Operation.APPROVE): """ :param request: @@ -28,9 +28,9 @@ def action(self,request,obj,node_config,operation=Operation.APPROVE): class TestAction(WorkflowAction): name = 'action.test' - def action(self,request,obj,node_config,operation=Operation.APPROVE): + def action(self, request, obj, node_config, operation=Operation.APPROVE): logging.info('this is a workflow test action') - logging.info('request user is %s,current node is %s'%(request.user,node_config)) + logging.info('request user is %s,current node is %s' % (request.user, node_config)) class WorkflowActionManager(object): @@ -48,8 +48,8 @@ def __init__(self): WorkflowActionManager.registed = True @classmethod - def register(cls,action): + def register(cls, action): if cls.actions.get(action.name): - raise Exception('%s already exists,register failed'%action.name) - if issubclass(action,WorkflowAction): - WorkflowActionManager.actions[action.name] = action() \ No newline at end of file + raise Exception('%s already exists,register failed' % action.name) + if issubclass(action, WorkflowAction): + WorkflowActionManager.actions[action.name] = action() diff --git a/plugin/wfnodes.py b/plugin/wfnodes.py index ec6bca2..3ab79e5 100644 --- a/plugin/wfnodes.py +++ b/plugin/wfnodes.py @@ -1,4 +1,4 @@ -# created at 15-6-30 +# created at 15-6-30 # coding=utf-8 __author__ = 'zhugl' from workflow.models import Node @@ -11,7 +11,7 @@ class NextNodeHandler(object): name = '' description = '' - def handle(self,request,obj,node_config): + def handle(self, request, obj, node_config): """ :param request: @@ -26,8 +26,8 @@ class TestHandler(NextNodeHandler): name = 'project.budge.gt.10000' description = '预算金额大于10000，由总经理审批' - def handle(self,request,obj,node_config): - budget = getattr(obj,'budget',None) + def handle(self, request, obj, node_config): + budget = getattr(obj, 'budget', None) if budget and budget > 10000: return Node.objects.filter(id=7).all() @@ -47,8 +47,8 @@ def __init__(self): NextNodeManager.registed = True @classmethod - def register(cls,handler): + def register(cls, handler): if cls.handlers.get(handler.name): - raise Exception('%s already exists,register failed'%handler.name) - if issubclass(handler,NextNodeHandler): + raise Exception('%s already exists,register failed' % handler.name) + if issubclass(handler, NextNodeHandler): NextNodeManager.handlers[handler.name] = handler() diff --git a/plugin/wfusers.py b/plugin/wfusers.py index 4dc6b45..7d9aad0 100644 --- a/plugin/wfusers.py +++ b/plugin/wfusers.py @@ -1,4 +1,4 @@ -# created at 15-6-30 +# created at 15-6-30 # coding=utf-8 __author__ = 'zhugl' @@ -10,7 +10,7 @@ class NextUserHandler(object): name = '' description = '' - def handle(self,request,obj,node_config): + def handle(self, request, obj, node_config): """ :param request: @@ -28,10 +28,10 @@ class UpPosition(NextUserHandler): """ name = 'up.position.user' - def handle(self,request,obj,node_config): - from basedata.models import Employee,Position + def handle(self, request, obj, node_config): + from basedata.models import Employee, Position emp_query = Employee.objects.filter(user=request.user) - if emp_query.count()>0: + if emp_query.count() > 0: emp = emp_query.all() parent = [] for e in emp: @@ -60,8 +60,8 @@ def __init__(self): NextUserManager.registed = True @classmethod - def register(cls,handler): + def register(cls, handler): if cls.handlers.get(handler.name): - raise Exception('%s already exists,register failed'%handler.name) - if issubclass(handler,NextUserHandler): - NextUserManager.handlers[handler.name] = handler() \ No newline at end of file + raise Exception('%s already exists,register failed' % handler.name) + if issubclass(handler, NextUserHandler): + NextUserManager.handlers[handler.name] = handler() diff --git a/plugin/xls.py b/plugin/xls.py index 4e180bd..566f961 100644 --- a/plugin/xls.py +++ b/plugin/xls.py @@ -10,7 +10,7 @@ class Handler(object): name = '' - def handle(self,obj,f): + def handle(self, obj, f): pass @@ -20,31 +20,31 @@ class OPSHandler(Handler): """ name = 'OPS' - def handle(self,obj,f): + def handle(self, obj, f): if f and f.name.endswith('.xls'): - path = os.path.join(settings.MEDIA_ROOT,f.name) + path = os.path.join(settings.MEDIA_ROOT, f.name) workbook = xlrd.open_workbook(path) for sheet in workbook.sheets(): if sheet.name == u'部门' or sheet.name == 'department': - self.department(obj,sheet) + self.department(obj, sheet) elif sheet.name == u'岗位' or sheet.name == 'position': - self.position(obj,sheet) + self.position(obj, sheet) elif sheet.name == u'职员' or sheet.name == 'employee': - self.stuff(obj,sheet) + self.stuff(obj, sheet) - def department(self,obj,sheet): + def department(self, obj, sheet): from organ.models import OrgUnit row_count = sheet.nrows if obj.is_clear: OrgUnit.objects.update(end=datetime.date.today()) - for row_index in range(1,row_count): + for row_index in range(1, row_count): row = sheet.row_values(row_index) weight = 99 if row[6]: weight = row[6] - OrgUnit.objects.create(code=row[0],name=row[1],short=row[2],pinyin=row[3],begin=datetime.date.today(), - end=datetime.date(9999,12,31),weight=weight) - for row_index in range(1,row_count): + OrgUnit.objects.create(code=row[0], name=row[1], short=row[2], pinyin=row[3], begin=datetime.date.today(), + end=datetime.date(9999, 12, 31), weight=weight) + for row_index in range(1, row_count): row = sheet.row_values(row_index) if len(row[4]) > 0: try: @@ -53,50 +53,50 @@ def department(self,obj,sheet): except Exception: pass - def position(self,obj,sheet): - from organ.models import Position,OrgUnit + def position(self, obj, sheet): + from organ.models import Position, OrgUnit row_count = sheet.nrows if obj.is_clear: Position.objects.update(end=datetime.date.today()) - for row_index in range(1,row_count): + for row_index in range(1, row_count): row = sheet.row_values(row_index) depart = None if len(row[4]) > 0: try: - depart = OrgUnit.objects.filter(code=row[4],end__gt=datetime.date.today()).all()[0] + depart = OrgUnit.objects.filter(code=row[4], end__gt=datetime.date.today()).all()[0] except Exception: pass weight = 99 if row[6]: weight = row[6] - Position.objects.create(code=row[0],name=row[1],unit=depart,begin=datetime.date.today(), - end=datetime.date(9999,12,31),weight=weight) - for row_index in range(1,row_count): + Position.objects.create(code=row[0], name=row[1], unit=depart, begin=datetime.date.today(), + end=datetime.date(9999, 12, 31), weight=weight) + for row_index in range(1, row_count): row = sheet.row_values(row_index) if len(row[2]) > 0: try: - parent = Position.objects.filter(code=row[2],end__gt=datetime.date.today()).all()[0] + parent = Position.objects.filter(code=row[2], end__gt=datetime.date.today()).all()[0] Position.objects.filter(code=row[0]).update(parent=parent) except Exception: pass - def stuff(self,obj,sheet): + def stuff(self, obj, sheet): from organ.models import Position from basedata.models import Employee - from django.contrib.auth.models import User,Group + from django.contrib.auth.models import User, Group row_count = sheet.nrows try: group = Group.objects.get_by_natural_key(u'职员') except Exception: pass - for row_index in range(1,row_count): + for row_index in range(1, row_count): row = sheet.row_values(row_index) - position = Position.objects.filter(code=row[8],end__gt=datetime.date.today()).all()[0] + position = Position.objects.filter(code=row[8], end__gt=datetime.date.today()).all()[0] username = row[10] email = row[11] password = row[4][-6:] if position is None: - raise Exception(u'职员%s-%s未分配岗位，或者您选择的岗位已失效，不可被引用'%(row[0],row[1])) + raise Exception(u'职员%s-%s未分配岗位，或者您选择的岗位已失效，不可被引用' % (row[0], row[1])) try: employee = Employee.objects.get(code=row[0]) if employee.position.code == row[8]: @@ -105,13 +105,13 @@ def stuff(self,obj,sheet): employee.position = position employee.save() except Exception: - employee = Employee.objects.create(code=row[0],name=row[1],pinyin=row[2],gender=row[3],idcard=row[4], - birthday=row[5],workday=row[6],startday=row[7],position=position) + employee = Employee.objects.create(code=row[0], name=row[1], pinyin=row[2], gender=row[3], idcard=row[4], + birthday=row[5], workday=row[6], startday=row[7], position=position) if username: try: user = User.objects.get_by_natural_key(username) except Exception: - user = User.objects.create_user(username=username,password=password) + user = User.objects.create_user(username=username, password=password) user.is_staff = True user.is_active = True user.first_name = row[1] @@ -130,10 +130,10 @@ class UserHandler(Handler): """ name = 'admin.user' - def handle(self,obj,f): - from django.contrib.auth.models import User,Group + def handle(self, obj, f): + from django.contrib.auth.models import User, Group if f and f.name.endswith('.xls'): - path = os.path.join(settings.MEDIA_ROOT,f.name) + path = os.path.join(settings.MEDIA_ROOT, f.name) workbook = xlrd.open_workbook(path) sheet = workbook.sheet_by_index(0) row_count = sheet.nrows @@ -142,7 +142,7 @@ def handle(self,obj,f): except Exception: pass - for row_index in range(2,row_count): + for row_index in range(2, row_count): row = sheet.row_values(row_index) username = row[0] password = row[1] @@ -154,7 +154,7 @@ def handle(self,obj,f): try: user = User.objects.get_by_natural_key(username) except Exception: - user = User.objects.create_user(username=username,password=password,email=email) + user = User.objects.create_user(username=username, password=password, email=email) user.is_staff = True user.is_active = True user.last_name = last_name @@ -175,9 +175,8 @@ def __init__(self): ExcelManager.register(UserHandler) @classmethod - def register(cls,handler): + def register(cls, handler): if cls.handlers.get(handler.name): - raise Exception('%s already exists,register failed'%handler.name) - if issubclass(handler,Handler): + raise Exception('%s already exists,register failed' % handler.name) + if issubclass(handler, Handler): ExcelManager.handlers[handler.name] = handler() - diff --git a/purchase/admin.py b/purchase/admin.py index 946dcbf..8dcdc16 100644 --- a/purchase/admin.py +++ b/purchase/admin.py @@ -1,12 +1,12 @@ from django.contrib import admin from common import generic -from purchase.models import PurchaseOrder,POItem,Invoice,Payment -from basedata.models import Partner,BankAccount +from purchase.models import PurchaseOrder, POItem, Invoice, Payment +from basedata.models import Partner, BankAccount class POItemInline(admin.TabularInline): model = POItem - fields = ('material', 'measure','price', 'cnt', 'tax', 'discount_price') + fields = ('material', 'measure', 'price', 'cnt', 'tax', 'discount_price') raw_id_fields = ['material'] def get_extra(self, request, obj=None, **kwargs): @@ -22,14 +22,23 @@ class PurchaseOrderAdmin(generic.BOAdmin): """ CODE_PREFIX = 'CG' CODE_NUMBER_WIDTH = 5 - list_display = ['code','title','order_date','partner','amount','discount_amount','payed_amount','invoice_amount','status'] - list_display_links = ['code','title'] + list_display = [ + 'code', + 'title', + 'order_date', + 'partner', + 'amount', + 'discount_amount', + 'payed_amount', + 'invoice_amount', + 'status'] + list_display_links = ['code', 'title'] raw_id_fields = ['partner'] fields = ( - ('code','partner'),('order_date','arrive_date'), - ('title','status',),('description',),('amount','discount_amount'),('attach',), + ('code', 'partner'), ('order_date', 'arrive_date'), + ('title', 'status',), ('description',), ('amount', 'discount_amount'), ('attach',), ) - readonly_fields = ['status','amount'] + readonly_fields = ['status', 'amount'] inlines = [POItemInline] date_hierarchy = 'begin' @@ -39,52 +48,53 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No obj = PurchaseOrder.objects.get(id=object_id) if obj.status == '99': extra_context.update(dict(readonly=True)) - return super(PurchaseOrderAdmin,self).changeform_view(request,object_id,form_url,extra_context) + return super(PurchaseOrderAdmin, self).changeform_view(request, object_id, form_url, extra_context) def get_changeform_initial_data(self, request): import datetime begin = datetime.date.today() end = begin + datetime.timedelta(30) - return {'order_date':begin,'arrive_date':end} + return {'order_date': begin, 'arrive_date': end} class PurchaseItemAdmin(generic.BOAdmin): - list_display = ['po','vender','material','cnt','price','tax'] - readonly_fields = ['po','material','cnt','price','tax'] + list_display = ['po', 'vender', 'material', 'cnt', 'price', 'tax'] + readonly_fields = ['po', 'material', 'cnt', 'price', 'tax'] def get_queryset(self, request): return POItem.objects.filter(left_cnt__gt=0) class InvoiceAdmin(generic.BOAdmin): - list_display = ['code','number','vo_date','po','partner','po_amount','vo_amount'] - readonly_fields = ['partner','po_amount'] + list_display = ['code', 'number', 'vo_date', 'po', 'partner', 'po_amount', 'vo_amount'] + readonly_fields = ['partner', 'po_amount'] raw_id_fields = ['po'] - search_fields = ['po__code','partner__name'] + search_fields = ['po__code', 'partner__name'] date_hierarchy = 'begin' fields = ( - ('vo_date',),('po',),('po_amount','partner',),('code',),('number',),('vo_amount',),('file',) + ('vo_date',), ('po',), ('po_amount', 'partner',), ('code',), ('number',), ('vo_amount',), ('file',) ) class PaymentAdmin(generic.BOAdmin): CODE_PREFIX = 'PY' CODE_NUMBER_WIDTH = 4 - list_display = ['code','py_date','po','partner','po_amount','py_amount'] - readonly_fields = ['partner','po_amount'] + list_display = ['code', 'py_date', 'po', 'partner', 'po_amount', 'py_amount'] + readonly_fields = ['partner', 'po_amount'] raw_id_fields = ['po'] - search_fields = ['po__code','partner__name'] + search_fields = ['po__code', 'partner__name'] fields = ( - ('py_date','code',),('po',),('partner','po_amount',),('py_amount',),('bank',),('response_code'),('memo',) + ('py_date', 'code',), ('po',), ('partner', 'po_amount',), ('py_amount',), ('bank',), ('response_code'), ('memo',) ) date_hierarchy = 'begin' def formfield_for_foreignkey(self, db_field, request=None, **kwargs): if db_field.name == 'bank': kwargs['queryset'] = BankAccount.objects.exclude(org__exact=None) - return super(PaymentAdmin,self).formfield_for_foreignkey(db_field,request,**kwargs) + return super(PaymentAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) -admin.site.register(PurchaseOrder,PurchaseOrderAdmin) -admin.site.register(POItem,PurchaseItemAdmin) -admin.site.register(Invoice,InvoiceAdmin) -admin.site.register(Payment,PaymentAdmin) + +admin.site.register(PurchaseOrder, PurchaseOrderAdmin) +admin.site.register(POItem, PurchaseItemAdmin) +admin.site.register(Invoice, InvoiceAdmin) +admin.site.register(Payment, PaymentAdmin) diff --git a/purchase/apps.py b/purchase/apps.py index e6efba6..25ad169 100644 --- a/purchase/apps.py +++ b/purchase/apps.py @@ -1,4 +1,4 @@ -# created at 15-5-23 +# created at 15-5-23 # coding=utf-8 __author__ = 'zhugl' diff --git a/purchase/models.py b/purchase/models.py index 0484cf8..3912409 100644 --- a/purchase/models.py +++ b/purchase/models.py @@ -13,7 +13,7 @@ from common import generic from common import const from selfhelp.models import WOItem -from basedata.models import Material,Organization,Partner,Measure,BankAccount +from basedata.models import Material, Organization, Partner, Measure, BankAccount class PurchaseOrder(generic.BO): @@ -28,36 +28,47 @@ class PurchaseOrder(generic.BO): ('99', _("ALREADY STOCK IN")), ) index_weight = 1 - code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - partner = models.ForeignKey(Partner,verbose_name=_("partner"),limit_choices_to={"partner_type":"S"},on_delete=models.CASCADE) + code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + partner = models.ForeignKey( + Partner, + verbose_name=_("partner"), + limit_choices_to={ + "partner_type": "S"}, + on_delete=models.CASCADE) order_date = models.DateField(_("order date")) arrive_date = models.DateField(_("arrive date")) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) - title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) - description = models.TextField(_("description"),blank=True,null=True) - user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) - status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) - amount = models.DecimalField(_("money amount"),max_digits=12,decimal_places=2,blank=True,null=True,default=0.00) - discount_amount = models.DecimalField(_("discount amount"),max_digits=12,decimal_places=2,blank=True,null=True,default=0.00) - entry_status = models.BooleanField(_("entry status"),default=0) - entry_time = models.DateTimeField(_("entry time"),blank=True,null=True) - attach = models.FileField(_('attach'),blank=True,null=True,help_text=u'您可导入采购明细，模板请参考文档FD0008') + org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + description = models.TextField(_("description"), blank=True, null=True) + user = models.ForeignKey(User, verbose_name=_("user"), blank=True, null=True, on_delete=models.CASCADE) + status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) + amount = models.DecimalField(_("money amount"), max_digits=12, decimal_places=2, blank=True, null=True, default=0.00) + discount_amount = models.DecimalField( + _("discount amount"), + max_digits=12, + decimal_places=2, + blank=True, + null=True, + default=0.00) + entry_status = models.BooleanField(_("entry status"), default=0) + entry_time = models.DateTimeField(_("entry time"), blank=True, null=True) + attach = models.FileField(_('attach'), blank=True, null=True, help_text=u'您可导入采购明细，模板请参考文档FD0008') def __unicode__(self): - return u'%s %s' % (self.code,self.title) + return u'%s %s' % (self.code, self.title) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): - super(PurchaseOrder,self).save(force_insert,force_update,using,update_fields) + super(PurchaseOrder, self).save(force_insert, force_update, using, update_fields) if self.discount_amount > 0: sql = 'UPDATE purchase_poitem a SET a.discount_price = ' \ 'a.price-((SELECT discount_amount/amount FROM purchase_purchaseorder WHERE id=%s)*a.amount/a.cnt) WHERE a.po_id = %s' - params = [self.id,self.id] - generic.update(sql,params) + params = [self.id, self.id] + generic.update(sql, params) item_count = POItem.objects.filter(po=self).count() if self.attach and item_count == 0: - path = os.path.join(settings.MEDIA_ROOT,self.attach.name) + path = os.path.join(settings.MEDIA_ROOT, self.attach.name) workbook = xlrd.open_workbook(path) sheet = workbook.sheet_by_index(0) row_count = sheet.nrows @@ -80,20 +91,20 @@ def save(self, force_insert=False, force_update=False, using=None, try: measure = Measure.objects.get(code=row[4]) except Exception: - measure = Measure.objects.create(code=row[4],name=force_text(row[5])) + measure = Measure.objects.create(code=row[4], name=force_text(row[5])) try: material = Material.objects.get(code=row[0]) except Exception: - material = Material(code=row[0],name=force_text(row[1]),spec=force_text(row[2])) + material = Material(code=row[0], name=force_text(row[1]), spec=force_text(row[2])) material.purchase_price = row[6] material.save() - amount = decimal.Decimal(row[6])*decimal.Decimal(row[7]) - POItem.objects.create(po=self,material=material,measure=measure,cnt=row[7],price=row[6],amount=amount) + amount = decimal.Decimal(row[6]) * decimal.Decimal(row[7]) + POItem.objects.create(po=self, material=material, measure=measure, cnt=row[7], price=row[6], amount=amount) total_amount += amount sql = 'update purchase_purchaseorder set amount = %s where id=%s' - params = [total_amount,self.id] - generic.update(sql,params) + params = [total_amount, self.id] + generic.update(sql, params) def invoice_amount(self): total = Invoice.objects.filter(po=self).aggregate(Sum('vo_amount')).get('vo_amount__sum') or 0.00 @@ -115,20 +126,25 @@ class POItem(models.Model): """ index_weight = 2 - po = models.ForeignKey(PurchaseOrder,verbose_name=_("purchase order"),on_delete=models.CASCADE) - material = models.ForeignKey(Material,verbose_name=_("material"),limit_choices_to={"is_virtual":"0"},on_delete=models.CASCADE) - measure = models.ForeignKey(Measure,verbose_name=_("measure"),blank=True,null=True,on_delete=models.CASCADE) - price = models.DecimalField(_("price"),max_digits=12,decimal_places=4,blank=True,null=True) - cnt = models.DecimalField(_("count"),max_digits=12,decimal_places=4,blank=True,null=True) - discount_price = models.DecimalField(_("discount price"),max_digits=12,decimal_places=4,blank=True,null=True) - amount = models.DecimalField(_("money of amount"),max_digits=12,decimal_places=2,blank=True,null=True) - discount_amount = models.DecimalField(_("discount amount"),max_digits=12,decimal_places=2,blank=True,null=True) - tax = models.CharField(_("tax rate"),max_length=const.DB_CHAR_CODE_6,choices=const.get_value_list('S052'),default='0.00') - woitem = models.ForeignKey(WOItem,verbose_name=_("wo item"),blank=True,null=True,on_delete=models.CASCADE) - is_in_stock = models.BooleanField(_("is in stock"),default=0) - in_stock_time = models.DateTimeField(_("execute time"),blank=True,null=True) - entry_cnt = models.DecimalField(_("entry count"),max_digits=12,decimal_places=4,blank=True,null=True) - left_cnt = models.DecimalField(_("left count"),max_digits=12,decimal_places=4,blank=True,null=True) + po = models.ForeignKey(PurchaseOrder, verbose_name=_("purchase order"), on_delete=models.CASCADE) + material = models.ForeignKey( + Material, + verbose_name=_("material"), + limit_choices_to={ + "is_virtual": "0"}, + on_delete=models.CASCADE) + measure = models.ForeignKey(Measure, verbose_name=_("measure"), blank=True, null=True, on_delete=models.CASCADE) + price = models.DecimalField(_("price"), max_digits=12, decimal_places=4, blank=True, null=True) + cnt = models.DecimalField(_("count"), max_digits=12, decimal_places=4, blank=True, null=True) + discount_price = models.DecimalField(_("discount price"), max_digits=12, decimal_places=4, blank=True, null=True) + amount = models.DecimalField(_("money of amount"), max_digits=12, decimal_places=2, blank=True, null=True) + discount_amount = models.DecimalField(_("discount amount"), max_digits=12, decimal_places=2, blank=True, null=True) + tax = models.CharField(_("tax rate"), max_length=const.DB_CHAR_CODE_6, choices=const.get_value_list('S052'), default='0.00') + woitem = models.ForeignKey(WOItem, verbose_name=_("wo item"), blank=True, null=True, on_delete=models.CASCADE) + is_in_stock = models.BooleanField(_("is in stock"), default=0) + in_stock_time = models.DateTimeField(_("execute time"), blank=True, null=True) + entry_cnt = models.DecimalField(_("entry count"), max_digits=12, decimal_places=4, blank=True, null=True) + left_cnt = models.DecimalField(_("left count"), max_digits=12, decimal_places=4, blank=True, null=True) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): @@ -143,13 +159,13 @@ def save(self, force_insert=False, force_update=False, using=None, self.left_cnt -= self.entry_cnt else: self.left_cnt = self.cnt - super(POItem,self).save(force_insert,force_update,using,update_fields) + super(POItem, self).save(force_insert, force_update, using, update_fields) self.material.purchase_price = self.price self.material.save() sql = 'UPDATE purchase_purchaseorder SET amount = (SELECT SUM(a.price*a.cnt) AS amount FROM ' \ - 'purchase_poitem a WHERE a.po_id = %s) WHERE id = %s' - params = [self.po.id,self.po.id] - generic.update(sql,params) + 'purchase_poitem a WHERE a.po_id = %s) WHERE id = %s' + params = [self.po.id, self.po.id] + generic.update(sql, params) def vender(self): return u'%s' % (self.po.partner) @@ -166,24 +182,24 @@ class Invoice(generic.BO): 采购发票 """ index_weight = 4 - vo_date = models.DateField(_("invoice date"),blank=True,null=True,default=datetime.date.today) - code = models.CharField(_("invoice code"),max_length=const.DB_CHAR_NAME_20) - number = models.CharField(_("invoice number"),max_length=const.DB_CHAR_NAME_20) - po = models.ForeignKey(PurchaseOrder,verbose_name=_("purchase order"),on_delete=models.CASCADE) - partner = models.ForeignKey(Partner,verbose_name=_("partner"),blank=True,null=True,on_delete=models.CASCADE) - po_amount = models.DecimalField(_("po amount"),max_digits=14,decimal_places=4,blank=True,null=True) - vo_amount = models.DecimalField(_("invoice amount"),max_digits=14,decimal_places=4) - file = models.FileField(_("invoice file"),upload_to='invoice',blank=True,null=True) + vo_date = models.DateField(_("invoice date"), blank=True, null=True, default=datetime.date.today) + code = models.CharField(_("invoice code"), max_length=const.DB_CHAR_NAME_20) + number = models.CharField(_("invoice number"), max_length=const.DB_CHAR_NAME_20) + po = models.ForeignKey(PurchaseOrder, verbose_name=_("purchase order"), on_delete=models.CASCADE) + partner = models.ForeignKey(Partner, verbose_name=_("partner"), blank=True, null=True, on_delete=models.CASCADE) + po_amount = models.DecimalField(_("po amount"), max_digits=14, decimal_places=4, blank=True, null=True) + vo_amount = models.DecimalField(_("invoice amount"), max_digits=14, decimal_places=4) + file = models.FileField(_("invoice file"), upload_to='invoice', blank=True, null=True) def __unicode__(self): - return u"%s %s" % (self.code,self.partner) + return u"%s %s" % (self.code, self.partner) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): if self.po: self.partner = self.po.partner self.po_amount = self.po.amount - super(Invoice,self).save(force_insert,force_update,using,update_fields) + super(Invoice, self).save(force_insert, force_update, using, update_fields) class Meta: verbose_name = _("Invoice") @@ -195,27 +211,27 @@ class Payment(generic.BO): 采购付款 """ index_weight = 3 - py_date = models.DateField(_("pay date"),blank=True,null=True,default=datetime.date.today) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) - code = models.CharField(_("pay code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - po = models.ForeignKey(PurchaseOrder,verbose_name=_("purchase order"),on_delete=models.CASCADE) - partner = models.ForeignKey(Partner,verbose_name=_("partner"),blank=True,null=True,on_delete=models.CASCADE) - po_amount = models.DecimalField(_("po amount"),max_digits=14,decimal_places=4,blank=True,null=True) - py_amount = models.DecimalField(_("pay amount"),max_digits=14,decimal_places=4) - bank = models.ForeignKey(BankAccount,verbose_name=_("bank account"),blank=True,null=True,on_delete=models.CASCADE) - response_code = models.CharField(_("response code"),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) - memo = models.TextField(_("memo"),blank=True,null=True) + py_date = models.DateField(_("pay date"), blank=True, null=True, default=datetime.date.today) + org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + code = models.CharField(_("pay code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + po = models.ForeignKey(PurchaseOrder, verbose_name=_("purchase order"), on_delete=models.CASCADE) + partner = models.ForeignKey(Partner, verbose_name=_("partner"), blank=True, null=True, on_delete=models.CASCADE) + po_amount = models.DecimalField(_("po amount"), max_digits=14, decimal_places=4, blank=True, null=True) + py_amount = models.DecimalField(_("pay amount"), max_digits=14, decimal_places=4) + bank = models.ForeignKey(BankAccount, verbose_name=_("bank account"), blank=True, null=True, on_delete=models.CASCADE) + response_code = models.CharField(_("response code"), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) + memo = models.TextField(_("memo"), blank=True, null=True) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): if self.po: self.partner = self.po.partner self.po_amount = self.po.amount - super(Payment,self).save(force_insert,force_update,using,update_fields) + super(Payment, self).save(force_insert, force_update, using, update_fields) def __unicode__(self): - return u"%s %s" % (self.code,self.partner) + return u"%s %s" % (self.code, self.partner) class Meta: verbose_name = _("Payment") - verbose_name_plural = _("Payment") \ No newline at end of file + verbose_name_plural = _("Payment") diff --git a/sale/admin.py b/sale/admin.py index 86264ee..224c716 100644 --- a/sale/admin.py +++ b/sale/admin.py @@ -1,14 +1,14 @@ from django.contrib import admin from common import generic -from sale.models import SaleOrder,SaleItem,PaymentCollection,OfferSheet,OfferItem -from basedata.models import Measure,BankAccount +from sale.models import SaleOrder, SaleItem, PaymentCollection, OfferSheet, OfferItem +from basedata.models import Measure, BankAccount from common import generic import datetime class SaleItemInline(admin.TabularInline): model = SaleItem - fields = ('material','measure','sale_price','discount_price','cnt','tax') + fields = ('material', 'measure', 'sale_price', 'discount_price', 'cnt', 'tax') raw_id_fields = ['material'] def get_extra(self, request, obj=None, **kwargs): @@ -20,7 +20,7 @@ def get_extra(self, request, obj=None, **kwargs): class OfferItemInline(admin.TabularInline): model = OfferItem - fields = ('material','brand','measure','cost_price','sale_price','discount_price','cnt','tax') + fields = ('material', 'brand', 'measure', 'cost_price', 'sale_price', 'discount_price', 'cnt', 'tax') raw_id_fields = ['material'] readonly_fields = ['brand'] @@ -35,37 +35,37 @@ class SaleOrderAdmin(generic.BOAdmin): CODE_NUMBER_WIDTH = 5 CODE_PREFIX = 'SO' inlines = [SaleItemInline] - list_display = ['code','title','order_date','partner','amount','collection_amount'] - list_display_links = ['code','title'] - raw_id_fields = ['partner','user','org'] + list_display = ['code', 'title', 'order_date', 'partner', 'amount', 'collection_amount'] + list_display_links = ['code', 'title'] + raw_id_fields = ['partner', 'user', 'org'] fields = ( - ('code','org',),('title','invoice_type',),('partner','user',),('order_date','deliver_date',), - ('contact','phone',),('deliver_address','fax',),('description',),('amount','discount_amount','status') + ('code', 'org',), ('title', 'invoice_type',), ('partner', 'user',), ('order_date', 'deliver_date',), + ('contact', 'phone',), ('deliver_address', 'fax',), ('description',), ('amount', 'discount_amount', 'status') ) - readonly_fields = ['amount','status'] + readonly_fields = ['amount', 'status'] date_hierarchy = 'begin' def save_model(self, request, obj, form, change): if obj: obj.user = request.user - super(SaleOrderAdmin,self).save_model(request,obj,form,change) + super(SaleOrderAdmin, self).save_model(request, obj, form, change) def get_changeform_initial_data(self, request): today = datetime.datetime.today() - deadline = today+datetime.timedelta(days=30) - return {'order_date':today,'deliver_date':deadline} + deadline = today + datetime.timedelta(days=30) + return {'order_date': today, 'deliver_date': deadline} class OfferSheetAdmin(generic.BOAdmin): CODE_NUMBER_WIDTH = 5 CODE_PREFIX = 'BJ' inlines = [OfferItemInline] - list_display = ['code','title','offer_date','partner','amount'] - list_display_links = ['code','title'] - raw_id_fields = ['partner','user','org'] + list_display = ['code', 'title', 'offer_date', 'partner', 'amount'] + list_display_links = ['code', 'title'] + raw_id_fields = ['partner', 'user', 'org'] fields = ( - ('code','org',),('partner','user',),('offer_date','deliver_date',),('title',), - ('description',),('amount','discount_amount',),('attach'), + ('code', 'org',), ('partner', 'user',), ('offer_date', 'deliver_date',), ('title',), + ('description',), ('amount', 'discount_amount',), ('attach'), ) readonly_fields = ['amount'] date_hierarchy = 'begin' @@ -73,32 +73,33 @@ class OfferSheetAdmin(generic.BOAdmin): def save_model(self, request, obj, form, change): if obj: obj.user = request.user - super(OfferSheetAdmin,self).save_model(request,obj,form,change) + super(OfferSheetAdmin, self).save_model(request, obj, form, change) def get_changeform_initial_data(self, request): today = datetime.datetime.today() - deadline = today+datetime.timedelta(days=30) - return {'offer_date':today,'deliver_date':deadline} + deadline = today + datetime.timedelta(days=30) + return {'offer_date': today, 'deliver_date': deadline} class PaymentCollectionAdmin(generic.BOAdmin): CODE_NUMBER_WIDTH = 4 CODE_PREFIX = 'CP' - list_display = ['code','so','partner','order_amount','collection_date','collection_amount'] + list_display = ['code', 'so', 'partner', 'order_amount', 'collection_date', 'collection_amount'] fields = ( - ('code',),('collection_date',),('so',),('partner',),('order_amount','collection_amount',),('bank',), + ('code',), ('collection_date',), ('so',), ('partner',), ('order_amount', 'collection_amount',), ('bank',), ('memo',) ) - raw_id_fields = ['so','partner'] + raw_id_fields = ['so', 'partner'] readonly_fields = ['order_amount'] - list_display_links = ['code','so'] + list_display_links = ['code', 'so'] date_hierarchy = 'begin' def formfield_for_foreignkey(self, db_field, request=None, **kwargs): - if db_field.name=='bank': + if db_field.name == 'bank': kwargs['queryset'] = BankAccount.objects.exclude(org__exact=None) - return super(PaymentCollectionAdmin,self).formfield_for_foreignkey(db_field,request,**kwargs) + return super(PaymentCollectionAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) -admin.site.register(SaleOrder,SaleOrderAdmin) -admin.site.register(PaymentCollection,PaymentCollectionAdmin) -admin.site.register(OfferSheet,OfferSheetAdmin) + +admin.site.register(SaleOrder, SaleOrderAdmin) +admin.site.register(PaymentCollection, PaymentCollectionAdmin) +admin.site.register(OfferSheet, OfferSheetAdmin) diff --git a/sale/apps.py b/sale/apps.py index 052b88f..d15cdaf 100644 --- a/sale/apps.py +++ b/sale/apps.py @@ -1,4 +1,4 @@ -# created at 15-5-23 +# created at 15-5-23 # coding=utf-8 __author__ = 'zhugl' diff --git a/sale/models.py b/sale/models.py index ce41dfa..0b21b6c 100644 --- a/sale/models.py +++ b/sale/models.py @@ -13,7 +13,7 @@ from django.utils.translation import ugettext_lazy as _ from common import generic from common import const -from basedata.models import Material,Project,Partner,Organization,Measure,BankAccount +from basedata.models import Material, Project, Partner, Organization, Measure, BankAccount class SaleOrder(generic.BO): @@ -28,38 +28,51 @@ class SaleOrder(generic.BO): ('99', _("ALREADY STOCK OUT")), ) index_weight = 2 - code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - partner = models.ForeignKey(Partner,verbose_name=_("partner"),limit_choices_to={"partner_type":"C"},on_delete=models.CASCADE) + code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + partner = models.ForeignKey( + Partner, + verbose_name=_("partner"), + limit_choices_to={ + "partner_type": "C"}, + on_delete=models.CASCADE) order_date = models.DateField(_("order date")) deliver_date = models.DateField(_("deliver date")) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) - title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) - description = models.TextField(_("memo"),blank=True,null=True) - contact = models.CharField(_("contacts"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - phone = models.CharField(_("phone"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - fax = models.CharField(_("fax"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - deliver_address = models.CharField(_("deliver address"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - invoice_type = models.CharField(_("invoice type"),max_length=const.DB_CHAR_CODE_6,choices=const.get_value_list('S053'),default='10') - - amount = models.DecimalField(_("money amount"),max_digits=12,decimal_places=2,blank=True,null=True,default=0.00) - discount_amount = models.DecimalField(_("discount amount"),max_digits=12,decimal_places=2,blank=True,null=True,default=0.00) - user = models.ForeignKey(User,verbose_name=_("sales man"),blank=True,null=True,on_delete=models.CASCADE) - status = models.CharField(_("status"),max_length=const.DB_CHAR_CODE_2,default='0',choices=STATUS) + org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + description = models.TextField(_("memo"), blank=True, null=True) + contact = models.CharField(_("contacts"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + phone = models.CharField(_("phone"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + fax = models.CharField(_("fax"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + deliver_address = models.CharField(_("deliver address"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + invoice_type = models.CharField(_("invoice type"), max_length=const.DB_CHAR_CODE_6, + choices=const.get_value_list('S053'), default='10') + + amount = models.DecimalField(_("money amount"), max_digits=12, decimal_places=2, blank=True, null=True, default=0.00) + discount_amount = models.DecimalField( + _("discount amount"), + max_digits=12, + decimal_places=2, + blank=True, + null=True, + default=0.00) + user = models.ForeignKey(User, verbose_name=_("sales man"), blank=True, null=True, on_delete=models.CASCADE) + status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) def __unicode__(self): - return u'%s %s' % (self.code,self.title) + return u'%s %s' % (self.code, self.title) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): - super(SaleOrder,self).save(force_insert,force_update,using,update_fields) + super(SaleOrder, self).save(force_insert, force_update, using, update_fields) if self.discount_amount > 0: sql = 'UPDATE sale_saleitem a SET a.discount_price = a.sale_price - ' \ '((SELECT discount_amount/amount FROM sale_saleorder WHERE id = %s) * (a.sale_price*a.cnt)/a.cnt) WHERE a.master_id = %s' - params = [self.id,self.id] - generic.update(sql,params) + params = [self.id, self.id] + generic.update(sql, params) def collection_amount(self): - return PaymentCollection.objects.filter(so=self).aggregate(Sum('collection_amount')).get('collection_amount__sum') or 0.00 + return PaymentCollection.objects.filter(so=self).aggregate( + Sum('collection_amount')).get('collection_amount__sum') or 0.00 collection_amount.short_description = _('collection amount') @@ -72,29 +85,38 @@ class SaleItem(models.Model): """ 订单明细 """ - master = models.ForeignKey(SaleOrder,on_delete=models.CASCADE) - material = models.ForeignKey(Material,verbose_name=_("material"),limit_choices_to={"is_virtual":"0",'can_sale':'1'},blank=True,null=True,on_delete=models.CASCADE) - measure = models.ForeignKey(Measure,verbose_name=_("measure"),blank=True,null=True,on_delete=models.CASCADE) - cnt = models.DecimalField(_("count"),max_digits=14,decimal_places=4) - stock_price = models.DecimalField(_("stock price"),max_digits=14,decimal_places=4,blank=True,null=True) - sale_price = models.DecimalField(_("sale price"),max_digits=14,decimal_places=4,blank=True,null=True) - discount_price = models.DecimalField(_("discount price"),max_digits=14,decimal_places=4,blank=True,null=True) - tax = models.CharField(_("tax rate"),max_length=const.DB_CHAR_CODE_6,choices=const.get_value_list('S052'),default='0.00') - create_time = models.DateTimeField(_("create time"),auto_now_add=True) - status = models.BooleanField(_("executed"),default=0) - event_time = models.DateTimeField(_("event time"),blank=True,null=True) + master = models.ForeignKey(SaleOrder, on_delete=models.CASCADE) + material = models.ForeignKey( + Material, + verbose_name=_("material"), + limit_choices_to={ + "is_virtual": "0", + 'can_sale': '1'}, + blank=True, + null=True, + on_delete=models.CASCADE) + measure = models.ForeignKey(Measure, verbose_name=_("measure"), blank=True, null=True, on_delete=models.CASCADE) + cnt = models.DecimalField(_("count"), max_digits=14, decimal_places=4) + stock_price = models.DecimalField(_("stock price"), max_digits=14, decimal_places=4, blank=True, null=True) + sale_price = models.DecimalField(_("sale price"), max_digits=14, decimal_places=4, blank=True, null=True) + discount_price = models.DecimalField(_("discount price"), max_digits=14, decimal_places=4, blank=True, null=True) + tax = models.CharField(_("tax rate"), max_length=const.DB_CHAR_CODE_6, choices=const.get_value_list('S052'), default='0.00') + create_time = models.DateTimeField(_("create time"), auto_now_add=True) + status = models.BooleanField(_("executed"), default=0) + event_time = models.DateTimeField(_("event time"), blank=True, null=True) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): if self.material and self.material.measure.count() > 0: self.measure = self.material.measure.all()[0] if self.material.sale_price or self.material.stock_price: - self.sale_price = self.material.sale_price or self.material.stock_price*decimal.Decimal(1.17)/decimal.Decimal(0.6) - super(SaleItem,self).save(force_insert,force_update,using,update_fields) + self.sale_price = self.material.sale_price or self.material.stock_price * \ + decimal.Decimal(1.17) / decimal.Decimal(0.6) + super(SaleItem, self).save(force_insert, force_update, using, update_fields) sql = 'update sale_saleorder set amount = (select sum(sale_price*cnt) from sale_saleitem where master_id=%s) where id=%s' - params = [self.master.id,self.master.id] + params = [self.master.id, self.master.id] # print sql % (self.master.id,self.master.id) - generic.update(sql,params) + generic.update(sql, params) class Meta: verbose_name = _('order detail') @@ -106,18 +128,18 @@ class PaymentCollection(generic.BO): 销售回款 """ index_weight = 3 - collection_date = models.DateField(_("collection date"),blank=True,null=True,default=datetime.date.today) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) - code = models.CharField(_("collection code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - so = models.ForeignKey(SaleOrder,verbose_name=_("sale order"),on_delete=models.CASCADE) - partner = models.ForeignKey(Partner,verbose_name=_("partner"),blank=True,null=True,on_delete=models.CASCADE) - order_amount = models.DecimalField(_("order amount"),max_digits=14,decimal_places=4,blank=True,null=True) - collection_amount = models.DecimalField(_("collection amount"),max_digits=14,decimal_places=4) - bank = models.ForeignKey(BankAccount,verbose_name=_("bank account"),blank=True,null=True,on_delete=models.CASCADE) - memo = models.TextField(_("memo"),blank=True,null=True) + collection_date = models.DateField(_("collection date"), blank=True, null=True, default=datetime.date.today) + org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + code = models.CharField(_("collection code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + so = models.ForeignKey(SaleOrder, verbose_name=_("sale order"), on_delete=models.CASCADE) + partner = models.ForeignKey(Partner, verbose_name=_("partner"), blank=True, null=True, on_delete=models.CASCADE) + order_amount = models.DecimalField(_("order amount"), max_digits=14, decimal_places=4, blank=True, null=True) + collection_amount = models.DecimalField(_("collection amount"), max_digits=14, decimal_places=4) + bank = models.ForeignKey(BankAccount, verbose_name=_("bank account"), blank=True, null=True, on_delete=models.CASCADE) + memo = models.TextField(_("memo"), blank=True, null=True) def __unicode__(self): - return u'%s %s'%(self.code,self.so) + return u'%s %s' % (self.code, self.so) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): @@ -126,7 +148,7 @@ def save(self, force_insert=False, force_update=False, using=None, self.order_amount = self.so.amount if self.so.discount_amount > 0: self.order_amount -= self.so.discount_amount - super(PaymentCollection,self).save(force_insert,force_update,using,update_fields) + super(PaymentCollection, self).save(force_insert, force_update, using, update_fields) class Meta: verbose_name = _('Payment Collection') @@ -144,36 +166,52 @@ class OfferSheet(generic.BO): ('4', _("DROP")), ('9', _("APPROVED")), ) - code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - partner = models.ForeignKey(Partner,verbose_name=_("partner"),limit_choices_to={"partner_type":"C"},on_delete=models.CASCADE) + code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + partner = models.ForeignKey( + Partner, + verbose_name=_("partner"), + limit_choices_to={ + "partner_type": "C"}, + on_delete=models.CASCADE) offer_date = models.DateField(_("offer date")) deliver_date = models.DateField(_("deliver date")) - org = models.ForeignKey(Organization,verbose_name=_("organization"),blank=True,null=True,on_delete=models.CASCADE) - title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_40) - description = models.TextField(_("memo"),blank=True,null=True) + org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + description = models.TextField(_("memo"), blank=True, null=True) - amount = models.DecimalField(_("money amount"),max_digits=12,decimal_places=2,blank=True,null=True,default=0.00) - discount_amount = models.DecimalField(_("discount amount"),max_digits=12,decimal_places=2,blank=True,null=True,default=0.00) - user = models.ForeignKey(User,verbose_name=_("offer man"),blank=True,null=True,on_delete=models.CASCADE) + amount = models.DecimalField(_("money amount"), max_digits=12, decimal_places=2, blank=True, null=True, default=0.00) + discount_amount = models.DecimalField( + _("discount amount"), + max_digits=12, + decimal_places=2, + blank=True, + null=True, + default=0.00) + user = models.ForeignKey(User, verbose_name=_("offer man"), blank=True, null=True, on_delete=models.CASCADE) - attach = models.FileField(_('offer sheet file'),blank=True,null=True,upload_to='offer sheet',help_text=u'您可导入报价明细，模板请参考文档FD0006') - status = models.BooleanField(_("executed"),default=0) - event_time = models.DateTimeField(_("event time"),blank=True,null=True) + attach = models.FileField( + _('offer sheet file'), + blank=True, + null=True, + upload_to='offer sheet', + help_text=u'您可导入报价明细，模板请参考文档FD0006') + status = models.BooleanField(_("executed"), default=0) + event_time = models.DateTimeField(_("event time"), blank=True, null=True) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): import decimal - super(OfferSheet,self).save(force_insert,force_update,using,update_fields) + super(OfferSheet, self).save(force_insert, force_update, using, update_fields) if self.discount_amount > 0: sql = 'UPDATE sale_offeritem a SET a.discount_price = a.sale_price - ' \ '((SELECT discount_amount/amount FROM sale_offersheet WHERE id = %s) * (a.sale_price*a.cnt)/a.cnt) WHERE a.master_id = %s' - params = [self.id,self.id] + params = [self.id, self.id] # print sql % (self.id,self.id) - generic.update(sql,params) + generic.update(sql, params) item_count = OfferItem.objects.filter(master=self).count() if self.attach and item_count == 0: - path = os.path.join(settings.MEDIA_ROOT,self.attach.name) + path = os.path.join(settings.MEDIA_ROOT, self.attach.name) workbook = xlrd.open_workbook(path) sheet = workbook.sheet_by_index(0) row_count = sheet.nrows @@ -196,21 +234,28 @@ def save(self, force_insert=False, force_update=False, using=None, try: measure = Measure.objects.get(code=row[4]) except Exception: - measure = Measure.objects.create(code=row[4],name=force_text(row[5])) + measure = Measure.objects.create(code=row[4], name=force_text(row[5])) try: material = Material.objects.get(code=row[0]) except Exception: - material = Material(code=row[0],name=force_text(row[1]),spec=force_text(row[2])) + material = Material(code=row[0], name=force_text(row[1]), spec=force_text(row[2])) material.sale_price = row[6] material.purchase_price = row[7] material.save() - OfferItem.objects.create(master=self,material=material,measure=measure,cnt=row[8],brand=force_text(row[3]), - cost_price=row[7],sale_price=row[6]) - total_amount += decimal.Decimal(row[6])*decimal.Decimal(row[8]) + OfferItem.objects.create( + master=self, + material=material, + measure=measure, + cnt=row[8], + brand=force_text( + row[3]), + cost_price=row[7], + sale_price=row[6]) + total_amount += decimal.Decimal(row[6]) * decimal.Decimal(row[8]) sql = 'update sale_offersheet set amount = %s where id=%s' - params = [total_amount,self.id] - generic.update(sql,params) + params = [total_amount, self.id] + generic.update(sql, params) class Meta: verbose_name = _('offer sheet') @@ -221,32 +266,41 @@ class OfferItem(models.Model): """ 订单明细 """ - master = models.ForeignKey(OfferSheet,on_delete=models.CASCADE) - material = models.ForeignKey(Material,verbose_name=_("material"),limit_choices_to={"is_virtual":"0",'can_sale':'1'},blank=True,null=True,on_delete=models.CASCADE) - measure = models.ForeignKey(Measure,verbose_name=_("measure"),blank=True,null=True,on_delete=models.CASCADE) - cnt = models.DecimalField(_("count"),max_digits=14,decimal_places=4) - brand = models.CharField(_('brand'),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - cost_price = models.DecimalField(_("cost price"),max_digits=14,decimal_places=4,blank=True,null=True) - stock_price = models.DecimalField(_("stock price"),max_digits=14,decimal_places=4,blank=True,null=True) - sale_price = models.DecimalField(_("sale price"),max_digits=14,decimal_places=4,blank=True,null=True) - discount_price = models.DecimalField(_("discount price"),max_digits=14,decimal_places=4,blank=True,null=True) - tax = models.CharField(_("tax rate"),max_length=const.DB_CHAR_CODE_6,choices=const.get_value_list('S052'),default='0.00') - create_time = models.DateTimeField(_("create time"),auto_now_add=True) - status = models.BooleanField(_("executed"),default=0) - event_time = models.DateTimeField(_("event time"),blank=True,null=True) + master = models.ForeignKey(OfferSheet, on_delete=models.CASCADE) + material = models.ForeignKey( + Material, + verbose_name=_("material"), + limit_choices_to={ + "is_virtual": "0", + 'can_sale': '1'}, + blank=True, + null=True, + on_delete=models.CASCADE) + measure = models.ForeignKey(Measure, verbose_name=_("measure"), blank=True, null=True, on_delete=models.CASCADE) + cnt = models.DecimalField(_("count"), max_digits=14, decimal_places=4) + brand = models.CharField(_('brand'), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + cost_price = models.DecimalField(_("cost price"), max_digits=14, decimal_places=4, blank=True, null=True) + stock_price = models.DecimalField(_("stock price"), max_digits=14, decimal_places=4, blank=True, null=True) + sale_price = models.DecimalField(_("sale price"), max_digits=14, decimal_places=4, blank=True, null=True) + discount_price = models.DecimalField(_("discount price"), max_digits=14, decimal_places=4, blank=True, null=True) + tax = models.CharField(_("tax rate"), max_length=const.DB_CHAR_CODE_6, choices=const.get_value_list('S052'), default='0.00') + create_time = models.DateTimeField(_("create time"), auto_now_add=True) + status = models.BooleanField(_("executed"), default=0) + event_time = models.DateTimeField(_("event time"), blank=True, null=True) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): if self.material and self.material.measure.count() > 0: self.measure = self.material.measure.all()[0] if self.material.sale_price or self.material.stock_price: - self.sale_price = self.material.sale_price or self.material.stock_price*decimal.Decimal(1.17)/decimal.Decimal(0.6) - super(OfferItem,self).save(force_insert,force_update,using,update_fields) + self.sale_price = self.material.sale_price or self.material.stock_price * \ + decimal.Decimal(1.17) / decimal.Decimal(0.6) + super(OfferItem, self).save(force_insert, force_update, using, update_fields) sql = 'update sale_offersheet set amount = (select sum(sale_price*cnt) from sale_offeritem where master_id=%s) where id=%s' - params = [self.master.id,self.master.id] + params = [self.master.id, self.master.id] # print sql % (self.master.id,self.master.id) - generic.update(sql,params) + generic.update(sql, params) class Meta: verbose_name = _('offer detail') - verbose_name_plural = _('offer detail') \ No newline at end of file + verbose_name_plural = _('offer detail') diff --git a/selfhelp/admin.py b/selfhelp/admin.py index 26abc62..6171838 100644 --- a/selfhelp/admin.py +++ b/selfhelp/admin.py @@ -8,13 +8,13 @@ from django.utils.translation import ugettext_lazy as _ from common import generic from common import const -from basedata.models import Material,ExtraParam,Employee,Position -from selfhelp.models import WorkOrder,WOExtraValue,WOItem,Reimbursement,ReimbursementItem,Loan,Enroll,Feedback,Activity +from basedata.models import Material, ExtraParam, Employee, Position +from selfhelp.models import WorkOrder, WOExtraValue, WOItem, Reimbursement, ReimbursementItem, Loan, Enroll, Feedback, Activity class ParamValueInline(admin.TabularInline): model = WOExtraValue - fields = ('param_name','param_value') + fields = ('param_name', 'param_value') readonly_fields = ['param_name'] def formfield_for_foreignkey(self, db_field, request=None, **kwargs): @@ -25,7 +25,7 @@ def formfield_for_foreignkey(self, db_field, request=None, **kwargs): if instance: kwargs['queryset'] = ExtraParam.objects.filter(material=instance.service) - return super(ParamValueInline,self).formfield_for_foreignkey(db_field,request,**kwargs) + return super(ParamValueInline, self).formfield_for_foreignkey(db_field, request, **kwargs) def get_extra(self, request, obj=None, **kwargs): if obj: @@ -51,32 +51,32 @@ class WorkOrderAdmin(generic.BOAdmin): """ CODE_PREFIX = 'WO' CODE_NUMBER_WIDTH = 5 - list_display = ['code','begin','title','classification','business_domain','status'] - list_display_links = ['code','title'] - exclude = ['creator','modifier','creation','modification'] - search_fields = ['code','title'] - list_filter = ['classification','service','status'] + list_display = ['code', 'begin', 'title', 'classification', 'business_domain', 'status'] + list_display_links = ['code', 'title'] + exclude = ['creator', 'modifier', 'creation', 'modification'] + search_fields = ['code', 'title'] + list_filter = ['classification', 'service', 'status'] fields = ( - ('begin','end',), - ('code','refer',),('classification','business_domain',), - ('service','project',), - ('title','status',),('description',),('attach',),('detail',) + ('begin', 'end',), + ('code', 'refer',), ('classification', 'business_domain',), + ('service', 'project',), + ('title', 'status',), ('description',), ('attach',), ('detail',) ) readonly_fields = ['status'] - raw_id_fields = ['service','project','refer'] - inlines = [ItemInline,ParamValueInline] + raw_id_fields = ['service', 'project', 'refer'] + inlines = [ItemInline, ParamValueInline] date_hierarchy = 'begin' def save_model(self, request, obj, form, change): if obj.user is None: obj.user = request.user - super(WorkOrderAdmin,self).save_model(request,obj,form,change) + super(WorkOrderAdmin, self).save_model(request, obj, form, change) def get_changeform_initial_data(self, request): import datetime td = datetime.date.today() end = td + datetime.timedelta(30) - return {'begin':datetime.date.today, 'end':end} + return {'begin': datetime.date.today, 'end': end} def formfield_for_foreignkey(self, db_field, request=None, **kwargs): if db_field.name == 'refer': @@ -84,21 +84,20 @@ def formfield_for_foreignkey(self, db_field, request=None, **kwargs): if app_info and app_info['obj']: kwargs['queryset'] = WorkOrder.objects.exclude(id=app_info['id']) - return super(WorkOrderAdmin,self).formfield_for_foreignkey(db_field,request,**kwargs) + return super(WorkOrderAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) class LoanAdmin(generic.BOAdmin): CODE_PREFIX = 'JK' CODE_NUMBER_WIDTH = 5 - list_display = ['code','title','project','loan_amount','applier','status'] - list_display_links = ['code','title'] - readonly_fields = ['status','logout_time','logout_amount'] - raw_id_fields = ['project','user'] - fields = ( - ('code',),('title','loan_amount',),('description',),('project'),('user','status'),('logout_time','logout_amount',), - ) - extra_buttons = [{'href':'pay','title':_('pay')}] - search_fields = ['code','title','user__username'] + list_display = ['code', 'title', 'project', 'loan_amount', 'applier', 'status'] + list_display_links = ['code', 'title'] + readonly_fields = ['status', 'logout_time', 'logout_amount'] + raw_id_fields = ['project', 'user'] + fields = (('code',), ('title', 'loan_amount',), ('description',), + ('project'), ('user', 'status'), ('logout_time', 'logout_amount',), ) + extra_buttons = [{'href': 'pay', 'title': _('pay')}] + search_fields = ['code', 'title', 'user__username'] date_hierarchy = 'begin' def changeform_view(self, request, object_id=None, form_url='', extra_context=None): @@ -110,12 +109,12 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No extra_context.update(dict(readonly=True)) except Exception: pass - return super(LoanAdmin,self).changeform_view(request,object_id,form_url,extra_context) + return super(LoanAdmin, self).changeform_view(request, object_id, form_url, extra_context) def save_model(self, request, obj, form, change): if obj and obj.user is None: obj.user = request.user - super(LoanAdmin,self).save_model(request,obj,form,change) + super(LoanAdmin, self).save_model(request, obj, form, change) class ReimbursementItemInline(admin.TabularInline): @@ -132,33 +131,33 @@ def get_extra(self, request, obj=None, **kwargs): class ReimbursementAdmin(generic.BOAdmin): CODE_PREFIX = 'BX' CODE_NUMBER_WIDTH = 5 - list_display = ['code','title','project','amount','applier','status'] - list_display_links = ['code','title'] + list_display = ['code', 'title', 'project', 'amount', 'applier', 'status'] + list_display_links = ['code', 'title'] inlines = [ReimbursementItemInline] - raw_id_fields = ['project','wo','user','org'] - readonly_fields = ['loan_amount','pay_time','status','amount'] + raw_id_fields = ['project', 'wo', 'user', 'org'] + readonly_fields = ['loan_amount', 'pay_time', 'status', 'amount'] fieldsets = [ - (None,{'fields':[('code','user'),('title','amount','status',),('description',),('project','wo',)]}), - (_('fico'),{'fields':[('org',),('loan',),('logout_amount','pay_amount',)],'classes': ['collapse']}) + (None, {'fields': [('code', 'user'), ('title', 'amount', 'status',), ('description',), ('project', 'wo',)]}), + (_('fico'), {'fields': [('org',), ('loan',), ('logout_amount', 'pay_amount',)], 'classes': ['collapse']}) ] - extra_buttons = [{'href':'pay','title':_('pay')}] - search_fields = ['code','title','project__code','project__name','user__username'] + extra_buttons = [{'href': 'pay', 'title': _('pay')}] + search_fields = ['code', 'title', 'project__code', 'project__name', 'user__username'] date_hierarchy = 'begin' def get_changeform_initial_data(self, request): apps = generic.get_app_model_info_from_request(request) - obj = getattr(apps,'obj',None) + obj = getattr(apps, 'obj', None) current = request.user if obj: current = obj.user sm = Loan.objects.filter(user=current).aggregate(Sum('loan_amount')).get('loan_amount__sum') or 0.00 - return {'loan_amount':sm} + return {'loan_amount': sm} def save_model(self, request, obj, form, change): if obj and obj.user is None: obj.user = request.user - super(ReimbursementAdmin,self).save_model(request,obj,form,change) + super(ReimbursementAdmin, self).save_model(request, obj, form, change) def formfield_for_foreignkey(self, db_field, request=None, **kwargs): if db_field.name == 'loan': @@ -168,12 +167,12 @@ def formfield_for_foreignkey(self, db_field, request=None, **kwargs): obj = apps.get('obj') current = obj.user if obj.status == 'P': - kwargs['queryset']=Loan.objects.filter(id=obj.loan.id) + kwargs['queryset'] = Loan.objects.filter(id=obj.loan.id) else: - kwargs['queryset']=Loan.objects.filter(user=current,is_clear=0) + kwargs['queryset'] = Loan.objects.filter(user=current, is_clear=0) else: - kwargs['queryset']=Loan.objects.filter(user=current,is_clear=0) - return super(ReimbursementAdmin,self).formfield_for_foreignkey(db_field,request,**kwargs) + kwargs['queryset'] = Loan.objects.filter(user=current, is_clear=0) + return super(ReimbursementAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) def changeform_view(self, request, object_id=None, form_url='', extra_context=None): if object_id: @@ -184,7 +183,7 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No extra_context.update(dict(readonly=True)) except Exception: pass - return super(ReimbursementAdmin,self).changeform_view(request,object_id,form_url,extra_context) + return super(ReimbursementAdmin, self).changeform_view(request, object_id, form_url, extra_context) class EnrollInline(admin.TabularInline): @@ -198,22 +197,23 @@ class FeedbackInline(admin.TabularInline): class ActivityAdmin(generic.BOAdmin): CODE_PREFIX = 'AC' CODE_NUMBER_WIDTH = 5 - list_display = ['code','begin_time','end_time','title','classification','room'] - list_display_links = ['code','title'] - raw_id_fields = ['room','parent'] + list_display = ['code', 'begin_time', 'end_time', 'title', 'classification', 'room'] + list_display_links = ['code', 'title'] + raw_id_fields = ['room', 'parent'] fieldsets = [ - (None,{'fields':[('begin_time','end_time',),('title','classification',),('description',), - ('host','speaker',),('room','location',),('attach',)]}), - (_('other info'),{'fields':[('mail_list',),('parent',),('mail_notice','short_message_notice','weixin_notice',)],'classes': ['collapse']}) + (None, {'fields': [('begin_time', 'end_time',), ('title', 'classification',), ('description',), + ('host', 'speaker',), ('room', 'location',), ('attach',)]}), + (_('other info'), {'fields': [('mail_list',), ('parent',), ('mail_notice', 'short_message_notice', 'weixin_notice',)], 'classes': ['collapse']}) ] def get_changeform_initial_data(self, request): now = datetime.datetime.now() begin = now + datetime.timedelta(hours=12) end = begin + datetime.timedelta(hours=6) - return {'begin_time':begin,'end_time':end} + return {'begin_time': begin, 'end_time': end} + -admin.site.register(WorkOrder,WorkOrderAdmin) -admin.site.register(Loan,LoanAdmin) -admin.site.register(Reimbursement,ReimbursementAdmin) -admin.site.register(Activity,ActivityAdmin) +admin.site.register(WorkOrder, WorkOrderAdmin) +admin.site.register(Loan, LoanAdmin) +admin.site.register(Reimbursement, ReimbursementAdmin) +admin.site.register(Activity, ActivityAdmin) diff --git a/selfhelp/apps.py b/selfhelp/apps.py index 583e36d..dde8e41 100644 --- a/selfhelp/apps.py +++ b/selfhelp/apps.py @@ -1,4 +1,4 @@ -# created at 15-5-23 +# created at 15-5-23 # coding=utf-8 __author__ = 'zhugl' diff --git a/selfhelp/models.py b/selfhelp/models.py index 8fd87be..80c6de4 100644 --- a/selfhelp/models.py +++ b/selfhelp/models.py @@ -11,7 +11,7 @@ from common import generic from common import const from mis import settings -from basedata.models import Material,ExtraParam,Project,ExpenseAccount,Measure +from basedata.models import Material, ExtraParam, Project, ExpenseAccount, Measure from organ.models import OrgUnit @@ -20,35 +20,50 @@ class WorkOrder(generic.BO): """ index_weight = 1 - code = models.CharField(_("workorder code"),blank=True,null=True,max_length=const.DB_CHAR_CODE_10) - refer = models.ForeignKey("self",verbose_name=_("refer wo"),blank=True,null=True,on_delete=models.CASCADE) - title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_120) - description = models.TextField(_("description"),blank=True,null=True) - business_domain = models.CharField(_("business domain"),max_length=const.DB_CHAR_CODE_4,choices=const.get_value_list('S045'),default='OT') - classification = models.CharField(_("classification"),max_length=const.DB_CHAR_CODE_4,choices=const.get_value_list('S044'),default='D') - service = models.ForeignKey(Material,verbose_name=_("service name"),null=True,blank=True,limit_choices_to={"is_virtual":"1"},on_delete=models.CASCADE) - project = models.ForeignKey(Project,verbose_name=_("project"),null=True,blank=True,on_delete=models.CASCADE) - status = models.CharField(_("status"),blank=True,null=True,default='NEW',max_length=const.DB_CHAR_CODE_6,choices=const.get_value_list('S046')) - answer = models.TextField(_("answer"),blank=True,null=True) - user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) - attach = models.FileField(_('attach'),blank=True,null=True,help_text=u'工单附件，不导入明细。') - detail = models.FileField(_('to be imported detail'),blank=True,null=True,help_text=u'您可导入需求明细，模板请参考文档FD0007') + code = models.CharField(_("workorder code"), blank=True, null=True, max_length=const.DB_CHAR_CODE_10) + refer = models.ForeignKey("self", verbose_name=_("refer wo"), blank=True, null=True, on_delete=models.CASCADE) + title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_120) + description = models.TextField(_("description"), blank=True, null=True) + business_domain = models.CharField( + _("business domain"), + max_length=const.DB_CHAR_CODE_4, + choices=const.get_value_list('S045'), + default='OT') + classification = models.CharField( + _("classification"), + max_length=const.DB_CHAR_CODE_4, + choices=const.get_value_list('S044'), + default='D') + service = models.ForeignKey(Material, verbose_name=_("service name"), null=True, blank=True, + limit_choices_to={"is_virtual": "1"}, on_delete=models.CASCADE) + project = models.ForeignKey(Project, verbose_name=_("project"), null=True, blank=True, on_delete=models.CASCADE) + status = models.CharField( + _("status"), + blank=True, + null=True, + default='NEW', + max_length=const.DB_CHAR_CODE_6, + choices=const.get_value_list('S046')) + answer = models.TextField(_("answer"), blank=True, null=True) + user = models.ForeignKey(User, verbose_name=_("user"), blank=True, null=True, on_delete=models.CASCADE) + attach = models.FileField(_('attach'), blank=True, null=True, help_text=u'工单附件，不导入明细。') + detail = models.FileField(_('to be imported detail'), blank=True, null=True, help_text=u'您可导入需求明细，模板请参考文档FD0007') def __unicode__(self): - return u"%s-%s" % (self.code,self.title) + return u"%s-%s" % (self.code, self.title) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): - super(WorkOrder,self).save(force_insert,force_update,using,update_fields) + super(WorkOrder, self).save(force_insert, force_update, using, update_fields) if self.service: material = self.service if self.woextravalue_set.count() < 1 and material.extraparam_set and material.extraparam_set.count() > 0: for param in material.extraparam_set.all(): - extra_param = WOExtraValue.objects.create(workorder=self,param_name=param) + extra_param = WOExtraValue.objects.create(workorder=self, param_name=param) self.woextravalue_set.add(extra_param) item_count = WOItem.objects.filter(workorder=self).count() if self.detail and item_count == 0: - path = os.path.join(settings.MEDIA_ROOT,self.detail.name) + path = os.path.join(settings.MEDIA_ROOT, self.detail.name) workbook = xlrd.open_workbook(path) sheet = workbook.sheet_by_index(0) row_count = sheet.nrows @@ -68,13 +83,13 @@ def save(self, force_insert=False, force_update=False, using=None, try: measure = Measure.objects.get(code=row[4]) except Exception: - measure = Measure.objects.create(code=row[4],name=force_text(row[5])) + measure = Measure.objects.create(code=row[4], name=force_text(row[5])) try: material = Material.objects.get(code=row[0]) except Exception: - material = Material(code=row[0],name=force_text(row[1]),spec=force_text(row[2])) + material = Material(code=row[0], name=force_text(row[1]), spec=force_text(row[2])) material.save() - WOItem.objects.create(workorder=self,material=material,measure=measure,amount=row[6]) + WOItem.objects.create(workorder=self, material=material, measure=measure, amount=row[6]) class Meta: verbose_name = _("workorder apply") @@ -88,9 +103,9 @@ class WOExtraValue(models.Model): """ """ - workorder = models.ForeignKey(WorkOrder,verbose_name=_("workorder"),on_delete=models.CASCADE) - param_name = models.ForeignKey(ExtraParam,verbose_name=_("extra param"),on_delete=models.CASCADE) - param_value = models.CharField(_("param value"),blank=True,null=True,max_length=const.DB_CHAR_NAME_40) + workorder = models.ForeignKey(WorkOrder, verbose_name=_("workorder"), on_delete=models.CASCADE) + param_name = models.ForeignKey(ExtraParam, verbose_name=_("extra param"), on_delete=models.CASCADE) + param_value = models.CharField(_("param value"), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) class Meta: verbose_name = _("extra value") @@ -101,11 +116,18 @@ class WOItem(models.Model): """ """ - workorder = models.ForeignKey(WorkOrder,verbose_name=_("workorder"),on_delete=models.CASCADE) - material = models.ForeignKey(Material,verbose_name=_("material"),null=True,blank=True,limit_choices_to={"is_virtual":"0"},on_delete=models.CASCADE) - amount = models.DecimalField(_("amount"),max_digits=10,decimal_places=4,blank=True,null=True) - measure = models.ForeignKey(Measure,verbose_name=_('measure'),blank=True,null=True,on_delete=models.CASCADE) - price = models.DecimalField(_("price"),max_digits=10,decimal_places=4,blank=True,null=True) + workorder = models.ForeignKey(WorkOrder, verbose_name=_("workorder"), on_delete=models.CASCADE) + material = models.ForeignKey( + Material, + verbose_name=_("material"), + null=True, + blank=True, + limit_choices_to={ + "is_virtual": "0"}, + on_delete=models.CASCADE) + amount = models.DecimalField(_("amount"), max_digits=10, decimal_places=4, blank=True, null=True) + measure = models.ForeignKey(Measure, verbose_name=_('measure'), blank=True, null=True, on_delete=models.CASCADE) + price = models.DecimalField(_("price"), max_digits=10, decimal_places=4, blank=True, null=True) class Meta: verbose_name = _("workorder item") @@ -117,38 +139,44 @@ class Loan(generic.BO): """ LOAD_STATUS = ( - ('N',_("NEW")), - ('I',_("IN PROGRESS")), - ('A',_("APPROVED")), - ('P',_("PAYED")) + ('N', _("NEW")), + ('I', _("IN PROGRESS")), + ('A', _("APPROVED")), + ('P', _("PAYED")) ) index_weight = 3 - code = models.CharField(_("loan code"),max_length=const.DB_CHAR_CODE_10,blank=True,null=True) - title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_120) - description = models.TextField(_("description"),blank=True,null=True) - project = models.ForeignKey(Project,verbose_name=_("project"),on_delete=models.CASCADE) - user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) - status = models.CharField(_("status"),blank=True,null=True,default='N',max_length=const.DB_CHAR_CODE_2,choices=LOAD_STATUS) - logout_time = models.DateTimeField(_("logout time"),blank=True,null=True) - loan_amount = models.DecimalField(_("loan amount"),max_digits=10,decimal_places=2,blank=True,null=True) - logout_amount = models.DecimalField(_("logout amount"),max_digits=10,decimal_places=2,blank=True,null=True) - pay_user = models.CharField(_('pay user'),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) - pay_time = models.DateTimeField(_('pay time'),blank=True,null=True) - is_clear = models.BooleanField(_('is clear'),default=False) + code = models.CharField(_("loan code"), max_length=const.DB_CHAR_CODE_10, blank=True, null=True) + title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_120) + description = models.TextField(_("description"), blank=True, null=True) + project = models.ForeignKey(Project, verbose_name=_("project"), on_delete=models.CASCADE) + user = models.ForeignKey(User, verbose_name=_("user"), blank=True, null=True, on_delete=models.CASCADE) + status = models.CharField( + _("status"), + blank=True, + null=True, + default='N', + max_length=const.DB_CHAR_CODE_2, + choices=LOAD_STATUS) + logout_time = models.DateTimeField(_("logout time"), blank=True, null=True) + loan_amount = models.DecimalField(_("loan amount"), max_digits=10, decimal_places=2, blank=True, null=True) + logout_amount = models.DecimalField(_("logout amount"), max_digits=10, decimal_places=2, blank=True, null=True) + pay_user = models.CharField(_('pay user'), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + pay_time = models.DateTimeField(_('pay time'), blank=True, null=True) + is_clear = models.BooleanField(_('is clear'), default=False) def __unicode__(self): import decimal left = self.loan_amount left -= self.logout_amount or decimal.Decimal(0.00) - name = '%s%s'%(self.user.last_name,self.user.first_name) - return '%s %s %s J:%.2f Y:%.2f' % (self.code,name,self.title,self.loan_amount,left) + name = '%s%s' % (self.user.last_name, self.user.first_name) + return '%s %s %s J:%.2f Y:%.2f' % (self.code, name, self.title, self.loan_amount, left) def applier(self): - return u'%s%s'%(self.user.last_name,self.user.first_name) + return u'%s%s' % (self.user.last_name, self.user.first_name) applier.short_description = _('applier') - def action_pay(self,request): + def action_pay(self, request): self.pay_time = datetime.datetime.now() self.pay_user = request.user.username self.status = 'P' @@ -158,7 +186,7 @@ class Meta: verbose_name = _("loan") verbose_name_plural = _("loans") permissions = ( - ('financial_pay',_("financial pay")), + ('financial_pay', _("financial pay")), ) @@ -167,31 +195,37 @@ class Reimbursement(generic.BO): """ REIM_STATUS = ( - ('N',_("NEW")), - ('I',_("IN PROGRESS")), - ('A',_("APPROVED")), - ('P',_("PAYED")) + ('N', _("NEW")), + ('I', _("IN PROGRESS")), + ('A', _("APPROVED")), + ('P', _("PAYED")) ) index_weight = 2 - code = models.CharField(_("fee code"),max_length=const.DB_CHAR_CODE_10,blank=True,null=True) - title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_120) - description = models.TextField(_("description"),blank=True,null=True) - project = models.ForeignKey(Project,verbose_name=_("project"),on_delete=models.CASCADE) - wo = models.ForeignKey(WorkOrder,verbose_name=_("work order"),null=True,blank=True,on_delete=models.CASCADE) - user = models.ForeignKey(User,verbose_name=_("user"),blank=True,null=True,on_delete=models.CASCADE) - org = models.ForeignKey(OrgUnit,verbose_name=_("cost center"),blank=True,null=True,on_delete=models.CASCADE) - bank_account = models.CharField(_("bank account"),max_length=const.DB_CHAR_NAME_120,blank=True,null=True) - status = models.CharField(_("status"),blank=True,null=True,default='N',max_length=const.DB_CHAR_CODE_2,choices=REIM_STATUS) - amount = models.DecimalField(_("amount of money"),max_digits=10,decimal_places=2,blank=True,null=True) - loan = models.ForeignKey(Loan,verbose_name=_("loan record"),blank=True,null=True,on_delete=models.CASCADE) - loan_amount = models.DecimalField(_("loan amount"),max_digits=10,decimal_places=2,blank=True,null=True) - logout_amount = models.DecimalField(_("logout amount"),max_digits=10,decimal_places=2,blank=True,null=True) - pay_amount = models.DecimalField(_("pay amount"),max_digits=10,decimal_places=2,blank=True,null=True) - pay_time = models.DateTimeField(_("pay time"),blank=True,null=True) - pay_user = models.CharField(_('pay user'),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) + code = models.CharField(_("fee code"), max_length=const.DB_CHAR_CODE_10, blank=True, null=True) + title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_120) + description = models.TextField(_("description"), blank=True, null=True) + project = models.ForeignKey(Project, verbose_name=_("project"), on_delete=models.CASCADE) + wo = models.ForeignKey(WorkOrder, verbose_name=_("work order"), null=True, blank=True, on_delete=models.CASCADE) + user = models.ForeignKey(User, verbose_name=_("user"), blank=True, null=True, on_delete=models.CASCADE) + org = models.ForeignKey(OrgUnit, verbose_name=_("cost center"), blank=True, null=True, on_delete=models.CASCADE) + bank_account = models.CharField(_("bank account"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + status = models.CharField( + _("status"), + blank=True, + null=True, + default='N', + max_length=const.DB_CHAR_CODE_2, + choices=REIM_STATUS) + amount = models.DecimalField(_("amount of money"), max_digits=10, decimal_places=2, blank=True, null=True) + loan = models.ForeignKey(Loan, verbose_name=_("loan record"), blank=True, null=True, on_delete=models.CASCADE) + loan_amount = models.DecimalField(_("loan amount"), max_digits=10, decimal_places=2, blank=True, null=True) + logout_amount = models.DecimalField(_("logout amount"), max_digits=10, decimal_places=2, blank=True, null=True) + pay_amount = models.DecimalField(_("pay amount"), max_digits=10, decimal_places=2, blank=True, null=True) + pay_time = models.DateTimeField(_("pay time"), blank=True, null=True) + pay_user = models.CharField(_('pay user'), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) def applier(self): - return u'%s%s'%(self.user.last_name,self.user.first_name) + return u'%s%s' % (self.user.last_name, self.user.first_name) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): @@ -207,9 +241,9 @@ def save(self, force_insert=False, force_update=False, using=None, self.pay_amount = self.amount if self.logout_amount: self.pay_amount -= self.logout_amount - super(Reimbursement,self).save(force_insert,force_update,using,update_fields) + super(Reimbursement, self).save(force_insert, force_update, using, update_fields) - def action_pay(self,request): + def action_pay(self, request): if self.loan: if self.logout_amount is None or self.logout_amount == '': self.logout_amount = self.amount @@ -222,7 +256,7 @@ def action_pay(self,request): self.loan.logout_amount += self.logout_amount if self.loan.loan_amount == self.loan.logout_amount: - self.loan.is_clear=True + self.loan.is_clear = True self.loan.logout_time = datetime.datetime.now() self.loan.save() @@ -241,7 +275,7 @@ class Meta: verbose_name = _("reimbursement") verbose_name_plural = _("reimbursements") permissions = ( - ('financial_pay',_("financial pay")), + ('financial_pay', _("financial pay")), ) @@ -250,18 +284,18 @@ class ReimbursementItem(models.Model): """ import datetime - reimbursement = models.ForeignKey(Reimbursement,verbose_name=_("reimbursement"),on_delete=models.CASCADE) - expense_account = models.ForeignKey(ExpenseAccount,verbose_name=_("expenses account"),on_delete=models.CASCADE) - begin = models.DateField(_("occur date"),default=datetime.date.today) - amount = models.DecimalField(_("amount of money"),max_digits=10,decimal_places=2) - memo = models.CharField(_("memo"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) + reimbursement = models.ForeignKey(Reimbursement, verbose_name=_("reimbursement"), on_delete=models.CASCADE) + expense_account = models.ForeignKey(ExpenseAccount, verbose_name=_("expenses account"), on_delete=models.CASCADE) + begin = models.DateField(_("occur date"), default=datetime.date.today) + amount = models.DecimalField(_("amount of money"), max_digits=10, decimal_places=2) + memo = models.CharField(_("memo"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): - super(ReimbursementItem,self).save(force_insert,force_update,using,update_fields) + super(ReimbursementItem, self).save(force_insert, force_update, using, update_fields) sql = 'UPDATE selfhelp_reimbursement SET amount = (SELECT SUM(amount) FROM selfhelp_reimbursementitem WHERE reimbursement_id = %s) WHERE id = %s' - params = [self.reimbursement.id,self.reimbursement.id] - generic.update(sql,params) + params = [self.reimbursement.id, self.reimbursement.id] + generic.update(sql, params) class Meta: verbose_name = _("fee item") @@ -273,31 +307,44 @@ class Activity(generic.BO): """ CLASSIFICATION = ( - ('T',_("Train")), - ('M',_("Meeting")), - ('G',_("Community")), + ('T', _("Train")), + ('M', _("Meeting")), + ('G', _("Community")), ) index_index_weight = 4 begin_time = models.DateTimeField(_('begin time')) end_time = models.DateTimeField(_('end time')) - enroll_deadline = models.DateTimeField(_('enroll deadline'),blank=True,null=True) - code = models.CharField(_("code"),max_length=const.DB_CHAR_NAME_20,blank=True,null=True) - title = models.CharField(_("title"),max_length=const.DB_CHAR_NAME_120) - parent = models.ForeignKey('self',verbose_name=_("parent"),blank=True,null=True,on_delete=models.CASCADE) - description = models.TextField(_("description"),blank=True,null=True) - host = models.CharField(_("host"),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) - speaker = models.CharField(_("speaker"),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) - accept_enroll = models.BooleanField(_("accept enroll"),default=1) - room = models.ForeignKey(Material,verbose_name=_("room"),blank=True,null=True,limit_choices_to={'tp':20},on_delete=models.CASCADE) - location = models.CharField(_("location"),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) - classification = models.CharField(_("classification"),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=CLASSIFICATION,default='M') - mail_list = models.TextField(_("mail list"),blank=True,null=True) - mail_notice = models.BooleanField(_("mail notice"),default=1) - short_message_notice = models.BooleanField(_("short message notice"),default=1) - weixin_notice = models.BooleanField(_("weixin notice"),default=1) - status = models.BooleanField(_("published"),default=0) - publish_time = models.DateTimeField(_("publish time"),blank=True,null=True) - attach = models.FileField(_("attach"),blank=True,null=True,upload_to='activity') + enroll_deadline = models.DateTimeField(_('enroll deadline'), blank=True, null=True) + code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_120) + parent = models.ForeignKey('self', verbose_name=_("parent"), blank=True, null=True, on_delete=models.CASCADE) + description = models.TextField(_("description"), blank=True, null=True) + host = models.CharField(_("host"), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) + speaker = models.CharField(_("speaker"), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) + accept_enroll = models.BooleanField(_("accept enroll"), default=1) + room = models.ForeignKey( + Material, + verbose_name=_("room"), + blank=True, + null=True, + limit_choices_to={ + 'tp': 20}, + on_delete=models.CASCADE) + location = models.CharField(_("location"), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) + classification = models.CharField( + _("classification"), + max_length=const.DB_CHAR_CODE_2, + blank=True, + null=True, + choices=CLASSIFICATION, + default='M') + mail_list = models.TextField(_("mail list"), blank=True, null=True) + mail_notice = models.BooleanField(_("mail notice"), default=1) + short_message_notice = models.BooleanField(_("short message notice"), default=1) + weixin_notice = models.BooleanField(_("weixin notice"), default=1) + status = models.BooleanField(_("published"), default=0) + publish_time = models.DateTimeField(_("publish time"), blank=True, null=True) + attach = models.FileField(_("attach"), blank=True, null=True, upload_to='activity') class Meta: verbose_name = _("activity") @@ -309,22 +356,22 @@ class Feedback(models.Model): """ RANK = ( - ('A','A'), - ('B','B'), - ('C','C'), - ('D','D'), + ('A', 'A'), + ('B', 'B'), + ('C', 'C'), + ('D', 'D'), ) - activity = models.ForeignKey(Activity,on_delete=models.CASCADE) - user = models.ForeignKey(User,on_delete=models.CASCADE) - feed_time = models.DateTimeField(_("feedback time"),auto_now_add=True) - rank = models.CharField(_('rank'),max_length=const.DB_CHAR_CODE_2,blank=True,null=True,choices=RANK,default='B') - comment = models.CharField(_("suggest"),blank=True,null=True,max_length=const.DB_CHAR_NAME_80) + activity = models.ForeignKey(Activity, on_delete=models.CASCADE) + user = models.ForeignKey(User, on_delete=models.CASCADE) + feed_time = models.DateTimeField(_("feedback time"), auto_now_add=True) + rank = models.CharField(_('rank'), max_length=const.DB_CHAR_CODE_2, blank=True, null=True, choices=RANK, default='B') + comment = models.CharField(_("suggest"), blank=True, null=True, max_length=const.DB_CHAR_NAME_80) class Enroll(models.Model): """ """ - activity = models.ForeignKey(Activity,on_delete=models.CASCADE) - user = models.ForeignKey(User,on_delete=models.CASCADE) - enroll_time = models.DateTimeField(_("enroll time"),auto_now_add=True) + activity = models.ForeignKey(Activity, on_delete=models.CASCADE) + user = models.ForeignKey(User, on_delete=models.CASCADE) + enroll_time = models.DateTimeField(_("enroll time"), auto_now_add=True) diff --git a/selfhelp/urls.py b/selfhelp/urls.py index dd0b214..b9507ef 100644 --- a/selfhelp/urls.py +++ b/selfhelp/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url,static +from django.conf.urls import include, url, static import selfhelp.views urlpatterns = [ diff --git a/selfhelp/views.py b/selfhelp/views.py index 7aee157..1ec2365 100644 --- a/selfhelp/views.py +++ b/selfhelp/views.py @@ -10,9 +10,9 @@ from django.contrib.contenttypes.models import ContentType -def pay_action(request,model,object_id): +def pay_action(request, model, object_id): title = _("Are you sure?") - ct = ContentType.objects.get(app_label='selfhelp',model=model) + ct = ContentType.objects.get(app_label='selfhelp', model=model) obj = ct.get_object_for_this_type(id=int(object_id)) opts = obj._meta objects_name = force_text(opts.verbose_name) @@ -20,18 +20,18 @@ def pay_action(request,model,object_id): if model == 'reimbursement': loan = obj.loan amount = obj.logout_amount - if loan and (amount is None or amount< 0): - messages.error(request,u'您选择了借款单据，但是未正确填写核销金额，请在\'财务信息\'栏目中更正') - return HttpResponseRedirect("/admin/selfhelp/%s/%s"%(model,object_id)) + if loan and (amount is None or amount < 0): + messages.error(request, u'您选择了借款单据，但是未正确填写核销金额，请在\'财务信息\'栏目中更正') + return HttpResponseRedirect("/admin/selfhelp/%s/%s" % (model, object_id)) if request.POST.get("post"): try: obj.action_pay(request) - messages.success(request,_('action successfully')) + messages.success(request, _('action successfully')) except Exception as e: - messages.error(request,e) + messages.error(request, e) - return HttpResponseRedirect("/admin/selfhelp/%s/%s"%(model,object_id)) + return HttpResponseRedirect("/admin/selfhelp/%s/%s" % (model, object_id)) context = dict( site.each_context(request), @@ -43,4 +43,4 @@ def pay_action(request,model,object_id): ) request.current_app = site.name - return TemplateResponse(request,'admin/invent/stockin/in_confirmation.html', context) + return TemplateResponse(request, 'admin/invent/stockin/in_confirmation.html', context) diff --git a/syscfg/admin.py b/syscfg/admin.py index cf8f765..da3dafd 100644 --- a/syscfg/admin.py +++ b/syscfg/admin.py @@ -1,6 +1,6 @@ # coding=utf-8 from django.contrib import admin -from django.forms import ModelForm,DateField +from django.forms import ModelForm, DateField from syscfg.models import * from common import generic @@ -25,7 +25,7 @@ class SiteAdmin(admin.ModelAdmin): class ModuleAdmin(generic.BOAdmin): CODE_NUMBER_WIDTH = 3 CODE_PREFIX = 'U' - list_display = ['code','name','parent','status'] + list_display = ['code', 'name', 'parent', 'status'] ordering = ['weight'] raw_id_fields = ['parent'] @@ -34,7 +34,7 @@ class MenuAdmin(generic.BOAdmin): CODE_NUMBER_WIDTH = 3 CODE_PREFIX = 'M' - list_display = ['code','name','module','status'] + list_display = ['code', 'name', 'module', 'status'] list_filter = ['module'] ordering = ['weight'] raw_id_fields = ['module'] @@ -43,11 +43,11 @@ class MenuAdmin(generic.BOAdmin): class RoleAdmin(generic.BOAdmin): CODE_NUMBER_WIDTH = 3 CODE_PREFIX = 'R' - list_display = ['code','name','status'] - filter_horizontal = ['users','menus'] + list_display = ['code', 'name', 'status'] + filter_horizontal = ['users', 'menus'] admin.site.register(Site, SiteAdmin) -admin.site.register(Module,ModuleAdmin) -admin.site.register(Menu,MenuAdmin) -admin.site.register(Role,RoleAdmin) +admin.site.register(Module, ModuleAdmin) +admin.site.register(Menu, MenuAdmin) +admin.site.register(Role, RoleAdmin) diff --git a/syscfg/apps.py b/syscfg/apps.py index eb97ebd..3b2e75e 100644 --- a/syscfg/apps.py +++ b/syscfg/apps.py @@ -1,9 +1,9 @@ __author__ = 'zhugl' -# created at 15-4-22 +# created at 15-4-22 from django.apps.config import AppConfig from django.utils.translation import ugettext_lazy as _ class SysConfig(AppConfig): name = 'syscfg' - verbose_name = _('SysConfig') \ No newline at end of file + verbose_name = _('SysConfig') diff --git a/syscfg/models.py b/syscfg/models.py index a3d21e9..3474c6d 100644 --- a/syscfg/models.py +++ b/syscfg/models.py @@ -12,14 +12,14 @@ class Site(ToStringMixin, models.Model): 站点，一个站点下可有多个公司，处于同一个站点下的用户逻辑上位于同一个组织 """ index_weight = 1 - begin = models.DateField(_('begin date'), blank=True,null=True) - end = models.DateField(_('end date'), blank=True,null=True) + begin = models.DateField(_('begin date'), blank=True, null=True) + end = models.DateField(_('end date'), blank=True, null=True) name = models.CharField(_('site name'), max_length=const.DB_CHAR_NAME_40) - description = models.TextField(_('site description'),blank=True,null=True) - user = models.ManyToManyField(User,verbose_name=_('administrator')) + description = models.TextField(_('site description'), blank=True, null=True) + user = models.ManyToManyField(User, verbose_name=_('administrator')) def __unicode__(self): - return u'%s'%self.name + return u'%s' % self.name class Meta: verbose_name = _('Site') @@ -31,13 +31,13 @@ class Module(generic.BO): 模块管理 """ index_weight = 2 - code = models.CharField(_("module code"),max_length=const.DB_CHAR_CODE_6,blank=True,null=True) - name = models.CharField(_("module name"),max_length=const.DB_CHAR_NAME_40) - url = models.URLField(_("module url"),blank=True,null=True,max_length=const.DB_CHAR_NAME_80) - weight = models.IntegerField(_("weight"),blank=True,null=True,default=99) - icon = models.CharField(_("style class"),blank=True,null=True,max_length=const.DB_CHAR_NAME_40) - parent = models.ForeignKey('self',blank=True,null=True,verbose_name=_("parent"),on_delete=models.CASCADE) - status = models.BooleanField(_("in use"),default=True) + code = models.CharField(_("module code"), max_length=const.DB_CHAR_CODE_6, blank=True, null=True) + name = models.CharField(_("module name"), max_length=const.DB_CHAR_NAME_40) + url = models.URLField(_("module url"), blank=True, null=True, max_length=const.DB_CHAR_NAME_80) + weight = models.IntegerField(_("weight"), blank=True, null=True, default=99) + icon = models.CharField(_("style class"), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) + parent = models.ForeignKey('self', blank=True, null=True, verbose_name=_("parent"), on_delete=models.CASCADE) + status = models.BooleanField(_("in use"), default=True) class Meta: verbose_name = _("module") @@ -49,13 +49,13 @@ class Menu(generic.BO): 菜单管理 """ index_weight = 3 - module = models.ForeignKey(Module,verbose_name=_("module"),on_delete=models.CASCADE) - code = models.CharField(_("menu code"),max_length=const.DB_CHAR_CODE_6,blank=True,null=True) - name = models.CharField(_("menu name"),max_length=const.DB_CHAR_NAME_40) - url = models.URLField(_("menu url"),blank=True,null=True,max_length=const.DB_CHAR_NAME_80) - weight = models.IntegerField(_("weight"),blank=True,null=True,default=99) - icon = models.CharField(_("style class"),blank=True,null=True,max_length=const.DB_CHAR_NAME_40) - status = models.BooleanField(_("in use"),default=True) + module = models.ForeignKey(Module, verbose_name=_("module"), on_delete=models.CASCADE) + code = models.CharField(_("menu code"), max_length=const.DB_CHAR_CODE_6, blank=True, null=True) + name = models.CharField(_("menu name"), max_length=const.DB_CHAR_NAME_40) + url = models.URLField(_("menu url"), blank=True, null=True, max_length=const.DB_CHAR_NAME_80) + weight = models.IntegerField(_("weight"), blank=True, null=True, default=99) + icon = models.CharField(_("style class"), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) + status = models.BooleanField(_("in use"), default=True) class Meta: verbose_name = _("menu") @@ -67,13 +67,13 @@ class Role(generic.BO): 角色管理，分配用户所拥有的菜单 """ index_weight = 4 - code = models.CharField(_("role code"),max_length=const.DB_CHAR_CODE_6,blank=True,null=True) - name = models.CharField(_("role name"),max_length=const.DB_CHAR_NAME_40) - description = models.CharField(_("description"),max_length=const.DB_CHAR_NAME_80,blank=True,null=True) - status = models.BooleanField(_("in use"),default=True) - parent = models.ForeignKey('self',blank=True,null=True,verbose_name=_("parent"),on_delete=models.CASCADE) - users = models.ManyToManyField(User,verbose_name=_("role users"),blank=True) - menus = models.ManyToManyField(Menu,verbose_name=_("role menus"),blank=True) + code = models.CharField(_("role code"), max_length=const.DB_CHAR_CODE_6, blank=True, null=True) + name = models.CharField(_("role name"), max_length=const.DB_CHAR_NAME_40) + description = models.CharField(_("description"), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) + status = models.BooleanField(_("in use"), default=True) + parent = models.ForeignKey('self', blank=True, null=True, verbose_name=_("parent"), on_delete=models.CASCADE) + users = models.ManyToManyField(User, verbose_name=_("role users"), blank=True) + menus = models.ManyToManyField(Menu, verbose_name=_("role menus"), blank=True) class Meta: verbose_name = _("role") diff --git a/workflow/admin.py b/workflow/admin.py index 048efc6..44a5f12 100644 --- a/workflow/admin.py +++ b/workflow/admin.py @@ -2,12 +2,12 @@ from django.contrib import admin from django.contrib.contenttypes.models import ContentType from common import generic -from workflow.models import Modal,Node,TodoList,Instance,History +from workflow.models import Modal, Node, TodoList, Instance, History class NodeInline(admin.TabularInline): model = Node - fields = ['code','name','next_user_handler','can_deny','can_terminate'] + fields = ['code', 'name', 'next_user_handler', 'can_deny', 'can_terminate'] def get_extra(self, request, obj=None, **kwargs): if obj: @@ -17,20 +17,20 @@ def get_extra(self, request, obj=None, **kwargs): class WorkflowModelAdmin(admin.ModelAdmin): - list_display = ['code','name','begin','end'] + list_display = ['code', 'name', 'begin', 'end'] inlines = [NodeInline] - readonly_fields = ['app_name','model_name'] + readonly_fields = ['app_name', 'model_name'] raw_id_fields = ['content_type'] fields = ( - ('begin','end',),('code','name',),('description',),('content_type',),('app_name','model_name',), + ('begin', 'end',), ('code', 'name',), ('description',), ('content_type',), ('app_name', 'model_name',), ) def get_form(self, request, obj=None, **kwargs): - return super(WorkflowModelAdmin,self).get_form(request,obj,**kwargs) + return super(WorkflowModelAdmin, self).get_form(request, obj, **kwargs) def save_model(self, request, obj, form, change): import datetime - super(WorkflowModelAdmin,self).save_model(request,obj,form,change) + super(WorkflowModelAdmin, self).save_model(request, obj, form, change) if not obj.code: code = 'WF%03d' % obj.id @@ -38,7 +38,7 @@ def save_model(self, request, obj, form, change): obj.save() if not obj.begin: obj.begin = datetime.date.today() - obj.end = datetime.date(9999,12,31) + obj.end = datetime.date(9999, 12, 31) app_name = obj.content_type.app_label model_name = obj.content_type.model obj.app_name = app_name @@ -49,27 +49,27 @@ def save_model(self, request, obj, form, change): class WorkflowNodeAdmin(admin.ModelAdmin): fields = ( ('modal',), - ('name','code',), - ('start','stop','can_terminate','can_deny','can_edit',), - ('email_notice','short_message_notice','approve_node',),('next',), + ('name', 'code',), + ('start', 'stop', 'can_terminate', 'can_deny', 'can_edit',), + ('email_notice', 'short_message_notice', 'approve_node',), ('next',), ('handler_type',), ('handler',), - ('next_user_handler','next_node_handler',), - ('status_field','status_value',),('action',), - ('users',),('positions',),('roles',), + ('next_user_handler', 'next_node_handler',), + ('status_field', 'status_value',), ('action',), + ('users',), ('positions',), ('roles',), ) - list_display = ['code','name','modal','can_deny','can_terminate'] - list_display_links = ['code','name'] + list_display = ['code', 'name', 'modal', 'can_deny', 'can_terminate'] + list_display_links = ['code', 'name'] list_filter = ['modal'] - readonly_fields = ['modal','code'] - filter_horizontal = ['next','users','positions','roles','departments',] - radio_fields = {'handler_type':admin.HORIZONTAL} - search_fields = ['modal__code','modal__name','code','name'] + readonly_fields = ['modal', 'code'] + filter_horizontal = ['next', 'users', 'positions', 'roles', 'departments', ] + radio_fields = {'handler_type': admin.HORIZONTAL} + search_fields = ['modal__code', 'modal__name', 'code', 'name'] def get_readonly_fields(self, request, obj=None): if obj and obj.stop: - return ['modal','code','next'] - return super(WorkflowNodeAdmin,self).get_readonly_fields(request,obj) + return ['modal', 'code', 'next'] + return super(WorkflowNodeAdmin, self).get_readonly_fields(request, obj) def formfield_for_manytomany(self, db_field, request=None, **kwargs): if db_field.name == 'next': @@ -83,29 +83,29 @@ def formfield_for_manytomany(self, db_field, request=None, **kwargs): else: kwargs['queryset'] = Node.objects.filter(id=-1) - return super(WorkflowNodeAdmin,self).formfield_for_manytomany(db_field,request,**kwargs) + return super(WorkflowNodeAdmin, self).formfield_for_manytomany(db_field, request, **kwargs) class InstanceAdmin(admin.ModelAdmin): - list_display = ['code','modal','starter','start_time','status'] - readonly_fields = ['code','modal','starter','start_time','status','object_id','approved_time','current_nodes'] + list_display = ['code', 'modal', 'starter', 'start_time', 'status'] + readonly_fields = ['code', 'modal', 'starter', 'start_time', 'status', 'object_id', 'approved_time', 'current_nodes'] class TodoAdmin(admin.ModelAdmin): - list_display = ['code_link','modal_dsc','href','node_dsc','is_read','status','submitter','arrived_time'] + list_display = ['code_link', 'modal_dsc', 'href', 'node_dsc', 'is_read', 'status', 'submitter', 'arrived_time'] list_filter = ['status'] def get_queryset(self, request): - return super(TodoAdmin,self).get_queryset(request).filter(user=request.user) + return super(TodoAdmin, self).get_queryset(request).filter(user=request.user) class HistoryAdmin(admin.ModelAdmin): - list_display = ['inst','node','user','pro_time','memo'] + list_display = ['inst', 'node', 'user', 'pro_time', 'memo'] class ContentTypeAdmin(admin.ModelAdmin): - list_display = ['app_label','model'] - search_fields = ['app_label','model'] + list_display = ['app_label', 'model'] + search_fields = ['app_label', 'model'] list_per_page = 20 list_filter = ['app_label'] @@ -115,4 +115,4 @@ class ContentTypeAdmin(admin.ModelAdmin): admin.site.register(Instance, InstanceAdmin) admin.site.register(TodoList, TodoAdmin) admin.site.register(History, HistoryAdmin) -admin.site.register(ContentType,ContentTypeAdmin) +admin.site.register(ContentType, ContentTypeAdmin) diff --git a/workflow/apps.py b/workflow/apps.py index d440522..6d9d6a6 100644 --- a/workflow/apps.py +++ b/workflow/apps.py @@ -1,9 +1,9 @@ __author__ = 'zhugl' -# created at 15-4-22 +# created at 15-4-22 from django.apps.config import AppConfig from django.utils.translation import ugettext_lazy as _ class WorkflowConfig(AppConfig): name = 'workflow' - verbose_name = _('workflow') \ No newline at end of file + verbose_name = _('workflow') diff --git a/workflow/models.py b/workflow/models.py index 0ef7be2..8f91100 100644 --- a/workflow/models.py +++ b/workflow/models.py @@ -7,7 +7,7 @@ from common import const from common.generic import ToStringMixin from syscfg.models import Role -from organ.models import Position,OrgUnit +from organ.models import Position, OrgUnit class Modal(ToStringMixin, models.Model): @@ -16,15 +16,22 @@ class Modal(ToStringMixin, models.Model): """ import datetime index_weight = 1 - code = models.CharField(_("workflow code"),max_length=const.DB_CHAR_CODE_6,blank=True,null=True) - name = models.CharField(_("workflow name"),max_length=const.DB_CHAR_NAME_40) - description = models.TextField(_("description"),blank=True,null=True) - content_type = models.ForeignKey(ContentType,verbose_name=_("content type"),limit_choices_to={"app_label__in":['basedata','organ']},on_delete=models.CASCADE) - app_name = models.CharField(_("app name"),max_length=const.DB_CHAR_NAME_60,blank=True,null=True) - model_name = models.CharField(_("model name"),max_length=const.DB_CHAR_NAME_60,blank=True,null=True) + code = models.CharField(_("workflow code"), max_length=const.DB_CHAR_CODE_6, blank=True, null=True) + name = models.CharField(_("workflow name"), max_length=const.DB_CHAR_NAME_40) + description = models.TextField(_("description"), blank=True, null=True) + content_type = models.ForeignKey( + ContentType, + verbose_name=_("content type"), + limit_choices_to={ + "app_label__in": [ + 'basedata', + 'organ']}, + on_delete=models.CASCADE) + app_name = models.CharField(_("app name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) + model_name = models.CharField(_("model name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) # added by zhugl 2015-05-10 - begin = models.DateField(_("begin date"),blank=True,null=True,default=datetime.date.today) - end = models.DateField(_("end date"),blank=True,null=True,default=datetime.date(9999,12,31)) + begin = models.DateField(_("begin date"), blank=True, null=True, default=datetime.date.today) + end = models.DateField(_("end date"), blank=True, null=True, default=datetime.date(9999, 12, 31)) def __unicode__(self): return "%s" % self.name @@ -51,41 +58,41 @@ class Node(ToStringMixin, models.Model): (4, _("submitter")), ) index_weight = 2 - modal = models.ForeignKey(Modal,verbose_name=_("workflow model"),on_delete=models.CASCADE) - code = models.CharField(_("node code"),max_length=const.DB_CHAR_CODE_4,blank=True,null=True) - name = models.CharField(_("node name"),max_length=const.DB_CHAR_NAME_80) - tooltip = models.CharField(_('tooltip words'),blank=True,null=True,max_length=const.DB_CHAR_NAME_120) - - start = models.BooleanField(_("start node"),default=False) - stop = models.BooleanField(_("stop node"),default=False) - can_terminate = models.BooleanField(_("can terminate"),default=False) - can_deny = models.BooleanField(_("can deny"),default=True) - can_edit = models.BooleanField(_("can edit"),default=False) - - email_notice = models.BooleanField(_("email notice"),default=True) - short_message_notice = models.BooleanField(_("short message notice"),default=False) - approve_node = models.BooleanField(_("approve node"),default=False) - handler = models.TextField(_("handler"),blank=True,null=True,help_text=u'自定义SQL语句，优先高于指定用户、岗位、角色') + modal = models.ForeignKey(Modal, verbose_name=_("workflow model"), on_delete=models.CASCADE) + code = models.CharField(_("node code"), max_length=const.DB_CHAR_CODE_4, blank=True, null=True) + name = models.CharField(_("node name"), max_length=const.DB_CHAR_NAME_80) + tooltip = models.CharField(_('tooltip words'), blank=True, null=True, max_length=const.DB_CHAR_NAME_120) + + start = models.BooleanField(_("start node"), default=False) + stop = models.BooleanField(_("stop node"), default=False) + can_terminate = models.BooleanField(_("can terminate"), default=False) + can_deny = models.BooleanField(_("can deny"), default=True) + can_edit = models.BooleanField(_("can edit"), default=False) + + email_notice = models.BooleanField(_("email notice"), default=True) + short_message_notice = models.BooleanField(_("short message notice"), default=False) + approve_node = models.BooleanField(_("approve node"), default=False) + handler = models.TextField(_("handler"), blank=True, null=True, help_text=u'自定义SQL语句，优先高于指定用户、岗位、角色') # added by zhugl 2015-05-10 - handler_type = models.IntegerField(_("handler type"),choices=HANDLER_TYPE,default=1) - positions = models.ManyToManyField(Position,verbose_name=_("designated position"),blank=True) - roles = models.ManyToManyField(Role,verbose_name=_("designated role"),blank=True) - users = models.ManyToManyField(User,verbose_name=_("designated user"),blank=True) - departments = models.ManyToManyField(OrgUnit,verbose_name=_("designated department"),blank=True) - next = models.ManyToManyField('self',blank=True,verbose_name=_("next node"),symmetrical=False) + handler_type = models.IntegerField(_("handler type"), choices=HANDLER_TYPE, default=1) + positions = models.ManyToManyField(Position, verbose_name=_("designated position"), blank=True) + roles = models.ManyToManyField(Role, verbose_name=_("designated role"), blank=True) + users = models.ManyToManyField(User, verbose_name=_("designated user"), blank=True) + departments = models.ManyToManyField(OrgUnit, verbose_name=_("designated department"), blank=True) + next = models.ManyToManyField('self', blank=True, verbose_name=_("next node"), symmetrical=False) # added by zhugl 2015-06-30 - next_user_handler = models.CharField(_('next user handler'),blank=True,null=True,max_length=const.DB_CHAR_NAME_40) - next_node_handler = models.CharField(_('next node handler'),blank=True,null=True,max_length=const.DB_CHAR_NAME_40) - status_field = models.CharField(_('status field'),blank=True,null=True,max_length=const.DB_CHAR_NAME_40) - status_value = models.CharField(_('status value'),blank=True,null=True,max_length=const.DB_CHAR_NAME_40) - action = models.CharField(_('execute action'),blank=True,null=True,max_length=const.DB_CHAR_NAME_40) + next_user_handler = models.CharField(_('next user handler'), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) + next_node_handler = models.CharField(_('next node handler'), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) + status_field = models.CharField(_('status field'), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) + status_value = models.CharField(_('status value'), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) + action = models.CharField(_('execute action'), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): if not self.code: fmt = 'N%02d' - self.code = fmt % (self.modal.node_set.count()+1) - super(Node,self).save(force_insert,force_update,using,update_fields) + self.code = fmt % (self.modal.node_set.count() + 1) + super(Node, self).save(force_insert, force_update, using, update_fields) def __unicode__(self): return "%s-%s" % (self.code, self.name) @@ -108,23 +115,23 @@ class Instance(ToStringMixin, models.Model): (99, _("COMPLETED")) ) index_weight = 3 - code = models.CharField(_("code"),blank=True,null=True,max_length=const.DB_CHAR_CODE_10) - modal = models.ForeignKey(Modal,verbose_name=_("workflow model"),on_delete=models.CASCADE) + code = models.CharField(_("code"), blank=True, null=True, max_length=const.DB_CHAR_CODE_10) + modal = models.ForeignKey(Modal, verbose_name=_("workflow model"), on_delete=models.CASCADE) object_id = models.PositiveIntegerField("object id") - starter = models.ForeignKey(User,verbose_name=_("start user"),related_name="starter",on_delete=models.CASCADE) - start_time = models.DateTimeField(_("start time"),auto_now_add=True) - approved_time = models.DateTimeField(_("approved time"),blank=True,null=True) - status = models.IntegerField(_("status"),default=1,choices=STATUS) - current_nodes = models.ManyToManyField(Node,verbose_name=_("current node"),blank=True) + starter = models.ForeignKey(User, verbose_name=_("start user"), related_name="starter", on_delete=models.CASCADE) + start_time = models.DateTimeField(_("start time"), auto_now_add=True) + approved_time = models.DateTimeField(_("approved time"), blank=True, null=True) + status = models.IntegerField(_("status"), default=1, choices=STATUS) + current_nodes = models.ManyToManyField(Node, verbose_name=_("current node"), blank=True) def __unicode__(self): return '%s' % self.code def save(self, force_insert=False, force_update=False, using=None, update_fields=None): - super(Instance,self).save(force_insert,force_update,using,update_fields) + super(Instance, self).save(force_insert, force_update, using, update_fields) if not self.code: - self.code = 'S%05d'%self.id + self.code = 'S%05d' % self.id self.save() class Meta: @@ -143,12 +150,12 @@ class History(ToStringMixin, models.Model): (4, _("TERMINATE")), ) index_weight = 5 - inst = models.ForeignKey(Instance,verbose_name=_("workflow instance"),on_delete=models.CASCADE) - node = models.ForeignKey(Node,verbose_name=_("workflow node"),blank=True,null=True,on_delete=models.CASCADE) - user = models.ForeignKey(User,verbose_name=_("submitter"),on_delete=models.CASCADE) - pro_time = models.DateTimeField(_("process time"),auto_now_add=True) - pro_type = models.IntegerField(_("process type"),choices=PROCESS_TYPE,default=0) - memo = models.CharField(_("memo"),max_length=const.DB_CHAR_NAME_40,blank=True,null=True) + inst = models.ForeignKey(Instance, verbose_name=_("workflow instance"), on_delete=models.CASCADE) + node = models.ForeignKey(Node, verbose_name=_("workflow node"), blank=True, null=True, on_delete=models.CASCADE) + user = models.ForeignKey(User, verbose_name=_("submitter"), on_delete=models.CASCADE) + pro_time = models.DateTimeField(_("process time"), auto_now_add=True) + pro_type = models.IntegerField(_("process type"), choices=PROCESS_TYPE, default=0) + memo = models.CharField(_("memo"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) def get_node_desc(self): if self.node: @@ -157,7 +164,7 @@ def get_node_desc(self): return u'启动' def get_action_desc(self): - action_mapping = {0:u'提交',1:u'同意',3:u'拒绝',4:u'终止',} + action_mapping = {0: u'提交', 1: u'同意', 3: u'拒绝', 4: u'终止', } # print action_mapping if self.pro_type: return action_mapping[self.pro_type] @@ -173,7 +180,7 @@ def get_memo_desc(self): class Meta: verbose_name = _("workflow history") verbose_name_plural = _("workflow history") - ordering = ['inst','pro_time'] + ordering = ['inst', 'pro_time'] class TodoList(ToStringMixin, models.Model): @@ -181,44 +188,45 @@ class TodoList(ToStringMixin, models.Model): """ index_weight = 4 - code = models.CharField(_("code"),max_length=const.DB_CHAR_CODE_10,blank=True,null=True) - inst = models.ForeignKey(Instance,verbose_name=_("workflow instance"),on_delete=models.CASCADE) - node = models.ForeignKey(Node,verbose_name=_("current node"),blank=True,null=True,on_delete=models.CASCADE) - app_name = models.CharField(_("app name"),max_length=const.DB_CHAR_NAME_60,blank=True,null=True) - model_name = models.CharField(_("model name"),max_length=const.DB_CHAR_NAME_60,blank=True,null=True) - user = models.ForeignKey(User,verbose_name=_("handler"),on_delete=models.CASCADE) - arrived_time = models.DateTimeField(_("arrived time"),auto_now_add=True) - is_read = models.BooleanField(_("is read"),default=False) - read_time = models.DateTimeField(_("read time"),blank=True,null=True) - status = models.BooleanField(_("is done"),default=False) + code = models.CharField(_("code"), max_length=const.DB_CHAR_CODE_10, blank=True, null=True) + inst = models.ForeignKey(Instance, verbose_name=_("workflow instance"), on_delete=models.CASCADE) + node = models.ForeignKey(Node, verbose_name=_("current node"), blank=True, null=True, on_delete=models.CASCADE) + app_name = models.CharField(_("app name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) + model_name = models.CharField(_("model name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) + user = models.ForeignKey(User, verbose_name=_("handler"), on_delete=models.CASCADE) + arrived_time = models.DateTimeField(_("arrived time"), auto_now_add=True) + is_read = models.BooleanField(_("is read"), default=False) + read_time = models.DateTimeField(_("read time"), blank=True, null=True) + status = models.BooleanField(_("is done"), default=False) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): - super(TodoList,self).save(force_update,force_update,using,update_fields) + super(TodoList, self).save(force_update, force_update, using, update_fields) if not self.code: self.code = 'TD%05d' % self.id self.save() def node_dsc(self): if self.node: - return u'%s'%self.node.name + return u'%s' % self.node.name else: return u'启动' def code_link(self): return format_html("{}", - self.app_name,self.model_name,self.inst.object_id,self.code) + self.app_name, self.model_name, self.inst.object_id, self.code) code_link.allow_tags = True code_link.short_description = _("code") def href(self): - ct = ContentType.objects.get(app_label=self.app_name,model=self.model_name) + ct = ContentType.objects.get(app_label=self.app_name, model=self.model_name) obj = ct.get_object_for_this_type(id=self.inst.object_id) title = u"%s" % obj return format_html(u"{}", - self.app_name,self.model_name,self.inst.object_id,title) + self.app_name, self.model_name, self.inst.object_id, title) + def modal_dsc(self): - return u'%s'%(self.inst.modal.name) + return u'%s' % (self.inst.modal.name) modal_dsc.short_description = u'业务流程' def start_time(self): @@ -230,17 +238,17 @@ def start_time(self): def submitter(self): if self.inst.starter.last_name or self.inst.starter.first_name: - return u"%s%s"%(self.inst.starter.last_name,self.inst.starter.first_name) - return u"%s"%(self.inst.starter.username) + return u"%s%s" % (self.inst.starter.last_name, self.inst.starter.first_name) + return u"%s" % (self.inst.starter.username) submitter.short_description = _("submitter") class Meta: verbose_name = _("workflow todo") verbose_name_plural = _("workflow todo") - ordering = ['user','-arrived_time'] + ordering = ['user', '-arrived_time'] -def get_modal(app_label,model_name): +def get_modal(app_label, model_name): """ :param app_label: @@ -248,7 +256,7 @@ def get_modal(app_label,model_name): :return: """ try: - return Modal.objects.get(app_name=app_label,model_name=model_name) + return Modal.objects.get(app_name=app_label, model_name=model_name) except Exception: return None @@ -260,10 +268,10 @@ def get_instance(obj): :return: """ if obj and obj._meta: - modal = get_modal(obj._meta.app_label,obj._meta.model_name) + modal = get_modal(obj._meta.app_label, obj._meta.model_name) if modal: try: - return Instance.objects.get(modal=modal,object_id=obj.id) + return Instance.objects.get(modal=modal, object_id=obj.id) except Exception: return None else: diff --git a/workflow/views.py b/workflow/views.py index 794fd06..46ca16f 100644 --- a/workflow/views.py +++ b/workflow/views.py @@ -8,16 +8,16 @@ from django.contrib import messages from django.contrib.auth.models import User from django.utils.translation import ugettext_lazy as _ -from workflow.models import Modal,Instance,TodoList,History,Node -from plugin.wfnodes import NextNodeManager,NextNodeHandler -from plugin.wfusers import NextUserManager,NextUserHandler -from plugin.wfactions import WorkflowActionManager,WorkflowAction +from workflow.models import Modal, Instance, TodoList, History, Node +from plugin.wfnodes import NextNodeManager, NextNodeHandler +from plugin.wfusers import NextUserManager, NextUserHandler +from plugin.wfactions import WorkflowActionManager, WorkflowAction SELECTED_CHECKBOX_NAME = 'NEXT_NODE_USER' -def compile_node_handler(request,obj,next_node): +def compile_node_handler(request, obj, next_node): """ :param request: :param obj: @@ -31,8 +31,8 @@ def compile_node_handler(request,obj,next_node): if next_user_handler: # print 'it is here' klass = NextUserManager().handlers.get(next_user_handler) - if klass and isinstance(klass,NextUserHandler): - return klass.handle(request,obj,next_node) + if klass and isinstance(klass, NextUserHandler): + return klass.handle(request, obj, next_node) if handler and handler != '': handler = handler.replace("submitter()", request.user.username) @@ -41,11 +41,11 @@ def compile_node_handler(request,obj,next_node): for field in fields: name = field.name temp = "{{%s}}" % name - val = getattr(obj,name,None) + val = getattr(obj, name, None) if val: - if type(val)!=str: + if not isinstance(val, str): val = str(val) - handler = handler.replace(temp,val) + handler = handler.replace(temp, val) cursor = connection.cursor() cursor.execute(handler) rows = [row for row in cursor.fetchall()] @@ -77,20 +77,20 @@ def compile_node_handler(request,obj,next_node): return [] -def start(request,app,model,object_id): +def start(request, app, model, object_id): """ :param request: :return: """ import datetime - content_type = ContentType.objects.get(app_label=app,model=model) + content_type = ContentType.objects.get(app_label=app, model=model) obj = content_type.get_object_for_this_type(id=int(object_id)) title = _("Are you sure?") opts = obj._meta objects_name = force_text(opts.verbose_name) has_workflow = False - queryset = Modal.objects.filter(content_type=content_type,end__gt=datetime.date.today()).order_by('-end') + queryset = Modal.objects.filter(content_type=content_type, end__gt=datetime.date.today()).order_by('-end') cnt = queryset.count() workflow_modal = None next_node = None @@ -103,40 +103,40 @@ def start(request,app,model,object_id): query_first_node = workflow_modal.node_set.order_by('id') if query_start_node.count() > 0: next_node = query_start_node[0] - elif query_first_node.count()>0: + elif query_first_node.count() > 0: next_node = query_first_node[0] if next_node: - next_users = compile_node_handler(request,obj,next_node) + next_users = compile_node_handler(request, obj, next_node) if len(next_users) > 0: has_next_user = True else: title = _("No workflow model was found") try: - tmp = Instance.objects.get(modal = workflow_modal,object_id=object_id) - messages.warning(request,_("the object is already in workflow")) - return HttpResponseRedirect("/admin/%s/%s/%s"%(app,model,object_id)) + tmp = Instance.objects.get(modal=workflow_modal, object_id=object_id) + messages.warning(request, _("the object is already in workflow")) + return HttpResponseRedirect("/admin/%s/%s/%s" % (app, model, object_id)) except Exception: pass if request.POST.get("post"): val = request.POST.getlist(SELECTED_CHECKBOX_NAME) - workflow_inst = Instance.objects.create(modal=workflow_modal,object_id=object_id,starter=request.user) + workflow_inst = Instance.objects.create(modal=workflow_modal, object_id=object_id, starter=request.user) workflow_inst.current_nodes.add(next_node) workflow_inst.save() - workflow_history = History.objects.create(inst=workflow_inst,user=request.user) + workflow_history = History.objects.create(inst=workflow_inst, user=request.user) for user in User.objects.filter(id__in=val): - todo = TodoList.objects.create(inst=workflow_inst,node=next_node,user=user,app_name=app,model_name=model) - TodoList.objects.create(inst=workflow_inst,user=request.user,app_name=app,model_name=model,is_read=True, - read_time=datetime.datetime.now(),status=True) + todo = TodoList.objects.create(inst=workflow_inst, node=next_node, user=user, app_name=app, model_name=model) + TodoList.objects.create(inst=workflow_inst, user=request.user, app_name=app, model_name=model, is_read=True, + read_time=datetime.datetime.now(), status=True) if next_node.status_field and next_node.status_value: try: - setattr(obj,next_node.status_field,next_node.status_value) + setattr(obj, next_node.status_field, next_node.status_value) obj.save() except Exception: pass - messages.success(request,_('workflow started successfully')) - return HttpResponseRedirect("/admin/%s/%s/%s"%(app,model,object_id)) + messages.success(request, _('workflow started successfully')) + return HttpResponseRedirect("/admin/%s/%s/%s" % (app, model, object_id)) context = dict( site.each_context(request), @@ -144,52 +144,52 @@ def start(request,app,model,object_id): opts=opts, objects_name=objects_name, object=obj, - has_workflow = has_workflow, - workflow_modal = workflow_modal, - next_node = next_node, - has_next_user = has_next_user, - next_users = next_users, - checkbox_name = SELECTED_CHECKBOX_NAME, + has_workflow=has_workflow, + workflow_modal=workflow_modal, + next_node=next_node, + has_next_user=has_next_user, + next_users=next_users, + checkbox_name=SELECTED_CHECKBOX_NAME, ) request.current_app = site.name - return TemplateResponse(request,'default/workflow/workflow_start_confirmation.html', context) + return TemplateResponse(request, 'default/workflow/workflow_start_confirmation.html', context) -def approve(request,app,model,object_id,operation): +def approve(request, app, model, object_id, operation): """ :param request: :param operation: :return: """ - if operation not in ('1','3','4'): - messages.warning(request,_("unkown workflow operation")) - return HttpResponseRedirect("/admin/%s/%s/%s"%(app,model,object_id)) + if operation not in ('1', '3', '4'): + messages.warning(request, _("unkown workflow operation")) + return HttpResponseRedirect("/admin/%s/%s/%s" % (app, model, object_id)) import datetime import copy - content_type = ContentType.objects.get(app_label=app,model=model) + content_type = ContentType.objects.get(app_label=app, model=model) obj = content_type.get_object_for_this_type(id=int(object_id)) title = _("Are you sure?") opts = obj._meta objects_name = force_text(opts.verbose_name) has_workflow = False - queryset = Modal.objects.filter(content_type=content_type,end__gt=datetime.date.today()).order_by('-end') + queryset = Modal.objects.filter(content_type=content_type, end__gt=datetime.date.today()).order_by('-end') cnt = queryset.count() workflow_modal = None if cnt > 0: workflow_modal = queryset[0] else: - messages.warning(request,_("No workflow model was found")) - return HttpResponseRedirect("/admin/%s/%s/%s"%(app,model,object_id)) + messages.warning(request, _("No workflow model was found")) + return HttpResponseRedirect("/admin/%s/%s/%s" % (app, model, object_id)) workflow_instance = None try: - workflow_instance = Instance.objects.get(modal = workflow_modal,object_id=object_id) + workflow_instance = Instance.objects.get(modal=workflow_modal, object_id=object_id) except Exception: - messages.warning(request,_("please start the workflow first")) - return HttpResponseRedirect("/admin/%s/%s/%s"%(app,model,object_id)) + messages.warning(request, _("please start the workflow first")) + return HttpResponseRedirect("/admin/%s/%s/%s" % (app, model, object_id)) next_nodes = [] node_users = [] @@ -198,7 +198,7 @@ def approve(request,app,model,object_id,operation): delete_instance = False deny_to_first = False next_node_description = None - all_nodes =[x for x in Node.objects.filter(modal=workflow_modal).order_by('-id')] + all_nodes = [x for x in Node.objects.filter(modal=workflow_modal).order_by('-id')] current = workflow_instance.current_nodes.all() current_tmp = copy.deepcopy(current[0]) if operation == '4' or operation == '3': @@ -216,16 +216,16 @@ def approve(request,app,model,object_id,operation): if tmp_node.next_node_handler and len(tmp_node.next_node_handler) > 0: hd = tmp_node.next_node_handler klass = NextNodeManager().handlers.get(hd) - if klass and isinstance(klass,NextNodeHandler): - next_nodes = klass.handle(request,obj,tmp_node) + if klass and isinstance(klass, NextNodeHandler): + next_nodes = klass.handle(request, obj, tmp_node) next_node_description = klass.description if next_nodes and len(next_nodes) > 0: pass - elif tmp_node.next and tmp_node.next.count()>0: + elif tmp_node.next and tmp_node.next.count() > 0: next_nodes = [nd for nd in tmp_node.next.all()] else: position = all_nodes.index(tmp_node) - next_nodes = [all_nodes[position-1]] + next_nodes = [all_nodes[position - 1]] if request.POST.get("post"): from django.db import transaction @@ -248,32 +248,38 @@ def approve(request,app,model,object_id,operation): workflow_instance.current_nodes.clear() workflow_instance.current_nodes.add(next_nodes[0]) for user in User.objects.filter(id__in=val): - todo = TodoList.objects.create(inst=workflow_instance,node=next_nodes[0],user=user,app_name=app,model_name=model) + todo = TodoList.objects.create( + inst=workflow_instance, node=next_nodes[0], user=user, app_name=app, model_name=model) if current_tmp.status_field and current_tmp.status_value: try: - setattr(obj,current_tmp.status_field,current_tmp.status_value) + setattr(obj, current_tmp.status_field, current_tmp.status_value) obj.save() except Exception: pass - History.objects.create(inst=workflow_instance,user=request.user,pro_type=int(operation),memo=memo,node=current_tmp) - TodoList.objects.filter(inst=workflow_instance,node=current_tmp,status=0).update(status=1) - messages.success(request,_('workflow approved successfully')) + History.objects.create( + inst=workflow_instance, + user=request.user, + pro_type=int(operation), + memo=memo, + node=current_tmp) + TodoList.objects.filter(inst=workflow_instance, node=current_tmp, status=0).update(status=1) + messages.success(request, _('workflow approved successfully')) except Exception as e: - messages.error(request,e) + messages.error(request, e) pass if current_tmp.action and len(current_tmp.action) > 0: action = WorkflowActionManager().actions.get(current_tmp.action) - if action and isinstance(action,WorkflowAction): - action.action(request,obj,current_tmp,operation) + if action and isinstance(action, WorkflowAction): + action.action(request, obj, current_tmp, operation) - return HttpResponseRedirect("/admin/%s/%s/%s"%(app,model,object_id)) + return HttpResponseRedirect("/admin/%s/%s/%s" % (app, model, object_id)) if len(next_nodes) > 0 and not is_stop_node and operation == '1': for node in next_nodes: - users = compile_node_handler(request,obj,node) + users = compile_node_handler(request, obj, node) if len(users) > 0: node_has_users = True - node_users.append({'node':node,'users':users}) + node_users.append({'node': node, 'users': users}) context = dict( site.each_context(request), @@ -281,19 +287,19 @@ def approve(request,app,model,object_id,operation): opts=opts, objects_name=objects_name, object=obj, - operation = operation, - is_stop_node = is_stop_node, - delete_instance = delete_instance, - node_users = node_users, - node_has_users = node_has_users, - checkbox_name = SELECTED_CHECKBOX_NAME, + operation=operation, + is_stop_node=is_stop_node, + delete_instance=delete_instance, + node_users=node_users, + node_has_users=node_has_users, + checkbox_name=SELECTED_CHECKBOX_NAME, ) if next_node_description: context.update(dict(next_node_description=next_node_description)) - return TemplateResponse(request,"default/workflow/workflow_approve_confirmation.html",context) + return TemplateResponse(request, "default/workflow/workflow_approve_confirmation.html", context) -def restart(request,app,model,object_id,instance): +def restart(request, app, model, object_id, instance): """ :param request: @@ -306,9 +312,9 @@ def restart(request,app,model,object_id,instance): inst = Instance.objects.get(id=int(instance)) if request.user == inst.starter: inst.delete() - messages.success(request,_("workflow restarted success")) + messages.success(request, _("workflow restarted success")) else: - messages.warning(request,_("you do not have the permission to restart,only the starter can restart")) + messages.warning(request, _("you do not have the permission to restart,only the starter can restart")) except Exception as e: - messages.error(request,e) - return HttpResponseRedirect("/admin/%s/%s/%s"%(app,model,object_id)) + messages.error(request, e) + return HttpResponseRedirect("/admin/%s/%s/%s" % (app, model, object_id)) From 058a9bc27609a71d0886fba78e5cc57dbb28c46d Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 15 Jun 2020 14:48:21 +0800 Subject: [PATCH 12/65] Updated settings --- mis/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mis/settings.py b/mis/settings.py index 62d7254..a3f3b4c 100644 --- a/mis/settings.py +++ b/mis/settings.py @@ -24,7 +24,8 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = ['127.0.0.1', 'localhost'] +# ALLOWED_HOSTS = ['127.0.0.1', 'localhost'] +ALLOWED_HOSTS = ['*'] # Application definition From f40efa34fd14eb463b647549de042ae835808b47 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 15 Jun 2020 15:50:49 +0800 Subject: [PATCH 13/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 109 ++++++++++++++++++++++++++++++++++++++++++--- common/generic.py | 8 ++++ note.md | 10 ++++- 3 files changed, 119 insertions(+), 8 deletions(-) diff --git a/basedata/models.py b/basedata/models.py index aa5e3c5..6b46990 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -18,6 +18,7 @@ class ValueList(generic.BO): """ 值列表 """ + index_weight = 9 code = models.CharField( _("list code"), @@ -64,6 +65,7 @@ class ValueListItem(ToStringMixin, models.Model): """ 值列表项 """ + group = models.ForeignKey( ValueList, verbose_name=_("list group"), @@ -126,29 +128,40 @@ class Address(generic.BO): """ 地址 """ + ADDRESS_TYPE = get_value_list('S011') + # 地址类型 + # - 送货地址 + # - 发票地址 + # - 临时地址 address_type = models.CharField( _("address type"), max_length=const.DB_CHAR_CODE_2, choices=ADDRESS_TYPE, default='01') + # 地址 address = models.CharField(_("address"), max_length=const.DB_CHAR_NAME_120) + # 邮编 zipcode = models.CharField( _("zipcode"), max_length=const.DB_CHAR_CODE_8, blank=True, null=True) + # 联系电话 phone = models.CharField( _("phone"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 联系人 contacts = models.CharField( _("contacts"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 通用类型 + # 让地址模型可以与各种模型关联起来 content_type = models.ForeignKey( ContentType, blank=True, @@ -166,12 +179,14 @@ class Partner(generic.BO): """ 合作伙伴 """ + index_weight = 3 PARTNER_TYPE = ( - ('C', _('Customer')), - ('S', _('Supplier')), + ('C', _('Customer')), # 客户 + ('S', _('Supplier')), # 供应商 ) + # 等级 LEVEL = ( ('A', 'A'), ('B', 'B'), @@ -184,61 +199,72 @@ class Partner(generic.BO): blank=True, null=True, on_delete=models.CASCADE) + # 合作伙伴编号 code = models.CharField( _("partner code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 名称 name = models.CharField( _("partner name"), max_length=const.DB_CHAR_NAME_120) + # 简称 short = models.CharField( _("short name"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 拼音/英文 pinyin = models.CharField( _("pinyin"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 合作伙伴类型 partner_type = models.CharField( _("type"), max_length=const.DB_CHAR_CODE_2, choices=PARTNER_TYPE, default='C') + # 等级 level = models.CharField( _("level"), max_length=const.DB_CHAR_CODE_2, choices=LEVEL, default='C') + # 纳税识别号 tax_num = models.CharField( _("tax num"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 开票地址 tax_address = models.CharField( _("tax address"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 发票开户行 tax_account = models.CharField( _("tax account"), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) - + # 联系人 contacts = models.CharField( _("contacts"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 联系电话 phone = models.CharField( _("phone"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 备注 memo = models.TextField(_("memo"), blank=True, null=True) class Meta: @@ -254,6 +280,7 @@ class BankAccount(generic.BO): """ 银行账户 organization """ + account = models.CharField( _("account num"), max_length=const.DB_CHAR_NAME_40) @@ -293,6 +320,7 @@ class Project(generic.BO): """ 工程项目 """ + STATUS = get_value_list('S012') TYPES = get_value_list('S013') index_weight = 1 @@ -508,6 +536,7 @@ class Category(ToStringMixin, models.Model): """ 分类 """ + index_weight = 100 trade = models.ForeignKey( Trade, @@ -545,6 +574,7 @@ class TechnicalParameterName(ToStringMixin, models.Model): """ 技术参数-名称，将技术参数绑定于物料分类上，在此分类下的物料自动继承全部技术参数 """ + index_weight = 7 category = models.ForeignKey( Category, @@ -565,6 +595,7 @@ class TechnicalParameterValue(ToStringMixin, models.Model): """ 技术参数-值，将技术参数绑定于物料分类上，在此分类下的物料自动继承全部技术参数 """ + tech_name = models.ForeignKey( TechnicalParameterName, verbose_name=_("technical name"), @@ -588,36 +619,44 @@ class Material(generic.BO): """ 物料 """ + index_weight = 4 + # 编号 code = models.CharField( _("material code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 条形码 barcode = models.CharField( _("bar code"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 名称 name = models.CharField( _("material name"), max_length=const.DB_CHAR_NAME_120) + # 规格型号 spec = models.CharField( _("specifications"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 拼音 pinyin = models.CharField( _("pinyin"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 品牌 brand = models.ForeignKey( Brand, blank=True, null=True, verbose_name=_("brand"), on_delete=models.CASCADE) + # 分类 category = models.ForeignKey( Category, blank=True, @@ -631,17 +670,23 @@ class Material(generic.BO): max_length=const.DB_CHAR_CODE_2, choices=const.get_value_list('S054'), default='10') + # 状态：是否在用 status = models.BooleanField(_("in use"), default=True) + # 是否是设备 is_equip = models.BooleanField(_("is equipment"), default=False) + # 是否可以销售 can_sale = models.BooleanField(_("can sale"), default=True) + # 是否是虚拟 is_virtual = models.BooleanField(_("is virtual"), default=False) + # 仓库 warehouse = models.ForeignKey( Warehouse, blank=True, null=True, verbose_name=_("warehouse"), on_delete=models.CASCADE) + # 计量单位 measure = models.ManyToManyField(Measure, verbose_name=_("measure")) params = models.ManyToManyField( @@ -649,18 +694,21 @@ class Material(generic.BO): verbose_name=_("technical parameter"), through='MaterialParam') + # 库存单价 stock_price = models.DecimalField( _("stock price"), max_digits=14, decimal_places=4, blank=True, null=True) + # 采购单价 purchase_price = models.DecimalField( _("purchase price"), max_digits=14, decimal_places=4, blank=True, null=True) + # 销售单价 sale_price = models.DecimalField( _("sale price"), max_digits=14, @@ -686,17 +734,21 @@ class Meta: class MaterialParam(ToStringMixin, models.Model): """ - + 物料扩展参数 """ + material = models.ForeignKey(Material, on_delete=models.CASCADE) + # 参数数值 param_value = models.ForeignKey( TechnicalParameterValue, on_delete=models.CASCADE) + # 参数名称 param_name = models.ForeignKey( TechnicalParameterName, blank=Trade, null=True, on_delete=models.CASCADE) + # 创建时间 creation = models.DateField(auto_now_add=True) def __unicode__(self): @@ -709,8 +761,9 @@ class Meta: class ExtraParam(ToStringMixin, models.Model): """ - + 额外的参数 """ + DATA_TYPE = ( ('CHAR', _('CHAR')), ('NUM', _('NUMBER')), @@ -744,6 +797,7 @@ class ExpenseAccount(generic.BO): """ 费用科目 """ + CATEGORY = ( ('HR', _('HR-DOMAIN')), ('OF', _('OFFICE-DOMAIN')), @@ -789,12 +843,15 @@ class Employee(generic.BO): """ 职员信息 """ + index_weight = 2 + # 工号 code = models.CharField( _("employee number"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 联系电话 phone = models.CharField( _("phone"), max_length=const.DB_CHAR_NAME_20, @@ -806,14 +863,17 @@ class Employee(generic.BO): null=True, blank=True, on_delete=models.CASCADE) + # 姓名 name = models.CharField( _("employee name"), max_length=const.DB_CHAR_NAME_120) + # 拼音/英语 pinyin = models.CharField( _("pinyin"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 生日 birthday = models.DateField(_("birthday"), blank=True, null=True) gender = models.CharField( @@ -823,6 +883,7 @@ class Employee(generic.BO): default='1') idcard = models.CharField(_("id card"), max_length=const.DB_CHAR_NAME_20) + # 国籍 country = models.CharField( _("nationality"), max_length=const.DB_CHAR_CODE_2, @@ -876,7 +937,9 @@ class Employee(generic.BO): default='00', choices=const.get_value_list('S017')) + # 参加工作日期 workday = models.DateField(_("workday"), blank=True, null=True) + # 入职日期 startday = models.DateField(_("start date"), blank=True, null=True) religion = models.CharField( @@ -998,6 +1061,7 @@ class Employee(generic.BO): choices=const.get_value_list('S027'), default='0') + # 关联帐号 user = models.ForeignKey( User, verbose_name=_("user"), @@ -1006,12 +1070,14 @@ class Employee(generic.BO): on_delete=models.CASCADE) def age(self): + """年龄""" import datetime if self.birthday: cnt = datetime.date.today().year - self.birthday.year return cnt def work_age(self): + """工龄""" import datetime if self.birthday and self.workday: cnt = datetime.date.today().year - self.workday.year @@ -1035,6 +1101,7 @@ class Family(generic.BO): """ 家庭成员 """ + relation = models.CharField( _("family title"), max_length=const.DB_CHAR_CODE_2, @@ -1048,18 +1115,23 @@ class Family(generic.BO): null=True, choices=const.get_value_list('S029'), default='17') + # 姓名 name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_60) + # 出生日期 birthday = models.DateField(_("birthday"), blank=True, null=True) + # 组织机构 organization = models.CharField( _("organization"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 联系电话 phone = models.CharField( _("phone"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 紧急联系人 emergency = models.BooleanField(_("emergency"), default=False) employee = models.ForeignKey( Employee, @@ -1075,6 +1147,8 @@ class Education(generic.BO): """ 教育履历 """ + + # 教育类型 edu_type = models.CharField( _("edu type"), max_length=const.DB_CHAR_CODE_2, @@ -1086,6 +1160,7 @@ class Education(generic.BO): max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 学历 degree = models.CharField( _("major degree"), max_length=const.DB_CHAR_CODE_2, @@ -1093,6 +1168,7 @@ class Education(generic.BO): null=True, choices=const.get_value_list('S037'), default='4') + # 关联的职员 employee = models.ForeignKey( Employee, verbose_name=_("employee"), @@ -1107,6 +1183,7 @@ class WorkExperience(generic.BO): """ 工作履历 """ + organization = models.CharField( _("organization"), max_length=const.DB_CHAR_NAME_120) @@ -1124,22 +1201,27 @@ class Meta: class DataImport(generic.BO): - """ - Data import + 数据导入 """ + actions = {} STATUS = ( + # 新建 ('0', _('NEW')), + # 执行 ('1', _('EXECUTED')), ) + # 导入日期 imp_date = models.DateField( _('date'), blank=True, null=True, default=datetime.datetime.today) + # 标题 title = models.CharField(_('title'), max_length=const.DB_CHAR_NAME_40) + # 描述 description = models.TextField(_('description'), blank=True, null=True) content_type = models.ForeignKey( ContentType, @@ -1150,17 +1232,21 @@ class DataImport(generic.BO): 'organ', 'auth']}, on_delete=models.CASCADE) + # 附件 attach = models.FileField( _('attach'), blank=True, null=True, upload_to='data') + # 是否清除旧数据 is_clear = models.BooleanField(_('clear old data?'), default=0) + # 处理类 handler = models.CharField( _('handler class'), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) + # 状态 status = models.CharField( _('status'), max_length=const.DB_CHAR_CODE_2, @@ -1223,6 +1309,7 @@ class Document(generic.BO): """ 文档管理 """ + TP = ( ('00', _('SYSTEM MANUAL')), ('10', _('BUSINESS DOC')), @@ -1232,23 +1319,28 @@ class Document(generic.BO): ('1', _('published')) ) index_weight = 8 + # 编号 code = models.CharField( _('code'), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 标题 title = models.CharField(_('title'), max_length=const.DB_CHAR_NAME_120) + # 关键词 keywords = models.CharField( _('keywords'), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 描述信息 description = models.TextField(_('description'), blank=True, null=True) tp = models.CharField( _('type'), max_length=const.DB_CHAR_CODE_2, default='10', choices=TP) + # 业务域 business_domain = models.CharField( _("business domain"), max_length=const.DB_CHAR_CODE_4, @@ -1260,17 +1352,20 @@ class Document(generic.BO): blank=True, null=True, on_delete=models.CASCADE) + # 状态 status = models.CharField( _('status'), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) + # 发布时间 pub_date = models.DateTimeField(_('publish date'), blank=True, null=True) size = models.CharField( _('size'), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 附件 attach = models.FileField( _('attach'), blank=True, diff --git a/common/generic.py b/common/generic.py index ecc040f..45d64a1 100644 --- a/common/generic.py +++ b/common/generic.py @@ -85,12 +85,20 @@ def __str__(self): class BO(ToStringMixin, models.Model): """ All business object derive from this class + + 通用事务对象抽象类 """ + # 开始日期 begin = models.DateField(_('begin date'), blank=True, null=True) + # 结束日期 end = models.DateField(_('end date'), blank=True, null=True) + # 创建者 creator = models.CharField(_("creator"), blank=True, null=True, max_length=const.DB_CHAR_NAME_20) + # 修改者 modifier = models.CharField(_("modifier"), blank=True, null=True, max_length=const.DB_CHAR_NAME_20) + # 创建datetime creation = models.DateTimeField(_('creation'), auto_now_add=True, blank=True, null=True) + # 修改datetime modification = models.DateTimeField(_('modification'), auto_now=True, blank=True, null=True) # mine = MineBOManager() objects = models.Manager() diff --git a/note.md b/note.md index 0e234a3..bb58a1a 100644 --- a/note.md +++ b/note.md @@ -4,12 +4,13 @@ ## 快速开始 - pipenv install + pipenv install --pypi-mirror https://mirrors.aliyun.com/pypi/simple/ pipenv shell # python manage.py makemigrations sale purchase invent hr selfhelp workflow organ basedata syscfg python manage.py migrate # 使用mysql的话，在这里执行 `install/SQL/mis.sql` 语句 + > mysql -u root -p root mis < Install/SQL/mis.sql # 创建管理员或者修改管理员密码 # python manage.py changepassword admin @@ -17,3 +18,10 @@ python manage.py runserver + +## Ubuntu下部署 + +如果安装 mysqlclient 时报错，需要先安装下面扩展包 + + sudo apt-get install -y build-essential libssl-dev libffi-dev libxml2 libxml2-dev libxslt1-dev zlib1g-dev + sudo apt-get install -y libmysqlclient-dev python3-dev From 2d0ba7c4e8c65afa484c1c82457563ade2bc7a20 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 15 Jun 2020 16:30:22 +0800 Subject: [PATCH 14/65] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E9=83=A8=E9=97=A8=E5=B2=97=E4=BD=8D=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 5 +- plugin/xls.py | 21 ++- .../basedata/dataimport/change_form.html | 148 ++++++++++++++++++ 3 files changed, 167 insertions(+), 7 deletions(-) create mode 100644 templates/admin/basedata/dataimport/change_form.html diff --git a/basedata/models.py b/basedata/models.py index 6b46990..a526384 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -11,7 +11,7 @@ from syscfg.models import Module, Site from organ.models import Organization, Position import datetime -from plugin.xls import ExcelManager +from plugin.xls import ExcelManager, excel_manager class ValueList(generic.BO): @@ -1257,7 +1257,8 @@ def action_import(self, request): from django.db import transaction if self.attach: if self.handler: - klass = ExcelManager().handlers.get(self.handler) + # klass = ExcelManager().handlers.get(self.handler) + klass = excel_manager.handlers.get(self.handler) with transaction.atomic(): klass.handle(self, self.attach) self.status = 1 diff --git a/plugin/xls.py b/plugin/xls.py index 566f961..9bfdf0e 100644 --- a/plugin/xls.py +++ b/plugin/xls.py @@ -18,6 +18,7 @@ class OPSHandler(Handler): """ 导入基础信息：部门，岗位，职员 """ + name = 'OPS' def handle(self, obj, f): @@ -40,7 +41,7 @@ def department(self, obj, sheet): for row_index in range(1, row_count): row = sheet.row_values(row_index) weight = 99 - if row[6]: + if len(row) > 6: weight = row[6] OrgUnit.objects.create(code=row[0], name=row[1], short=row[2], pinyin=row[3], begin=datetime.date.today(), end=datetime.date(9999, 12, 31), weight=weight) @@ -67,7 +68,7 @@ def position(self, obj, sheet): except Exception: pass weight = 99 - if row[6]: + if len(row) > 6: weight = row[6] Position.objects.create(code=row[0], name=row[1], unit=depart, begin=datetime.date.today(), end=datetime.date(9999, 12, 31), weight=weight) @@ -92,9 +93,16 @@ def stuff(self, obj, sheet): for row_index in range(1, row_count): row = sheet.row_values(row_index) position = Position.objects.filter(code=row[8], end__gt=datetime.date.today()).all()[0] - username = row[10] - email = row[11] - password = row[4][-6:] + + try: + username = row[10] + email = row[11] + password = row[4][-6:] + except IndexError: + username = None + email = None + password = None + if position is None: raise Exception(u'职员%s-%s未分配岗位，或者您选择的岗位已失效，不可被引用' % (row[0], row[1])) try: @@ -180,3 +188,6 @@ def register(cls, handler): raise Exception('%s already exists,register failed' % handler.name) if issubclass(handler, Handler): ExcelManager.handlers[handler.name] = handler() + + +excel_manager = ExcelManager() diff --git a/templates/admin/basedata/dataimport/change_form.html b/templates/admin/basedata/dataimport/change_form.html new file mode 100644 index 0000000..77e6a00 --- /dev/null +++ b/templates/admin/basedata/dataimport/change_form.html @@ -0,0 +1,148 @@ +{% extends "admin/base_site.html" %} +{% load i18n admin_urls static admin_modify %} + +{% block extrahead %}{{ block.super }} + +{{ media }} +{% endblock %} + +{% block extrastyle %}{{ block.super }}{% endblock %} + +{% block coltype %}colM{% endblock %} + +{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %} + +{% if not is_popup %} +{% block breadcrumbs %} +

+{% trans 'Home' %} +› {{ opts.app_config.verbose_name }} +› {% if has_change_permission %}{{ opts.verbose_name_plural|capfirst }}{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} +› {% if add %}{% trans 'Add' %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %} +
+{% endblock %} +{% endif %} + +{% block content %}
+{% block object-tools %} +{% if change %}{% if not is_popup %} + +{% endif %}{% endif %} +{% endblock %} +
{% csrf_token %}{% block form_top %}{% endblock %} +
+{% if is_popup %}{% endif %} +{% if to_field %}{% endif %} +{% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %} +{% if show_workflow_line%} +
+

{% trans "workflow approve" %}

+
+ {% if can_restart %} + {% trans "restart workflow" %} +

{% trans "your apply has been denied,you can restart a new apply" %}

+ {% else %} + + + + {% trans "submit" %} + {% endif %} +
+
+{% endif %} +{% if errors %} +

+ {% if errors|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} +

+ {{ adminform.form.non_field_errors }} +{% endif %} + +{% block field_sets %} +{% for fieldset in adminform %} + {% include "admin/includes/fieldset.html" %} +{% endfor %} +{% endblock %} + +{% block after_field_sets %}{% endblock %} + +{% block inline_field_sets %} +{% for inline_admin_formset in inline_admin_formsets %} + {% include inline_admin_formset.opts.template %} +{% endfor %} +{% endblock %} + +{% block after_related_objects %}{% endblock %} + +{% block submit_buttons_bottom %}{% submit_row %}{% endblock %} + +{% block admin_change_form_document_ready %} + +{% endblock %} + +{# JavaScript for prepopulated fields #} +{% prepopulated_fields_js %} + +
+
+{% endblock %} From 02204f73567382264e51e30f65a2473953f63f13 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 15 Jun 2020 16:32:03 +0800 Subject: [PATCH 15/65] Updated .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 04655ca..3168b16 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.sqlite3 .vscode/ .venv/ +upload/ From 196cd3b4bf3e7621b6351e98b078ac3213a21d72 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 15 Jun 2020 17:02:48 +0800 Subject: [PATCH 16/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/basedata/models.py b/basedata/models.py index a526384..c4bb4d4 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -20,27 +20,35 @@ class ValueList(generic.BO): """ index_weight = 9 + # 编号 code = models.CharField( _("list code"), max_length=const.DB_CHAR_CODE_6, blank=True, null=True) + # 名称 name = models.CharField(_("list name"), max_length=const.DB_CHAR_NAME_40) + # 模块 module = models.ForeignKey( Module, verbose_name=_("module"), blank=True, null=True, on_delete=models.CASCADE) + # 状态 - 是否在用 status = models.BooleanField(_("in use"), default=True) + # 是否是初始数据 init = models.BooleanField(_("is init"), default=False) + # 是否锁定 locked = models.BooleanField(_("is locked"), default=False) + # 锁定用户 locked_by = models.ForeignKey( User, verbose_name=_("locked by"), blank=True, null=True, on_delete=models.CASCADE) + # 锁定日期时间 lock_time = models.DateTimeField(_("locked time"), null=True, blank=True) def save(self, force_insert=False, force_update=False, using=None, @@ -663,6 +671,7 @@ class Material(generic.BO): null=True, verbose_name=_("category"), on_delete=models.CASCADE) + # 物料性质 - Material type tp = models.CharField( _('mt type'), blank=True, From 12de9acbbb599c25e8568796eb0226357929c328 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 15 Jun 2020 17:04:44 +0800 Subject: [PATCH 17/65] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/basedata/models.py b/basedata/models.py index c4bb4d4..24ddaaf 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -51,15 +51,8 @@ class ValueList(generic.BO): # 锁定日期时间 lock_time = models.DateTimeField(_("locked time"), null=True, blank=True) - def save(self, force_insert=False, force_update=False, using=None, - update_fields=None): - super( - ValueList, - self).save( - force_insert, - force_update, - using, - update_fields) + def save(self, force_insert=False, force_update=False, using=None, update_fields=None): + super(ValueList, self).save(force_insert, force_update, using, update_fields) sql = 'update basedata_valuelistitem set group_code = %s where groud_id=%s' params = [self.code, self.id] generic.update(sql, params) @@ -91,19 +84,12 @@ class ValueListItem(ToStringMixin, models.Model): status = models.BooleanField(_("in use"), default=True) weight = models.IntegerField(_("weight"), null=True, default=9) - def save(self, force_insert=False, force_update=False, using=None, - update_fields=None): + def save(self, force_insert=False, force_update=False, using=None, update_fields=None): if not self.code: cnt = self.group.valuelistitem_set.count() + 1 self.code = "%02d" % cnt self.group_code = self.group.code - super( - ValueListItem, - self).save( - force_insert, - force_update, - using, - update_fields) + super(ValueListItem, self).save(force_insert, force_update, using, update_fields) def __unicode__(self): return "%s-%s" % (self.code, self.name) From 8521865bb204571ec072949bf02b630a1570c379 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 15 Jun 2020 17:15:17 +0800 Subject: [PATCH 18/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 12 +++++++++--- common/generic.py | 8 +++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/basedata/models.py b/basedata/models.py index 24ddaaf..77fe581 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -53,6 +53,7 @@ class ValueList(generic.BO): def save(self, force_insert=False, force_update=False, using=None, update_fields=None): super(ValueList, self).save(force_insert, force_update, using, update_fields) + # 同时更新 ValueListItem 模型数据的 group_code 数值 sql = 'update basedata_valuelistitem set group_code = %s where groud_id=%s' params = [self.code, self.id] generic.update(sql, params) @@ -75,13 +76,17 @@ class ValueListItem(ToStringMixin, models.Model): max_length=const.DB_CHAR_CODE_6, blank=True, null=True) + # 编号 code = models.CharField( _("item code"), max_length=const.DB_CHAR_CODE_6, blank=True, null=True) + # 名称 name = models.CharField(_("item name"), max_length=const.DB_CHAR_NAME_40) + # 是否在用？ status = models.BooleanField(_("in use"), default=True) + # 排序权重 weight = models.IntegerField(_("weight"), null=True, default=9) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): @@ -102,10 +107,11 @@ class Meta: def get_value_list(group): - """ + """获取选项值的列表 + + :param group: str - :param group: - :return: + :return: list or None """ from django.db.utils import OperationalError if group: diff --git a/common/generic.py b/common/generic.py index 45d64a1..b20c1fc 100644 --- a/common/generic.py +++ b/common/generic.py @@ -21,9 +21,11 @@ def update(sql, params=None): - """ - :param sql: - :param params: + """ 执行SQL + + :param sql: str, SQL语句 + :param params: list,参数 + :return: """ cursor = connection.cursor() From 3ca186b21e81447ad1faffba878d0c57b2f23ce7 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 15 Jun 2020 17:16:46 +0800 Subject: [PATCH 19/65] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E4=BF=AE=E8=A1=A5bug=E4=BA=A7=E7=94=9F=E7=9A=84=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5=EF=BC=8C=E7=8E=B0=E5=9C=A8=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 1 - 1 file changed, 1 deletion(-) diff --git a/basedata/models.py b/basedata/models.py index 77fe581..36aec98 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -113,7 +113,6 @@ def get_value_list(group): :return: list or None """ - from django.db.utils import OperationalError if group: try: return tuple([(item.code, item.name) for item in ValueListItem.objects.filter( From 1cf7547c9639d851b057236ccde409255430757b Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 15 Jun 2020 17:30:00 +0800 Subject: [PATCH 20/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/admin.py | 6 ++++++ basedata/models.py | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/basedata/admin.py b/basedata/admin.py index 95e3539..a256857 100644 --- a/basedata/admin.py +++ b/basedata/admin.py @@ -23,6 +23,8 @@ def get_extra(self, request, obj=None, **kwargs): class ValueListAdmin(generic.BOAdmin): + """值列表""" + CODE_NUMBER_WIDTH = 3 CODE_PREFIX = 'S' list_display = ['code', 'name', 'module', 'status'] @@ -35,6 +37,8 @@ class ValueListAdmin(generic.BOAdmin): def save_model(self, request, obj, form, change): super(ValueListAdmin, self).save_model(request, obj, form, change) + # 更新 值列表选项 的 group_code 属性 + # 似乎与 ValueList.save() 覆写的方法功能重复了 obj.valuelistitem_set.update(group_code=obj.code) @@ -353,6 +357,8 @@ def get_readonly_fields(self, request, obj=None): class DataImportAdmin(generic.BOAdmin): + """数据导入""" + list_display = ['imp_date', 'title', 'status'] list_display_links = ['imp_date', 'title'] raw_id_fields = ['content_type'] diff --git a/basedata/models.py b/basedata/models.py index 36aec98..1413535 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -90,6 +90,7 @@ class ValueListItem(ToStringMixin, models.Model): weight = models.IntegerField(_("weight"), null=True, default=9) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): + # 如果编号没赋值 if not self.code: cnt = self.group.valuelistitem_set.count() + 1 self.code = "%02d" % cnt @@ -115,8 +116,11 @@ def get_value_list(group): """ if group: try: - return tuple([(item.code, item.name) for item in ValueListItem.objects.filter( - group_code__exact=group, status=1)]) + # exact: https://docs.djangoproject.com/en/3.0/ref/models/querysets/#exact + return tuple([ + (item.code, item.name) for item in ValueListItem.objects.filter( + group_code__exact=group, status=1) + ]) except Exception: return None else: From c90a3cd86e845ef06b296305325372d176fb7a31 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 15 Jun 2020 17:50:19 +0800 Subject: [PATCH 21/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/generic.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/common/generic.py b/common/generic.py index b20c1fc..81943c2 100644 --- a/common/generic.py +++ b/common/generic.py @@ -119,8 +119,11 @@ class BOAdmin(admin.ModelAdmin): """ All business object admin derive from this class """ + # 编码长度 CODE_NUMBER_WIDTH = 4 + # 编码前缀 CODE_PREFIX = '9' + # 额外的按钮 extra_buttons = [] exclude = ['creator', 'modifier', 'creation', 'modification', 'begin', 'end'] @@ -197,7 +200,7 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No return super(BOAdmin, self).changeform_view(request, object_id, form_url, extra_context) def history_view(self, request, object_id, extra_context=None): - """ + """ 历史记录视图 :param request: :param object_id: @@ -243,8 +246,10 @@ def get_changeform_initial_data(self, request): def save_model(self, request, obj, form, change): if change: + # 修改时更新以下信息 setattr(obj, 'modifier', request.user.username) else: + # 创建时更新以下信息 setattr(obj, 'creator', request.user.username) setattr(obj, 'begin', datetime.date.today()) setattr(obj, 'end', datetime.date(9999, 12, 31)) @@ -255,6 +260,8 @@ def save_model(self, request, obj, form, change): super(BOAdmin, self).save_model(request, obj, form, change) # print '=========it is here=========' + + # 更新 obj.code try: code = getattr(obj, 'code') # print code @@ -265,12 +272,14 @@ def save_model(self, request, obj, form, change): sql = 'update %s set code = \'%s\' where id=%s' % (table, code, obj.id) update(sql) except Exception: + # 如果没有 code 字段则会进入异常分支 pass # def response_change(self, request, obj): # return HttpResponseRedirect('') def export_selected_data(self, request, queryset): + """导出所选的数据""" ops = self.model._meta workbook = xlwt.Workbook(encoding='utf-8') dd = datetime.date.today().strftime('%Y%m%d') @@ -326,8 +335,10 @@ def export_selected_data(self, request, queryset): export_selected_data.short_description = _("export selected %(verbose_name_plural)s") class Meta: + # 默认按创建时间降序排序 ordering = ['-creation'] class Media: + # 额外的前端静态文件？ css = {'all': ('css/maximus.css',)} js = ('js/maximus.js',) From 07a570ad3f478013ca66232a81a3f30b021abbce Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 15 Jun 2020 18:00:44 +0800 Subject: [PATCH 22/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/generic.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/common/generic.py b/common/generic.py index 81943c2..30e8ad5 100644 --- a/common/generic.py +++ b/common/generic.py @@ -40,18 +40,23 @@ def update(sql, params=None): def get_app_model_info_from_request(request): - """ + """ 从请求中获取app模型信息 + + :param request: django.http.HttpRequest + :return: dict or None """ if request and isinstance(request, HttpRequest): import re + # 匹配请求路径 pattern = re.compile(r"/(admin)/(\w+)/(\w+)/(\d+)") match = pattern.match(request.path) if match and match.group(): - app = match.group(2) - model = match.group(3) - oid = match.group(4) + app = match.group(2) # 第2个括号？ + model = match.group(3) # 第3个括号？ + oid = match.group(4) # 第4个括号？ + # 获取 ContentType 对象 ct = ContentType.objects.get(app_label=app, model=model) obj = ct.get_object_for_this_type(id=oid) return {'app': app, 'model': model, 'id': oid, 'obj': obj} @@ -131,7 +136,7 @@ class BOAdmin(admin.ModelAdmin): actions = ['export_selected_data'] def changeform_view(self, request, object_id=None, form_url='', extra_context=None): - """ + """修改表单视图 :param request: :param object_id: @@ -240,6 +245,10 @@ def history_view(self, request, object_id, extra_context=None): return super(BOAdmin, self).history_view(request, object_id, extra_context) def get_changeform_initial_data(self, request): + """获取修改表单的初始数据 + + https://docs.djangoproject.com/en/3.0/ref/contrib/admin/#django.contrib.admin.ModelAdmin.get_changeform_initial_data + """ import datetime return {'begin': datetime.date.today, 'end': datetime.date(9999, 12, 31)} From 8061b85a483e1a723419ac1ea388149e908a0684 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 09:28:28 +0800 Subject: [PATCH 23/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/generic.py | 2 ++ midware/cuser.py | 3 +++ mis/settings.py | 1 + 3 files changed, 6 insertions(+) diff --git a/common/generic.py b/common/generic.py index 30e8ad5..a99f897 100644 --- a/common/generic.py +++ b/common/generic.py @@ -69,6 +69,7 @@ class MineBOManager(models.Manager): """ def get_query_set(self): + # cuser.getuser(): 获取当前用户 return super(MineBOManager, self).get_query_set().filter(creator=cuser.getuser()) @@ -107,6 +108,7 @@ class BO(ToStringMixin, models.Model): creation = models.DateTimeField(_('creation'), auto_now_add=True, blank=True, null=True) # 修改datetime modification = models.DateTimeField(_('modification'), auto_now=True, blank=True, null=True) + # mine = MineBOManager() objects = models.Manager() diff --git a/midware/cuser.py b/midware/cuser.py index a85c35f..55df8b9 100644 --- a/midware/cuser.py +++ b/midware/cuser.py @@ -36,6 +36,7 @@ def getuser(): class RequestUser(MiddlewareMixin): + """当前用户中间件""" def process_request(self, request): django_user = getattr(request, 'user', None) @@ -186,6 +187,8 @@ def process_view(self, request, view_func, view_args, view_kwargs): view_kwargs['extra_context'] = context def get_my_task(self, request): + """获取我的任务""" + from workflow.models import TodoList if request and request.user: query = TodoList.objects.filter(user=request.user, status=0) diff --git a/mis/settings.py b/mis/settings.py index a3f3b4c..33be4ab 100644 --- a/mis/settings.py +++ b/mis/settings.py @@ -57,6 +57,7 @@ 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', + # 添加自定义的获取请求用户中间件 'midware.cuser.RequestUser', ) MIDDLEWARE = MIDDLEWARE_CLASSES From 33207f101fb954978cf535e510dc80ce6bef2eff Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 10:59:10 +0800 Subject: [PATCH 24/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=92=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/generic.py | 7 ++++++- organ/models.py | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/common/generic.py b/common/generic.py index a99f897..7cbefd9 100644 --- a/common/generic.py +++ b/common/generic.py @@ -126,7 +126,7 @@ class BOAdmin(admin.ModelAdmin): """ All business object admin derive from this class """ - # 编码长度 + # 编码的数字长度 CODE_NUMBER_WIDTH = 4 # 编码前缀 CODE_PREFIX = '9' @@ -277,10 +277,15 @@ def save_model(self, request, obj, form, change): code = getattr(obj, 'code') # print code if code is None or len(code) == 0: + # 生成格式化 fmt = '%s%0' + str(self.CODE_NUMBER_WIDTH) + 'd' + # 生成code，这里需要获取obj的id code = fmt % (self.CODE_PREFIX, obj.id) + # 获取数据表名称 table = obj._meta.db_table + # 生成SQL sql = 'update %s set code = \'%s\' where id=%s' % (table, code, obj.id) + # 执行SQL update(sql) except Exception: # 如果没有 code 字段则会进入异常分支 diff --git a/organ/models.py b/organ/models.py index 97cbe4d..dfa7cfe 100644 --- a/organ/models.py +++ b/organ/models.py @@ -8,13 +8,18 @@ class Organization(generic.BO): """ - 组织单位 + 组织机构 """ index_weight = 1 + # 组织编号 code = models.CharField(_("organ code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 组织名称 name = models.CharField(_("organ name"), max_length=const.DB_CHAR_NAME_120) + # 简称 short = models.CharField(_("short name"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 拼音 pinyin = models.CharField(_("pinyin"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 是否在用？ status = models.BooleanField(_("in use"), default=True) tax_num = models.CharField(_("tax num"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) @@ -55,17 +60,29 @@ class OrgUnit(generic.BO): parent = models.ForeignKey('self', verbose_name=_("parent"), null=True, blank=True, on_delete=models.CASCADE) organization = models.ForeignKey(Organization, verbose_name=_('organization'), null=True, blank=True, on_delete=models.CASCADE) + # 编号 code = models.CharField(_("code"), max_length=const.DB_CHAR_CODE_8, blank=True, null=True) + # 名称 name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_120) + # 简称 short = models.CharField(_("short name"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 拼音/英文 pinyin = models.CharField(_("pinyin"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 单元类型 unit_type = models.IntegerField(_("type"), choices=UNIT_LEVEL, default=2) + # 状态：是否在用 status = models.BooleanField(_("in use"), default=True) + # 是否虚拟 virtual = models.BooleanField(_("is virtual"), default=False) + # 传真 fax = models.CharField(_("fax"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 联系电话 phone = models.CharField(_("phone"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 联系人 contacts = models.CharField(_("contacts"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 邮箱 email = models.CharField(_("email"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 排序权重 weight = models.IntegerField(_("weight"), default=99) class Meta: @@ -92,25 +109,40 @@ class Position(generic.BO): ('05', _("EXPERT")), ) index_weight = 3 + # 关联的组织单元 unit = models.ForeignKey(OrgUnit, verbose_name=_('org unit'), on_delete=models.CASCADE) + # 关联的组织机构 organization = models.ForeignKey(Organization, verbose_name=_('organization'), null=True, blank=True, on_delete=models.CASCADE) + # 父级 parent = models.ForeignKey('self', verbose_name=_("parent"), null=True, blank=True, on_delete=models.CASCADE) + # 编号 code = models.CharField(_("position code"), max_length=const.DB_CHAR_CODE_8, blank=True, null=True) + # 岗位名称 name = models.CharField(_("position name"), max_length=const.DB_CHAR_NAME_120) + # 简称 short = models.CharField(_("short name"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 拼音/英文 pinyin = models.CharField(_("pinyin"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 岗位序列 series = models.CharField(_("position series"), max_length=1, default='A', choices=const.get_value_list('S014')) + # 岗位级别 grade = models.CharField( _("position grade"), max_length=const.DB_CHAR_CODE_2, default='01', choices=const.get_value_list('S015')) + # 是否虚拟 virtual = models.BooleanField(_("is virtual"), default=False) + # 状态：是否在用 status = models.BooleanField(_("in use"), default=True) + # 岗位说明 description = models.TextField(_("position description"), blank=True, null=True) + # 任职资格 qualification = models.TextField(_("qualification"), blank=True, null=True) + # 参考资料 document = models.FileField(_("reference"), blank=True, null=True) + # 排序权重 weight = models.IntegerField(_("weight"), default=99) def __unicode__(self): From 9d2eb597d1290f38dede62b7ce6309bf11c92510 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 11:46:26 +0800 Subject: [PATCH 25/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- organ/models.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/organ/models.py b/organ/models.py index dfa7cfe..720de65 100644 --- a/organ/models.py +++ b/organ/models.py @@ -22,22 +22,38 @@ class Organization(generic.BO): # 是否在用？ status = models.BooleanField(_("in use"), default=True) + # 纳税识别号 tax_num = models.CharField(_("tax num"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 开票地址/电话 tax_address = models.CharField(_("tax address"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 发票开户行 tax_account = models.CharField(_("tax account"), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) + # 法人代表 represent = models.CharField(_("representative "), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 地址 address = models.CharField(_("address"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 邮编 zipcode = models.CharField(_("zipcode"), max_length=const.DB_CHAR_CODE_8, blank=True, null=True) + # 传真 fax = models.CharField(_("fax"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 联系人 contacts = models.CharField(_("contacts"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 联系电话 phone = models.CharField(_("phone"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 网址 website = models.CharField(_("website"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 邮箱 email = models.CharField(_("email"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 营业执照代码 lic_code = models.CharField(_("license code"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 组织机构代码 cer_code = models.CharField(_("certificate code"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 营业执照证书 license = models.FileField(_("business license"), blank=True, null=True, upload_to='organ') + # 组织结构证书 certificate = models.FileField(_("organization code certificate"), blank=True, null=True, upload_to='organ') + # 排序权重 weight = models.IntegerField(_("weight"), default=9) class Meta: From 35b7733c66f7e356205ec44436fc72840ca91dc4 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 14:02:58 +0800 Subject: [PATCH 26/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 10 +++++++++ invent/models.py | 54 ++++++++++++++++++++++++++++++++++++++-------- purchase/models.py | 2 +- 3 files changed, 56 insertions(+), 10 deletions(-) diff --git a/basedata/models.py b/basedata/models.py index 1413535..cddef2c 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -667,6 +667,15 @@ class Material(generic.BO): verbose_name=_("category"), on_delete=models.CASCADE) # 物料性质 - Material type + # 10: 生产物料 + # 11: 办公用品 + # 20: 建筑物/培训室 + # 30: 员工宿舍 + # 40: 工卡/饭卡 + # 50: 车辆 + # 60: 图书 + # 70: 工位 + # 80: 工单服务 tp = models.CharField( _('mt type'), blank=True, @@ -719,6 +728,7 @@ class Material(generic.BO): decimal_places=4, blank=True, null=True) + # 所属组织机构 org = models.ForeignKey( Organization, verbose_name=_("organization"), diff --git a/invent/models.py b/invent/models.py index 464da9d..d98af43 100644 --- a/invent/models.py +++ b/invent/models.py @@ -22,10 +22,15 @@ class Inventory(generic.BO): 库存信息 """ index_weight = 1 + # 所属组织机构 org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + # 仓库 warehouse = models.ForeignKey(Warehouse, verbose_name=_("warehouse"), on_delete=models.CASCADE) + # 物料 material = models.ForeignKey(Material, verbose_name=_("material"), on_delete=models.CASCADE) + # 计量单位 measure = models.ForeignKey(Measure, verbose_name=_("measure"), on_delete=models.CASCADE) + # 数量 cnt = models.DecimalField(_("count"), max_digits=14, decimal_places=4) batch = models.CharField(_("batch"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) price = models.DecimalField(_("price"), max_digits=14, decimal_places=4) @@ -49,11 +54,15 @@ class InitialInventory(generic.BO): ('9', _("EXECUTED")) ) index_weight = 9 + # 编号 code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 所属组织 org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) user = models.ForeignKey(User, verbose_name=_("user"), blank=True, null=True, on_delete=models.CASCADE) status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) + # 执行时间 execute_time = models.DateTimeField(_("execute time"), blank=True, null=True) attach = models.FileField(_('attach'), blank=True, null=True, upload_to='inventory', help_text=u'参考FD0002模板文档') amount = models.DecimalField(_('money of amount'), max_digits=14, decimal_places=4, blank=True, null=True) @@ -145,13 +154,19 @@ class StockIn(generic.BO): ('9', _("EXECUTED")) ) index_weight = 3 + # 编号 code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 所属组织机构 org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + # 仓库 warehouse = models.ForeignKey(Warehouse, verbose_name=_("warehouse"), on_delete=models.CASCADE) + # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) user = models.ForeignKey(User, verbose_name=_("user"), blank=True, null=True, on_delete=models.CASCADE) status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) + # 执行时间 execute_time = models.DateTimeField(_("execute time"), blank=True, null=True) + # 关联的采购单 po = models.ForeignKey( PurchaseOrder, verbose_name=_("purchase order"), @@ -248,9 +263,11 @@ class StockOut(generic.BO): index_weight = 2 code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) project = models.ForeignKey(Project, verbose_name=_("project"), blank=True, null=True, on_delete=models.CASCADE) wo = models.ForeignKey(WorkOrder, verbose_name=_("work order"), blank=True, null=True, on_delete=models.CASCADE) + # 描述 description = models.TextField(_("description"), blank=True, null=True) amount = models.DecimalField(_("money of amount"), max_digits=14, decimal_places=4, blank=True, null=True) user = models.ForeignKey(User, verbose_name=_("out user"), blank=True, null=True, on_delete=models.CASCADE) @@ -301,18 +318,21 @@ class WareReturn(generic.BO): 返库单 """ STATUS = ( - ('0', _("NEW")), - ('1', _("IN PROGRESS")), - ('9', _("EXECUTED")) + ('0', _("NEW")), # 新建 + ('1', _("IN PROGRESS")), # 在处理 + ('9', _("EXECUTED")) # 已执行 ) index_weight = 5 code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + # 关联的出库单 out = models.ForeignKey(StockOut, verbose_name=_('StockOut'), on_delete=models.CASCADE) amount = models.DecimalField(_("money of amount"), max_digits=14, decimal_places=4, blank=True, null=True) user = models.ForeignKey(User, verbose_name=_("out user"), blank=True, null=True, on_delete=models.CASCADE) status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) + # 执行时间 execute_time = models.DateTimeField(_("execute time"), blank=True, null=True) def save(self, force_insert=False, force_update=False, using=None, @@ -366,13 +386,17 @@ class WareAdjust(generic.BO): index_weight = 4 code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + # 描述 description = models.TextField(_("description"), blank=True, null=True) user = models.ForeignKey(User, verbose_name=_("out user"), blank=True, null=True, on_delete=models.CASCADE) status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) + # 执行时间 execute_time = models.DateTimeField(_("execute time"), blank=True, null=True) def action_adjust(self, request): + """执行库存调整""" with transaction.atomic(): for item in AdjustItem.objects.filter(master=self, status=0): inventory = item.inventory @@ -396,7 +420,7 @@ class Meta: class InOutDetail(models.Model): """ - in out detail + 出入库详单 """ PROP = ( @@ -404,21 +428,27 @@ class InOutDetail(models.Model): ('-', _("MINUS")) ) + # 创建时间 create_time = models.DateTimeField(_("create time"), auto_now_add=True) status = models.BooleanField(_("executed"), default=0) event_time = models.DateTimeField(_("event time"), blank=True, null=True) + # 仓库 warehouse = models.ForeignKey(Warehouse, verbose_name=_("warehouse"), blank=True, null=True, on_delete=models.CASCADE) + # 物料 material = models.ForeignKey( Material, verbose_name=_("material"), limit_choices_to={ - "is_virtual": "0"}, + "is_virtual": "0"}, # 排除了虚拟物料 blank=True, null=True, on_delete=models.CASCADE) + # 计量单位 measure = models.ForeignKey(Measure, verbose_name=_("measure"), blank=True, null=True, on_delete=models.CASCADE) + # 数量 cnt = models.DecimalField(_("count"), max_digits=14, decimal_places=4, blank=True, null=True) batch = models.CharField(_("batch"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 单价？ price = models.DecimalField(_("price"), max_digits=14, decimal_places=4, blank=True, null=True) prop = models.CharField(_("plus or minus property"), max_length=const.DB_CHAR_CODE_2, choices=PROP, default='+') source = models.CharField(_("source"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) @@ -437,9 +467,11 @@ class Meta: class InItem(InOutDetail): """ - 入库单明细 + 入库单明细行，继承 InOutDetail 类 """ + # 关联入库单 master = models.ForeignKey(StockIn, on_delete=models.CASCADE) + # 关联采购单明细行 po_item = models.ForeignKey(POItem, verbose_name=_("po item"), blank=True, null=True, on_delete=models.CASCADE) def get_new_price(self): @@ -470,8 +502,9 @@ class Meta: class OutItem(InOutDetail): """ - 出库单明细 + 出库单明细行，继承 InOutDetail 类 """ + # 关联出库单 master = models.ForeignKey(StockOut, on_delete=models.CASCADE) inventory = models.ForeignKey( Inventory, @@ -497,9 +530,11 @@ class Meta: class ReturnItem(InOutDetail): """ - 返库单明细 + 返库单明细行，继承 InOutDetail 类 """ + # 关联返库单 master = models.ForeignKey(WareReturn, on_delete=models.CASCADE) + # 关联出库单明细行 out_item = models.ForeignKey(OutItem, blank=True, null=True, verbose_name=_('out item'), on_delete=models.CASCADE) out_cnt = models.DecimalField(_("out count"), max_digits=14, decimal_places=4) @@ -510,8 +545,9 @@ class Meta: class AdjustItem(InOutDetail): """ - 库存调整明细 + 库存调整明细行 """ + # 关联库存调整单 master = models.ForeignKey(WareAdjust, on_delete=models.CASCADE) inventory = models.ForeignKey( Inventory, diff --git a/purchase/models.py b/purchase/models.py index 3912409..4d7424c 100644 --- a/purchase/models.py +++ b/purchase/models.py @@ -123,7 +123,7 @@ class Meta: class POItem(models.Model): """ - + 采购单明细行 """ index_weight = 2 po = models.ForeignKey(PurchaseOrder, verbose_name=_("purchase order"), on_delete=models.CASCADE) From e1ead31f2ad5077a00c13ca0334c7eef1d595508 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 14:21:59 +0800 Subject: [PATCH 27/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 8 +++++++- workflow/models.py | 31 ++++++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/basedata/models.py b/basedata/models.py index cddef2c..1844364 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -281,24 +281,30 @@ class Meta: class BankAccount(generic.BO): """ - 银行账户 organization + 银行账户 """ + # 银行帐号 account = models.CharField( _("account num"), max_length=const.DB_CHAR_NAME_40) + # 银行名称 title = models.CharField(_("bank name"), max_length=const.DB_CHAR_NAME_40) + # 备注 memo = models.CharField( _("memo"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + + # 合作伙伴 partner = models.ForeignKey( Partner, verbose_name=_("partner"), blank=True, null=True, on_delete=models.CASCADE) + # 所属组织 org = models.ForeignKey( Organization, verbose_name=_("organization"), diff --git a/workflow/models.py b/workflow/models.py index 8f91100..d93ed62 100644 --- a/workflow/models.py +++ b/workflow/models.py @@ -16,8 +16,11 @@ class Modal(ToStringMixin, models.Model): """ import datetime index_weight = 1 + # 工作流编号 code = models.CharField(_("workflow code"), max_length=const.DB_CHAR_CODE_6, blank=True, null=True) + # 工作流名称 name = models.CharField(_("workflow name"), max_length=const.DB_CHAR_NAME_40) + # 描述 description = models.TextField(_("description"), blank=True, null=True) content_type = models.ForeignKey( ContentType, @@ -30,7 +33,9 @@ class Modal(ToStringMixin, models.Model): app_name = models.CharField(_("app name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) model_name = models.CharField(_("model name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) # added by zhugl 2015-05-10 + # 开始时间 begin = models.DateField(_("begin date"), blank=True, null=True, default=datetime.date.today) + # 结束时时间 end = models.DateField(_("end date"), blank=True, null=True, default=datetime.date(9999, 12, 31)) def __unicode__(self): @@ -51,11 +56,12 @@ class Node(ToStringMixin, models.Model): sql() etc:upper('zhangsan','lisi') """ + # 处理类型 HANDLER_TYPE = ( - (1, _("designated user")), - (2, _("designated position")), - (3, _("designated role")), - (4, _("submitter")), + (1, _("designated user")), # 指定用户 + (2, _("designated position")), # 指定岗位 + (3, _("designated role")), # 指定角色 + (4, _("submitter")), # 提交人 ) index_weight = 2 modal = models.ForeignKey(Modal, verbose_name=_("workflow model"), on_delete=models.CASCADE) @@ -63,21 +69,32 @@ class Node(ToStringMixin, models.Model): name = models.CharField(_("node name"), max_length=const.DB_CHAR_NAME_80) tooltip = models.CharField(_('tooltip words'), blank=True, null=True, max_length=const.DB_CHAR_NAME_120) + # 起始节点 start = models.BooleanField(_("start node"), default=False) + # 结束节点 stop = models.BooleanField(_("stop node"), default=False) + # 允许终止 can_terminate = models.BooleanField(_("can terminate"), default=False) + # 允许拒绝 can_deny = models.BooleanField(_("can deny"), default=True) + # 允许编辑 can_edit = models.BooleanField(_("can edit"), default=False) + # 邮件通知 email_notice = models.BooleanField(_("email notice"), default=True) + # 短信通知 short_message_notice = models.BooleanField(_("short message notice"), default=False) + # 批准节点 approve_node = models.BooleanField(_("approve node"), default=False) handler = models.TextField(_("handler"), blank=True, null=True, help_text=u'自定义SQL语句，优先高于指定用户、岗位、角色') # added by zhugl 2015-05-10 handler_type = models.IntegerField(_("handler type"), choices=HANDLER_TYPE, default=1) positions = models.ManyToManyField(Position, verbose_name=_("designated position"), blank=True) + # 角色 多对多 roles = models.ManyToManyField(Role, verbose_name=_("designated role"), blank=True) + # 用户 多对多 users = models.ManyToManyField(User, verbose_name=_("designated user"), blank=True) + # 组织单元 多对多 departments = models.ManyToManyField(OrgUnit, verbose_name=_("designated department"), blank=True) next = models.ManyToManyField('self', blank=True, verbose_name=_("next node"), symmetrical=False) # added by zhugl 2015-06-30 @@ -104,7 +121,7 @@ class Meta: class Instance(ToStringMixin, models.Model): """ - + 工作流实例 """ STATUS = ( (1, _("NEW")), @@ -118,10 +135,14 @@ class Instance(ToStringMixin, models.Model): code = models.CharField(_("code"), blank=True, null=True, max_length=const.DB_CHAR_CODE_10) modal = models.ForeignKey(Modal, verbose_name=_("workflow model"), on_delete=models.CASCADE) object_id = models.PositiveIntegerField("object id") + # 发起人 starter = models.ForeignKey(User, verbose_name=_("start user"), related_name="starter", on_delete=models.CASCADE) + # 发起时间 start_time = models.DateTimeField(_("start time"), auto_now_add=True) + # 批准时间 approved_time = models.DateTimeField(_("approved time"), blank=True, null=True) status = models.IntegerField(_("status"), default=1, choices=STATUS) + # 当前节点 多对多 current_nodes = models.ManyToManyField(Node, verbose_name=_("current node"), blank=True) def __unicode__(self): From b39be1c94f952dc521479227577bfb9300f78988 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 14:59:03 +0800 Subject: [PATCH 28/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 50 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/basedata/models.py b/basedata/models.py index 1844364..c4fe49e 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -466,11 +466,13 @@ class Measure(ToStringMixin, models.Model): 计量单位 """ index_weight = 5 + # 编号 code = models.CharField( _("code"), max_length=const.DB_CHAR_CODE_6, blank=True, null=True) + # 名称 name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_20) status = models.BooleanField(_("in use"), default=True) @@ -487,13 +489,17 @@ class Trade(ToStringMixin, models.Model): 国民经济行业分类 """ index_weight = 102 + # 编号 code = models.CharField(_("code"), max_length=const.DB_CHAR_CODE_6) + # 名称 name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_120) + # 备注 memo = models.CharField( _("memo"), max_length=const.DB_CHAR_NAME_120, null=True, blank=True) + # 父级 parent = models.ForeignKey( 'self', verbose_name=_("parent"), @@ -515,18 +521,22 @@ class Brand(ToStringMixin, models.Model): 品牌 """ index_weight = 101 + # 经济行业 trade = models.ForeignKey( Trade, verbose_name=_("trade"), null=True, blank=True, on_delete=models.CASCADE) + # 名称 name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_120) + # 拼音/英语 pinyin = models.CharField( _("pinyin"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 排序权重 weight = models.IntegerField( _("weight"), blank=True, @@ -547,24 +557,29 @@ class Category(ToStringMixin, models.Model): """ index_weight = 100 + # 经济行业 trade = models.ForeignKey( Trade, verbose_name=_("trade"), null=True, blank=True, on_delete=models.CASCADE) + # 父级 parent = models.ForeignKey( 'self', verbose_name=_("parent"), null=True, blank=True, on_delete=models.CASCADE) + # 编号 code = models.CharField( _("code"), max_length=const.DB_CHAR_CODE_6, null=True, blank=True) + # 名称 name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_120) + # 路径（？） path = models.CharField( _("path"), max_length=const.DB_CHAR_NAME_200, @@ -819,20 +834,23 @@ class ExpenseAccount(generic.BO): """ CATEGORY = ( - ('HR', _('HR-DOMAIN')), - ('OF', _('OFFICE-DOMAIN')), - ('PU', _('PUBLIS-DOMAIN')), - ('MU', _('MUNADOMAIN')), - ('BU', _('BUSINESS')), - ('OT', _('OTHER')), + ('HR', _('HR-DOMAIN')), # 人事费用 + ('OF', _('OFFICE-DOMAIN')), # 行政办公 + ('PU', _('PUBLIS-DOMAIN')), # 运营公共 + ('MU', _('MUNADOMAIN')), # 生产制造 + ('BU', _('BUSINESS')), # 市场商务 + ('OT', _('OTHER')), # 其他 ) index_weight = 10 + # 编号 code = models.CharField( _("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 名称 name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_120) + # 分类 category = models.CharField( _("category"), max_length=const.DB_CHAR_CODE_4, @@ -845,7 +863,9 @@ class ExpenseAccount(generic.BO): null=True, blank=True, on_delete=models.CASCADE) + # 在用？ status = models.BooleanField(_("in use"), default=True) + # 所属组织机构 org = models.ForeignKey( Organization, verbose_name=_("organization"), @@ -877,6 +897,7 @@ class Employee(generic.BO): max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 所属组织机构 organization = models.ForeignKey( Organization, verbose_name=_('organization'), @@ -896,6 +917,7 @@ class Employee(generic.BO): # 生日 birthday = models.DateField(_("birthday"), blank=True, null=True) + # 性别 gender = models.CharField( _("gender"), max_length=const.DB_CHAR_CODE_2, @@ -947,6 +969,7 @@ class Employee(generic.BO): blank=True, null=True) + # 职位 position = models.ForeignKey( Position, verbose_name=_('position'), @@ -1139,7 +1162,7 @@ class Family(generic.BO): name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_60) # 出生日期 birthday = models.DateField(_("birthday"), blank=True, null=True) - # 组织机构 + # 所属组织机构 organization = models.CharField( _("organization"), max_length=const.DB_CHAR_NAME_120, @@ -1151,8 +1174,9 @@ class Family(generic.BO): max_length=const.DB_CHAR_NAME_120, blank=True, null=True) - # 紧急联系人 + # 是否是紧急联系人 emergency = models.BooleanField(_("emergency"), default=False) + # 关联的职员 employee = models.ForeignKey( Employee, verbose_name=_("employee"), @@ -1332,12 +1356,12 @@ class Document(generic.BO): """ TP = ( - ('00', _('SYSTEM MANUAL')), - ('10', _('BUSINESS DOC')), + ('00', _('SYSTEM MANUAL')), # 系统文档 + ('10', _('BUSINESS DOC')), # 业务文档 ) STATUS = ( - ('0', _('draft')), - ('1', _('published')) + ('0', _('draft')), # 草稿 + ('1', _('published')) # 已发布 ) index_weight = 8 # 编号 @@ -1356,6 +1380,7 @@ class Document(generic.BO): null=True) # 描述信息 description = models.TextField(_('description'), blank=True, null=True) + # 类型 tp = models.CharField( _('type'), max_length=const.DB_CHAR_CODE_2, @@ -1381,6 +1406,7 @@ class Document(generic.BO): choices=STATUS) # 发布时间 pub_date = models.DateTimeField(_('publish date'), blank=True, null=True) + # 文件大小（？） size = models.CharField( _('size'), max_length=const.DB_CHAR_NAME_20, From e24096086dec8e8552762c8915e283873de41898 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 15:01:17 +0800 Subject: [PATCH 29/65] =?UTF-8?q?=E7=BB=99=E6=A8=A1=E6=9D=BF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/admin/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/admin/index.html b/templates/admin/index.html index 2228672..f273047 100644 --- a/templates/admin/index.html +++ b/templates/admin/index.html @@ -9,6 +9,7 @@ {% block bodyclass %}{{ block.super }} dashboard{% endblock %} +{% comment %} 导航栏 {% endcomment %} {% block breadcrumbs %}
{% trans 'Home' %} @@ -62,6 +63,7 @@
{% endblock %} +{% comment %} 重写了侧边栏 {% endcomment %} {% block sidebar %}
From 409e444c45a7cfc02cf0c56a301c8fb9ef227ac7 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 15:08:30 +0800 Subject: [PATCH 30/65] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AC=94=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- note.md | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/note.md b/note.md index bb58a1a..bc8cd20 100644 --- a/note.md +++ b/note.md @@ -1,4 +1,4 @@ -# 笔记 +# Django-ERP笔记 本分支由Python2 Django1迁移过来 @@ -25,3 +25,60 @@ sudo apt-get install -y build-essential libssl-dev libffi-dev libxml2 libxml2-dev libxslt1-dev zlib1g-dev sudo apt-get install -y libmysqlclient-dev python3-dev + + +## 主要模块说明 + +- 个人自助 + - 工单服务 + - 费用报销 + - 借款申请 + - 活动 +- 销售管理 + - 报价单 + - 销售订单 + - 销售回款 +- 采购管理 + - 采购单 + - 采购明细 + - 采购付款 + - 发票 +- 库存管理 + - 实时库存 + - 领料单 + - 入库单 + - 库存调整 + - 返库单 + - 期初库存 +- 组织机构 + - 组织机构 + - 组织单元 + - 岗位 +- 基础数据 + - 项目 + - 职员 + - 合作伙伴 + - 物料 + - 计量单位 + - 仓库 + - 技术参数 + - 文档 + - 值列表 + - 费用科目 + - 导入 + - 分类 + - 品牌 + - 经济行业 +- 系统配置 + - 站点 + - 模块 + - 菜单 + - 角色 +- 工作流 + - 工作流模型 + - 工作流节点 + - 工作流实例 + - 待办任务 + - 审批记录 +- 认证授权（Django自带） +- 内容类型（Django自带） From 8722e3b0a9336aebb6be8b94eca86c7d86648c01 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 15:35:18 +0800 Subject: [PATCH 31/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/basedata/models.py b/basedata/models.py index c4fe49e..bbece4a 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -933,21 +933,25 @@ class Employee(generic.BO): null=True, default='CN', choices=const.get_value_list('S022')) + # 籍贯 hometown = models.CharField( _("hometown"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 家庭地址 address = models.CharField( _("home address"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 银行帐号 banknum = models.CharField( _("bank account"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 开户行 bankname = models.CharField( _("bank name"), max_length=const.DB_CHAR_NAME_80, @@ -958,11 +962,13 @@ class Employee(generic.BO): max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 邮箱 email = models.CharField( _("email"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 办公电话 office = models.CharField( _("office phone"), max_length=const.DB_CHAR_NAME_20, @@ -984,7 +990,7 @@ class Employee(generic.BO): workday = models.DateField(_("workday"), blank=True, null=True) # 入职日期 startday = models.DateField(_("start date"), blank=True, null=True) - + # 宗教 religion = models.CharField( _("religion"), max_length=const.DB_CHAR_CODE_2, @@ -993,6 +999,7 @@ class Employee(generic.BO): blank=True, null=True, ) + # 婚姻状况 marital = models.CharField( _("marital status"), max_length=const.DB_CHAR_CODE_2, @@ -1000,7 +1007,7 @@ class Employee(generic.BO): null=True, choices=const.get_value_list('S023'), default='10') - + # 政治面貌 party = models.CharField( _("political party"), max_length=const.DB_CHAR_CODE_2, @@ -1008,6 +1015,7 @@ class Employee(generic.BO): null=True, choices=const.get_value_list('S026'), default='13') + # 民族 nation = models.CharField( _("nation"), max_length=const.DB_CHAR_CODE_2, @@ -1052,6 +1060,7 @@ class Employee(generic.BO): null=True, choices=const.get_value_list('S038'), default='99') + # 学位 degree = models.CharField( _("major degree"), max_length=const.DB_CHAR_CODE_2, @@ -1060,6 +1069,7 @@ class Employee(generic.BO): choices=const.get_value_list('S037'), default='4') + # 特殊工种 spjob = models.CharField( _("special job"), max_length=const.DB_CHAR_CODE_2, @@ -1067,6 +1077,7 @@ class Employee(generic.BO): null=True, choices=const.get_value_list('S042'), default='00') + # 健康状况 health = models.CharField( _("health"), max_length=const.DB_CHAR_CODE_2, @@ -1075,6 +1086,7 @@ class Employee(generic.BO): choices=const.get_value_list('S043'), default='1') + # 复转军人标识 tag1 = models.CharField( _("tag1 fzjr"), max_length=const.DB_CHAR_CODE_2, @@ -1082,6 +1094,7 @@ class Employee(generic.BO): null=True, choices=const.get_value_list('S039'), default='99') + # 党委负责人 tag2 = models.CharField( _("tag2 dwld"), max_length=const.DB_CHAR_CODE_2, @@ -1089,6 +1102,7 @@ class Employee(generic.BO): null=True, choices=const.get_value_list('S040'), default='9') + # 董事监事 tag3 = models.CharField( _("tag3 dsjs"), max_length=const.DB_CHAR_CODE_10, @@ -1096,6 +1110,7 @@ class Employee(generic.BO): null=True, choices=const.get_value_list('S041'), default='00') + # 兵役状况 tag4 = models.CharField( _("tag4 byzk"), max_length=const.DB_CHAR_CODE_2, @@ -1228,12 +1243,15 @@ class WorkExperience(generic.BO): 工作履历 """ + # 组织机构 organization = models.CharField( _("organization"), max_length=const.DB_CHAR_NAME_120) + # 岗位 position = models.CharField( _("position"), max_length=const.DB_CHAR_NAME_120) + # 关联的职员 employee = models.ForeignKey( Employee, verbose_name=_("employee"), From c83c529c1a0ddb110e60422dd938d681fadd0b7b Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 15:45:11 +0800 Subject: [PATCH 32/65] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AC=94=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- note.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/note.md b/note.md index bc8cd20..f5c1d57 100644 --- a/note.md +++ b/note.md @@ -40,27 +40,38 @@ - 销售回款 - 采购管理 - 采购单 + - 需要选择合作伙伴（供应商） - 采购明细 + - 关联采购单 - 采购付款 + - 需要关联采购单 - 发票 - 库存管理 - 实时库存 - 领料单 - 入库单 + - 需要选择仓库 + - 入库单可以关联采购单 - 库存调整 - 返库单 + - 物料出库后需要返库，可以创建返库单 - 期初库存 + - 可以从文件中导入初始数据 - 组织机构 - 组织机构 - 组织单元 + - 关联组织机构，给组织机构进行分级 - 岗位 - 基础数据 - 项目 - 职员 + - 放在人力资源模块比较好 - 合作伙伴 - 物料 - 计量单位 + - 用于标识物料的单位 - 仓库 + - 放在库存管理模块比较好 - 技术参数 - 文档 - 值列表 From e0ad7e50a0af0d6d307c4df19148ea6ecbcbd5f1 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 16:26:01 +0800 Subject: [PATCH 33/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/generic.py | 1 + purchase/admin.py | 2 +- purchase/models.py | 43 +++++++++++++++++++++++++++++++++++++------ 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/common/generic.py b/common/generic.py index 7cbefd9..f22e0cc 100644 --- a/common/generic.py +++ b/common/generic.py @@ -197,6 +197,7 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No can_edit=can_edit, show_submit_button=show_submit_button, ) + # 添加额外的按钮 if len(self.extra_buttons) > 0: buttons = dict( extra_buttons=self.extra_buttons diff --git a/purchase/admin.py b/purchase/admin.py index 8dcdc16..36dab5b 100644 --- a/purchase/admin.py +++ b/purchase/admin.py @@ -18,7 +18,7 @@ def get_extra(self, request, obj=None, **kwargs): class PurchaseOrderAdmin(generic.BOAdmin): """ - + 采购单管理 """ CODE_PREFIX = 'CG' CODE_NUMBER_WIDTH = 5 diff --git a/purchase/models.py b/purchase/models.py index 4d7424c..d3a5d40 100644 --- a/purchase/models.py +++ b/purchase/models.py @@ -18,31 +18,42 @@ class PurchaseOrder(generic.BO): """ - + 采购单 """ STATUS = ( - ('0', _("NEW")), - ('1', _("IN PROGRESS")), - ('4', _("DROP")), - ('9', _("APPROVED")), - ('99', _("ALREADY STOCK IN")), + ('0', _("NEW")), # 新建 + ('1', _("IN PROGRESS")), # 在处理 + ('4', _("DROP")), # 废弃 + ('9', _("APPROVED")), # 批准 + ('99', _("ALREADY STOCK IN")), # 已入库 ) index_weight = 1 + # 编号 code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 合作伙伴 partner = models.ForeignKey( Partner, verbose_name=_("partner"), limit_choices_to={ "partner_type": "S"}, on_delete=models.CASCADE) + # 订单日期 order_date = models.DateField(_("order date")) + # 交货日期 arrive_date = models.DateField(_("arrive date")) + # 所属组织 org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + # 描述信息 description = models.TextField(_("description"), blank=True, null=True) + # 创建者（？） user = models.ForeignKey(User, verbose_name=_("user"), blank=True, null=True, on_delete=models.CASCADE) + # 状态 status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) + # 金额 amount = models.DecimalField(_("money amount"), max_digits=12, decimal_places=2, blank=True, null=True, default=0.00) + # 折扣 discount_amount = models.DecimalField( _("discount amount"), max_digits=12, @@ -52,6 +63,7 @@ class PurchaseOrder(generic.BO): default=0.00) entry_status = models.BooleanField(_("entry status"), default=0) entry_time = models.DateTimeField(_("entry time"), blank=True, null=True) + # 附件 attach = models.FileField(_('attach'), blank=True, null=True, help_text=u'您可导入采购明细，模板请参考文档FD0008') def __unicode__(self): @@ -60,13 +72,16 @@ def __unicode__(self): def save(self, force_insert=False, force_update=False, using=None, update_fields=None): super(PurchaseOrder, self).save(force_insert, force_update, using, update_fields) + # 如果折扣金额大于0 if self.discount_amount > 0: sql = 'UPDATE purchase_poitem a SET a.discount_price = ' \ 'a.price-((SELECT discount_amount/amount FROM purchase_purchaseorder WHERE id=%s)*a.amount/a.cnt) WHERE a.po_id = %s' params = [self.id, self.id] generic.update(sql, params) + # 采购单明细行数量 item_count = POItem.objects.filter(po=self).count() + # 如果有附件并且明细行数量为零，则从附件导入明细行 if self.attach and item_count == 0: path = os.path.join(settings.MEDIA_ROOT, self.attach.name) workbook = xlrd.open_workbook(path) @@ -102,6 +117,7 @@ def save(self, force_insert=False, force_update=False, using=None, amount = decimal.Decimal(row[6]) * decimal.Decimal(row[7]) POItem.objects.create(po=self, material=material, measure=measure, cnt=row[7], price=row[6], amount=amount) total_amount += amount + # 更新采购金额 sql = 'update purchase_purchaseorder set amount = %s where id=%s' params = [total_amount, self.id] generic.update(sql, params) @@ -126,32 +142,43 @@ class POItem(models.Model): 采购单明细行 """ index_weight = 2 + # 关联的采购单 po = models.ForeignKey(PurchaseOrder, verbose_name=_("purchase order"), on_delete=models.CASCADE) + # 关联的物料 material = models.ForeignKey( Material, verbose_name=_("material"), limit_choices_to={ "is_virtual": "0"}, on_delete=models.CASCADE) + # 计量单位 measure = models.ForeignKey(Measure, verbose_name=_("measure"), blank=True, null=True, on_delete=models.CASCADE) + # 单价 price = models.DecimalField(_("price"), max_digits=12, decimal_places=4, blank=True, null=True) + # 数量 cnt = models.DecimalField(_("count"), max_digits=12, decimal_places=4, blank=True, null=True) + # 折后单价 discount_price = models.DecimalField(_("discount price"), max_digits=12, decimal_places=4, blank=True, null=True) amount = models.DecimalField(_("money of amount"), max_digits=12, decimal_places=2, blank=True, null=True) discount_amount = models.DecimalField(_("discount amount"), max_digits=12, decimal_places=2, blank=True, null=True) + # 税率 tax = models.CharField(_("tax rate"), max_length=const.DB_CHAR_CODE_6, choices=const.get_value_list('S052'), default='0.00') woitem = models.ForeignKey(WOItem, verbose_name=_("wo item"), blank=True, null=True, on_delete=models.CASCADE) + # 已经入库 is_in_stock = models.BooleanField(_("is in stock"), default=0) + # 入库时间 in_stock_time = models.DateTimeField(_("execute time"), blank=True, null=True) entry_cnt = models.DecimalField(_("entry count"), max_digits=12, decimal_places=4, blank=True, null=True) left_cnt = models.DecimalField(_("left count"), max_digits=12, decimal_places=4, blank=True, null=True) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): + # 计算总价 if self.price and self.cnt: money = self.price * self.cnt self.amount = money + # 自动配置计量单位 if self.measure is None and self.material and self.material.measure.count() > 0: self.measure = self.material.measure.all()[0] @@ -160,14 +187,18 @@ def save(self, force_insert=False, force_update=False, using=None, else: self.left_cnt = self.cnt super(POItem, self).save(force_insert, force_update, using, update_fields) + # 把价格配给物料数据模型的采购价格 self.material.purchase_price = self.price self.material.save() + + # 自动更新采购单的总价 sql = 'UPDATE purchase_purchaseorder SET amount = (SELECT SUM(a.price*a.cnt) AS amount FROM ' \ 'purchase_poitem a WHERE a.po_id = %s) WHERE id = %s' params = [self.po.id, self.po.id] generic.update(sql, params) def vender(self): + """卖家""" return u'%s' % (self.po.partner) vender.short_description = _("partner") From 0395431ffafdc2eee221aa58f08b765bb7222d88 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 16:40:15 +0800 Subject: [PATCH 34/65] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- purchase/models.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/purchase/models.py b/purchase/models.py index d3a5d40..fb0bd70 100644 --- a/purchase/models.py +++ b/purchase/models.py @@ -34,8 +34,7 @@ class PurchaseOrder(generic.BO): partner = models.ForeignKey( Partner, verbose_name=_("partner"), - limit_choices_to={ - "partner_type": "S"}, + limit_choices_to={"partner_type": "S"}, on_delete=models.CASCADE) # 订单日期 order_date = models.DateField(_("order date")) From 20580f1645d4642db2fc414eb37db6023cae64f9 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 16:49:08 +0800 Subject: [PATCH 35/65] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/models.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/workflow/models.py b/workflow/models.py index d93ed62..a8bd56b 100644 --- a/workflow/models.py +++ b/workflow/models.py @@ -25,10 +25,7 @@ class Modal(ToStringMixin, models.Model): content_type = models.ForeignKey( ContentType, verbose_name=_("content type"), - limit_choices_to={ - "app_label__in": [ - 'basedata', - 'organ']}, + limit_choices_to={"app_label__in": ['basedata', 'organ']}, on_delete=models.CASCADE) app_name = models.CharField(_("app name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) model_name = models.CharField(_("model name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) From 04312c2a46f5cc429fd6f2c92b0bdffa44bd2d40 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 16:53:47 +0800 Subject: [PATCH 36/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/models.py | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/workflow/models.py b/workflow/models.py index a8bd56b..3073b5d 100644 --- a/workflow/models.py +++ b/workflow/models.py @@ -12,7 +12,7 @@ class Modal(ToStringMixin, models.Model): """ - + 工作流模型 """ import datetime index_weight = 1 @@ -62,7 +62,9 @@ class Node(ToStringMixin, models.Model): ) index_weight = 2 modal = models.ForeignKey(Modal, verbose_name=_("workflow model"), on_delete=models.CASCADE) + # 编号 code = models.CharField(_("node code"), max_length=const.DB_CHAR_CODE_4, blank=True, null=True) + # 名称 name = models.CharField(_("node name"), max_length=const.DB_CHAR_NAME_80) tooltip = models.CharField(_('tooltip words'), blank=True, null=True, max_length=const.DB_CHAR_NAME_120) @@ -97,8 +99,11 @@ class Node(ToStringMixin, models.Model): # added by zhugl 2015-06-30 next_user_handler = models.CharField(_('next user handler'), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) next_node_handler = models.CharField(_('next node handler'), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) + # 状态字段 status_field = models.CharField(_('status field'), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) + # 状态值 status_value = models.CharField(_('status value'), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) + # 执行操作 action = models.CharField(_('execute action'), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) def save(self, force_insert=False, force_update=False, using=None, @@ -121,15 +126,17 @@ class Instance(ToStringMixin, models.Model): 工作流实例 """ STATUS = ( - (1, _("NEW")), - (2, _("IN PROGRESS")), - (3, _("DENY")), - (4, _("TERMINATED")), - (9, _("APPROVED")), - (99, _("COMPLETED")) + (1, _("NEW")), # 新建 + (2, _("IN PROGRESS")), # 在处理 + (3, _("DENY")), # 拒绝 + (4, _("TERMINATED")), # 终止 + (9, _("APPROVED")), # 批准 + (99, _("COMPLETED")) # 结束 ) index_weight = 3 + # 编号 code = models.CharField(_("code"), blank=True, null=True, max_length=const.DB_CHAR_CODE_10) + # 关联的工作流模型 modal = models.ForeignKey(Modal, verbose_name=_("workflow model"), on_delete=models.CASCADE) object_id = models.PositiveIntegerField("object id") # 发起人 @@ -138,6 +145,7 @@ class Instance(ToStringMixin, models.Model): start_time = models.DateTimeField(_("start time"), auto_now_add=True) # 批准时间 approved_time = models.DateTimeField(_("approved time"), blank=True, null=True) + # 状态 status = models.IntegerField(_("status"), default=1, choices=STATUS) # 当前节点 多对多 current_nodes = models.ManyToManyField(Node, verbose_name=_("current node"), blank=True) @@ -148,6 +156,7 @@ def __unicode__(self): def save(self, force_insert=False, force_update=False, using=None, update_fields=None): super(Instance, self).save(force_insert, force_update, using, update_fields) + # 更新 code if not self.code: self.code = 'S%05d' % self.id self.save() @@ -203,7 +212,7 @@ class Meta: class TodoList(ToStringMixin, models.Model): """ - + 待办列表 """ index_weight = 4 code = models.CharField(_("code"), max_length=const.DB_CHAR_CODE_10, blank=True, null=True) From dee4026cbf17bf1d6e6eb3b274fad66d469b2528 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 16:55:59 +0800 Subject: [PATCH 37/65] =?UTF-8?q?=E7=BB=99=E5=B7=A5=E4=BD=9C=E6=B5=81?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=9A=84=20content=5Ftype=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=B7=BB=E5=8A=A0=20=E9=87=87=E8=B4=AD=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/models.py b/workflow/models.py index 3073b5d..899ea81 100644 --- a/workflow/models.py +++ b/workflow/models.py @@ -25,7 +25,7 @@ class Modal(ToStringMixin, models.Model): content_type = models.ForeignKey( ContentType, verbose_name=_("content type"), - limit_choices_to={"app_label__in": ['basedata', 'organ']}, + limit_choices_to={"app_label__in": ['basedata', 'organ', 'purchase']}, on_delete=models.CASCADE) app_name = models.CharField(_("app name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) model_name = models.CharField(_("model name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) From 6d5ca199185305df4a8ae60f0c5934caeb48381b Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 17:16:06 +0800 Subject: [PATCH 38/65] =?UTF-8?q?fixed:=20=E8=B0=83=E6=95=B4=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E5=8D=95=E7=8A=B6=E6=80=81=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- purchase/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/purchase/models.py b/purchase/models.py index fb0bd70..5cf5e4c 100644 --- a/purchase/models.py +++ b/purchase/models.py @@ -21,10 +21,10 @@ class PurchaseOrder(generic.BO): 采购单 """ STATUS = ( - ('0', _("NEW")), # 新建 - ('1', _("IN PROGRESS")), # 在处理 - ('4', _("DROP")), # 废弃 - ('9', _("APPROVED")), # 批准 + ('00', _("NEW")), # 新建 + ('01', _("IN PROGRESS")), # 在处理 + ('04', _("DROP")), # 废弃 + ('09', _("APPROVED")), # 批准 ('99', _("ALREADY STOCK IN")), # 已入库 ) index_weight = 1 From 2fdb943823f956ebb4cb05ed2d0270a961aecd5c Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 17:48:11 +0800 Subject: [PATCH 39/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- invent/models.py | 21 +++++++++++++-------- purchase/models.py | 12 ++++++++++-- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/invent/models.py b/invent/models.py index d98af43..4052275 100644 --- a/invent/models.py +++ b/invent/models.py @@ -149,9 +149,9 @@ class StockIn(generic.BO): 入库单 """ STATUS = ( - ('0', _("NEW")), - ('1', _("QUALITY TESTING")), - ('9', _("EXECUTED")) + ('0', _("NEW")), # 新建 + ('1', _("QUALITY TESTING")), # 质量检验 + ('9', _("EXECUTED")) # 已执行 ) index_weight = 3 # 编号 @@ -197,6 +197,9 @@ def action_entry(self, request): """ 执行入库操作 """ + # 入库明细行大 + + if self.initem_set.count() > 0: with transaction.atomic(): total_amount = decimal.Decimal(0) @@ -225,17 +228,19 @@ def action_entry(self, request): item.source = self.code item.save() total_amount += item.price * item.cnt + + # 处理采购明细行 # saving the purchase item item.po_item.is_in_stock = 1 - item.po_item.in_stock_time = datetime.datetime.now() - item.po_item.entry_cnt = item.cnt + item.po_item.in_stock_time = datetime.datetime.now() # 入库时间 + item.po_item.entry_cnt = item.cnt # 已经入库数量 item.po_item.save() none_zero_left = POItem.objects.filter(po=item.po_item.po, left_cnt__gt=0).count() if none_zero_left == 0: - item.po_item.po.status = '99' - item.po_item.po.entry_status = 1 - item.po_item.po.entry_time = datetime.datetime.now() + item.po_item.po.status = '99' # 标记为已经入库 + item.po_item.po.entry_status = 1 # 已入库 + item.po_item.po.entry_time = datetime.datetime.now() # 入库时间 item.po_item.po.save() # saving stock in item status item.status = 1 diff --git a/purchase/models.py b/purchase/models.py index 5cf5e4c..557f6f9 100644 --- a/purchase/models.py +++ b/purchase/models.py @@ -60,7 +60,9 @@ class PurchaseOrder(generic.BO): blank=True, null=True, default=0.00) + # 是否入库 entry_status = models.BooleanField(_("entry status"), default=0) + # 入库时间 entry_time = models.DateTimeField(_("entry time"), blank=True, null=True) # 附件 attach = models.FileField(_('attach'), blank=True, null=True, help_text=u'您可导入采购明细，模板请参考文档FD0008') @@ -167,7 +169,9 @@ class POItem(models.Model): is_in_stock = models.BooleanField(_("is in stock"), default=0) # 入库时间 in_stock_time = models.DateTimeField(_("execute time"), blank=True, null=True) + # 入库数量 entry_cnt = models.DecimalField(_("entry count"), max_digits=12, decimal_places=4, blank=True, null=True) + # 剩余数量 left_cnt = models.DecimalField(_("left count"), max_digits=12, decimal_places=4, blank=True, null=True) def save(self, force_insert=False, force_update=False, using=None, @@ -177,16 +181,20 @@ def save(self, force_insert=False, force_update=False, using=None, money = self.price * self.cnt self.amount = money - # 自动配置计量单位 + # 如果没有单位，自动配置计量单位，默认选第一个 if self.measure is None and self.material and self.material.measure.count() > 0: self.measure = self.material.measure.all()[0] if self.is_in_stock: + # 如果已经入库 self.left_cnt -= self.entry_cnt else: + # 未入库则赋予 left_cnt 初始值 self.left_cnt = self.cnt + super(POItem, self).save(force_insert, force_update, using, update_fields) - # 把价格配给物料数据模型的采购价格 + + # 把采购单明细行的价格配给物料模型的采购价格 self.material.purchase_price = self.price self.material.save() From cda629b54e6f1f34d34269683e37e13b1999c7e2 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 16 Jun 2020 17:59:58 +0800 Subject: [PATCH 40/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- invent/admin.py | 15 +++++++++++++-- invent/models.py | 30 ++++++++++++++++++------------ invent/views.py | 25 +++++++++++++++---------- 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/invent/admin.py b/invent/admin.py index 68a55ea..d443b39 100644 --- a/invent/admin.py +++ b/invent/admin.py @@ -80,14 +80,18 @@ class StockInAdmin(generic.BOAdmin): def save_model(self, request, obj, form, change): import decimal + super(StockInAdmin, self).save_model(request, obj, form, change) + if obj and obj.po: + # 自动创建入库单明细行 po_items = obj.po.poitem_set.filter(left_cnt__gt=0).all() for item in po_items: try: InItem.objects.get(po_item=item, master=obj) - continue + continue # 如果存在则继续循环 except Exception as e: + # 不存在则创建明细行 pp = item.discount_price or item.price if decimal.Decimal(item.tax) > decimal.Decimal(0): pp = pp / (decimal.Decimal(1) + decimal.Decimal(item.tax)) @@ -113,6 +117,7 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No extra_context = extra_context or {} if object_id: obj = StockIn.objects.get(id=object_id) + # 有对象并且 execute_time 不为空，则设置为只读 if obj and obj.execute_time: extra_context.update(dict(readonly=True)) return super(StockInAdmin, self).changeform_view(request, object_id, form_url, extra_context) @@ -138,6 +143,7 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No extra_context = extra_context or {} if object_id: obj = StockOut.objects.get(id=object_id) + # 有对象并且 execute_time 不为空，则设置为只读 if obj and obj.execute_time: extra_context.update(dict(readonly=True)) return super(StockOutAdmin, self).changeform_view(request, object_id, form_url, extra_context) @@ -149,6 +155,7 @@ def save_model(self, request, obj, form, change): class InitialInventoryAdmin(generic.BOAdmin): + """期初库存""" CODE_PREFIX = 'QC' CODE_NUMBER_WIDTH = 3 list_display = ['code', 'title', 'status'] @@ -161,6 +168,7 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No extra_context = extra_context or {} if object_id: obj = InitialInventory.objects.get(id=object_id) + # 有对象并且 execute_time 不为空，则设置为只读 if obj and obj.execute_time: extra_context.update(dict(readonly=True)) return super(InitialInventoryAdmin, self).changeform_view(request, object_id, form_url, extra_context) @@ -192,7 +200,7 @@ class ReturnItemInline(admin.TabularInline): class WareReturnAdmin(generic.BOAdmin): """ - + 返库单管理页面 """ CODE_PREFIX = 'FK' CODE_NUMBER_WIDTH = 4 @@ -208,6 +216,7 @@ class WareReturnAdmin(generic.BOAdmin): def changeform_view(self, request, object_id=None, form_url='', extra_context=None): if object_id: obj = WareReturn.objects.get(id=object_id) + # 有对象并且状态是已执行，则设置为只读 if obj.status == '9': extra_context = extra_context or {} extra_context.update(dict(readonly=True)) @@ -228,6 +237,7 @@ def get_extra(self, request, obj=None, **kwargs): class WareAdjustAdmin(generic.BOAdmin): + """库存调整管理页面""" CODE_PREFIX = 'TZ' CODE_NUMBER_WIDTH = 3 list_display = ['code', 'title', 'status'] @@ -242,6 +252,7 @@ class WareAdjustAdmin(generic.BOAdmin): def changeform_view(self, request, object_id=None, form_url='', extra_context=None): if object_id: obj = WareAdjust.objects.get(id=object_id) + # 有对象并且状态是已执行，则设置为只读 if obj and obj.status == '9': extra_context = extra_context or {} extra_context.update(dict(readonly=True)) diff --git a/invent/models.py b/invent/models.py index 4052275..8610977 100644 --- a/invent/models.py +++ b/invent/models.py @@ -19,7 +19,7 @@ class Inventory(generic.BO): """ - 库存信息 + 实时库存 """ index_weight = 1 # 所属组织机构 @@ -33,6 +33,7 @@ class Inventory(generic.BO): # 数量 cnt = models.DecimalField(_("count"), max_digits=14, decimal_places=4) batch = models.CharField(_("batch"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 单价 price = models.DecimalField(_("price"), max_digits=14, decimal_places=4) def __unicode__(self): @@ -185,6 +186,7 @@ def money_of_amount(self): return 0.00 def entry_time(self): + """入库时间""" if self.execute_time: return self.execute_time else: @@ -197,14 +199,14 @@ def action_entry(self, request): """ 执行入库操作 """ - # 入库明细行大 - + # 入库明细行大于零 if self.initem_set.count() > 0: with transaction.atomic(): total_amount = decimal.Decimal(0) for item in self.initem_set.filter(status=0).all(): try: + # 根据仓库、物料和单位获取 实时库存 inventory 对象 inventory = Inventory.objects.get( warehouse=self.warehouse, material=item.material, measure=item.measure) if inventory.price != item.price: @@ -238,13 +240,14 @@ def action_entry(self, request): item.po_item.save() none_zero_left = POItem.objects.filter(po=item.po_item.po, left_cnt__gt=0).count() if none_zero_left == 0: + # 没有 零剩余 的明细行，则表示全部入库 item.po_item.po.status = '99' # 标记为已经入库 item.po_item.po.entry_status = 1 # 已入库 item.po_item.po.entry_time = datetime.datetime.now() # 入库时间 item.po_item.po.save() # saving stock in item status item.status = 1 - item.event_time = datetime.datetime.now() + item.event_time = datetime.datetime.now() # 执行时间 # updating master's record self.status = 9 self.execute_time = datetime.datetime.now() @@ -261,9 +264,9 @@ class StockOut(generic.BO): 领料单 """ STATUS = ( - ('0', _("NEW")), - ('1', _("IN PROGRESS")), - ('9', _("EXECUTED")) + ('0', _("NEW")), # 新建 + ('1', _("IN PROGRESS")), # 在处理 + ('9', _("EXECUTED")) # 已执行 ) index_weight = 2 code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) @@ -384,12 +387,14 @@ class WareAdjust(generic.BO): 库存调整 """ STATUS = ( - ('0', _("NEW")), - ('1', _("IN PROGRESS")), - ('9', _("EXECUTED")) + ('0', _("NEW")), # 新建 + ('1', _("IN PROGRESS")), # 在处理 + ('9', _("EXECUTED")) # 已执行 ) index_weight = 4 + # 编号 code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 所属组织机构 org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) @@ -425,7 +430,7 @@ class Meta: class InOutDetail(models.Model): """ - 出入库详单 + 出入库详单，应该设置为抽象类 """ PROP = ( @@ -461,7 +466,7 @@ class InOutDetail(models.Model): class InitItem(InOutDetail): """ - 期初入库明细 + 期初入库明细行 """ master = models.ForeignKey(InitialInventory, on_delete=models.CASCADE) @@ -554,6 +559,7 @@ class AdjustItem(InOutDetail): """ # 关联库存调整单 master = models.ForeignKey(WareAdjust, on_delete=models.CASCADE) + # 实时库存 inventory = models.ForeignKey( Inventory, blank=True, diff --git a/invent/views.py b/invent/views.py index 14b6d26..8c80bbd 100644 --- a/invent/views.py +++ b/invent/views.py @@ -12,10 +12,11 @@ def action_in(request, object_id): - """ - 入库操作 + """ 入库操作 + :param request: :param object_id: + :return: """ title = _("Are you sure?") @@ -45,10 +46,11 @@ def action_in(request, object_id): def action_out(request, object_id): - """ - 出库操作 + """ 出库操作 + :param request: :param object_id: + :return: """ title = _("Are you sure?") @@ -77,10 +79,11 @@ def action_out(request, object_id): def action_init(request, object_id): - """ - 期初入库操作 + """ 期初入库操作 + :param request: :param object_id: + :return: """ title = _("Are you sure?") @@ -110,10 +113,11 @@ def action_init(request, object_id): def action_return(request, object_id): - """ - 返库操作 + """ 返库操作 + :param request: :param object_id: + :return: """ title = _("Are you sure?") @@ -143,10 +147,11 @@ def action_return(request, object_id): def action_adjust(request, object_id): - """ - 调整操作 + """ 调整操作 + :param request: :param object_id: + :return: """ title = _("Are you sure?") From d771c85c430035f53c5cf7de3bb96ed4393b2df2 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Wed, 17 Jun 2020 10:45:56 +0800 Subject: [PATCH 41/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- invent/models.py | 46 ++++++++++++++++++++++++++++++++++++++++------ purchase/models.py | 4 +++- 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/invent/models.py b/invent/models.py index 8610977..a10dda2 100644 --- a/invent/models.py +++ b/invent/models.py @@ -12,6 +12,8 @@ from django.utils.translation import ugettext_lazy as _ from common import generic from common import const + +# 关联了以下模型 from basedata.models import Material, Warehouse, Measure, Organization, Project from selfhelp.models import WorkOrder from purchase.models import PurchaseOrder, POItem @@ -32,6 +34,7 @@ class Inventory(generic.BO): measure = models.ForeignKey(Measure, verbose_name=_("measure"), on_delete=models.CASCADE) # 数量 cnt = models.DecimalField(_("count"), max_digits=14, decimal_places=4) + # 批次号 batch = models.CharField(_("batch"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) # 单价 price = models.DecimalField(_("price"), max_digits=14, decimal_places=4) @@ -51,8 +54,8 @@ class InitialInventory(generic.BO): 期初库存 """ STATUS = ( - ('0', _("NEW")), - ('9', _("EXECUTED")) + ('0', _("NEW")), # 新建 + ('9', _("EXECUTED")) # 已执行 ) index_weight = 9 # 编号 @@ -62,19 +65,25 @@ class InitialInventory(generic.BO): # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) user = models.ForeignKey(User, verbose_name=_("user"), blank=True, null=True, on_delete=models.CASCADE) + # 状态 status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) # 执行时间 execute_time = models.DateTimeField(_("execute time"), blank=True, null=True) + # 附件 attach = models.FileField(_('attach'), blank=True, null=True, upload_to='inventory', help_text=u'参考FD0002模板文档') + # 金额 amount = models.DecimalField(_('money of amount'), max_digits=14, decimal_places=4, blank=True, null=True) def save(self, force_insert=False, force_update=False, using=None, update_fields=None): - + """""" super(InitialInventory, self).save(force_insert, force_update, using, update_fields) + count = InitItem.objects.filter(master=self).count() + # 如果有附件并且item为零，自动从附件加载明细行 if self.attach and count == 0: path = os.path.join(settings.MEDIA_ROOT, self.attach.name) + # csv 文件 reader = csv.reader(open(path, 'r')) index = 0 with transaction.atomic(): @@ -163,7 +172,9 @@ class StockIn(generic.BO): warehouse = models.ForeignKey(Warehouse, verbose_name=_("warehouse"), on_delete=models.CASCADE) # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + # 入库人（？） user = models.ForeignKey(User, verbose_name=_("user"), blank=True, null=True, on_delete=models.CASCADE) + # 状态 status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) # 执行时间 execute_time = models.DateTimeField(_("execute time"), blank=True, null=True) @@ -176,7 +187,9 @@ class StockIn(generic.BO): "entry_status": "0"}, blank=True, on_delete=models.CASCADE) + # 入库金额 amount = models.DecimalField(_("stock in money of amount"), max_digits=14, decimal_places=4, blank=True, null=True) + # 批次号 batch = models.CharField(_("batch"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) def money_of_amount(self): @@ -269,17 +282,25 @@ class StockOut(generic.BO): ('9', _("EXECUTED")) # 已执行 ) index_weight = 2 + # 编号 code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 所属组织机构 org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + # 关联的项目 project = models.ForeignKey(Project, verbose_name=_("project"), blank=True, null=True, on_delete=models.CASCADE) + # 关联的工单 wo = models.ForeignKey(WorkOrder, verbose_name=_("work order"), blank=True, null=True, on_delete=models.CASCADE) # 描述 description = models.TextField(_("description"), blank=True, null=True) + # 出库金额 amount = models.DecimalField(_("money of amount"), max_digits=14, decimal_places=4, blank=True, null=True) + # 领料人 user = models.ForeignKey(User, verbose_name=_("out user"), blank=True, null=True, on_delete=models.CASCADE) + # 状态 status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) + # 执行时间 execute_time = models.DateTimeField(_("execute time"), blank=True, null=True) def out_amount(self): @@ -304,9 +325,9 @@ def action_out(self, request=None): if item.cnt: total += item.cnt * item.inventory.price item.inventory.cnt -= item.cnt - item.status = 1 + item.status = 1 # 标记为已执行 item.price = item.inventory.price - item.event_time = datetime.datetime.now() + item.event_time = datetime.datetime.now() # 执行时间 item.inventory.save() item.source = self.code item.save() @@ -331,14 +352,19 @@ class WareReturn(generic.BO): ('9', _("EXECUTED")) # 已执行 ) index_weight = 5 + # 编号 code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 所属组织机构 org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) # 关联的出库单 out = models.ForeignKey(StockOut, verbose_name=_('StockOut'), on_delete=models.CASCADE) + # 金额 amount = models.DecimalField(_("money of amount"), max_digits=14, decimal_places=4, blank=True, null=True) + # 操作人（？） user = models.ForeignKey(User, verbose_name=_("out user"), blank=True, null=True, on_delete=models.CASCADE) + # 状态 status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) # 执行时间 execute_time = models.DateTimeField(_("execute time"), blank=True, null=True) @@ -360,6 +386,7 @@ def save(self, force_insert=False, force_update=False, using=None, cnt=out_item.cnt) def action_return(self, request): + """执行返库单""" with transaction.atomic(): total_amount = decimal.Decimal(0) for item in ReturnItem.objects.filter(master=self): @@ -400,7 +427,9 @@ class WareAdjust(generic.BO): title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) # 描述 description = models.TextField(_("description"), blank=True, null=True) + # 操作者？ user = models.ForeignKey(User, verbose_name=_("out user"), blank=True, null=True, on_delete=models.CASCADE) + # 状态 status = models.CharField(_("status"), max_length=const.DB_CHAR_CODE_2, default='0', choices=STATUS) # 执行时间 execute_time = models.DateTimeField(_("execute time"), blank=True, null=True) @@ -440,7 +469,9 @@ class InOutDetail(models.Model): # 创建时间 create_time = models.DateTimeField(_("create time"), auto_now_add=True) + # 是否已经执行？ status = models.BooleanField(_("executed"), default=0) + # 事件时间 event_time = models.DateTimeField(_("event time"), blank=True, null=True) # 仓库 warehouse = models.ForeignKey(Warehouse, verbose_name=_("warehouse"), blank=True, null=True, on_delete=models.CASCADE) @@ -457,10 +488,13 @@ class InOutDetail(models.Model): measure = models.ForeignKey(Measure, verbose_name=_("measure"), blank=True, null=True, on_delete=models.CASCADE) # 数量 cnt = models.DecimalField(_("count"), max_digits=14, decimal_places=4, blank=True, null=True) + # 批次号 batch = models.CharField(_("batch"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) - # 单价？ + # 金额 price = models.DecimalField(_("price"), max_digits=14, decimal_places=4, blank=True, null=True) + # 增减属性 prop = models.CharField(_("plus or minus property"), max_length=const.DB_CHAR_CODE_2, choices=PROP, default='+') + # 用于存放相关订单编号 source = models.CharField(_("source"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) diff --git a/purchase/models.py b/purchase/models.py index 557f6f9..02a3fba 100644 --- a/purchase/models.py +++ b/purchase/models.py @@ -25,7 +25,7 @@ class PurchaseOrder(generic.BO): ('01', _("IN PROGRESS")), # 在处理 ('04', _("DROP")), # 废弃 ('09', _("APPROVED")), # 批准 - ('99', _("ALREADY STOCK IN")), # 已入库 + ('99', _("ALREADY STOCK IN")), # 已入库 ) index_weight = 1 # 编号 @@ -160,7 +160,9 @@ class POItem(models.Model): cnt = models.DecimalField(_("count"), max_digits=12, decimal_places=4, blank=True, null=True) # 折后单价 discount_price = models.DecimalField(_("discount price"), max_digits=12, decimal_places=4, blank=True, null=True) + # 总价 amount = models.DecimalField(_("money of amount"), max_digits=12, decimal_places=2, blank=True, null=True) + # 折后总价 discount_amount = models.DecimalField(_("discount amount"), max_digits=12, decimal_places=2, blank=True, null=True) # 税率 tax = models.CharField(_("tax rate"), max_length=const.DB_CHAR_CODE_6, choices=const.get_value_list('S052'), default='0.00') From d5a0d5c55ecbc19c4c7773a70cde275e9099ff97 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Wed, 17 Jun 2020 10:51:32 +0800 Subject: [PATCH 42/65] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 9 ++------- invent/models.py | 6 ++---- purchase/models.py | 23 +++++++++++++++++++---- sale/models.py | 14 ++++---------- selfhelp/models.py | 6 ++---- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/basedata/models.py b/basedata/models.py index bbece4a..d399143 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -358,8 +358,7 @@ class Project(generic.BO): blank=True, null=True, verbose_name=_("partner"), - limit_choices_to={ - "partner_type": "C"}, + limit_choices_to={"partner_type": "C"}, on_delete=models.CASCADE) status = models.CharField( _("status"), @@ -1288,11 +1287,7 @@ class DataImport(generic.BO): content_type = models.ForeignKey( ContentType, verbose_name=_("content type"), - limit_choices_to={ - "app_label__in": [ - 'basedata', - 'organ', - 'auth']}, + limit_choices_to={"app_label__in": ['basedata','organ','auth']}, on_delete=models.CASCADE) # 附件 attach = models.FileField( diff --git a/invent/models.py b/invent/models.py index a10dda2..b369050 100644 --- a/invent/models.py +++ b/invent/models.py @@ -183,8 +183,7 @@ class StockIn(generic.BO): PurchaseOrder, verbose_name=_("purchase order"), null=True, - limit_choices_to={ - "entry_status": "0"}, + limit_choices_to={"entry_status": "0"}, blank=True, on_delete=models.CASCADE) # 入库金额 @@ -479,8 +478,7 @@ class InOutDetail(models.Model): material = models.ForeignKey( Material, verbose_name=_("material"), - limit_choices_to={ - "is_virtual": "0"}, # 排除了虚拟物料 + limit_choices_to={"is_virtual": "0"}, # 排除了虚拟物料 blank=True, null=True, on_delete=models.CASCADE) diff --git a/purchase/models.py b/purchase/models.py index 02a3fba..4d75036 100644 --- a/purchase/models.py +++ b/purchase/models.py @@ -149,8 +149,7 @@ class POItem(models.Model): material = models.ForeignKey( Material, verbose_name=_("material"), - limit_choices_to={ - "is_virtual": "0"}, + limit_choices_to={"is_virtual": "0"}, on_delete=models.CASCADE) # 计量单位 measure = models.ForeignKey(Measure, verbose_name=_("measure"), blank=True, null=True, on_delete=models.CASCADE) @@ -176,8 +175,7 @@ class POItem(models.Model): # 剩余数量 left_cnt = models.DecimalField(_("left count"), max_digits=12, decimal_places=4, blank=True, null=True) - def save(self, force_insert=False, force_update=False, using=None, - update_fields=None): + def save(self, force_insert=False, force_update=False, using=None, update_fields=None): # 计算总价 if self.price and self.cnt: money = self.price * self.cnt @@ -223,12 +221,19 @@ class Invoice(generic.BO): """ index_weight = 4 vo_date = models.DateField(_("invoice date"), blank=True, null=True, default=datetime.date.today) + # 编号 code = models.CharField(_("invoice code"), max_length=const.DB_CHAR_NAME_20) + # 发票代码 number = models.CharField(_("invoice number"), max_length=const.DB_CHAR_NAME_20) + # 采购单 po = models.ForeignKey(PurchaseOrder, verbose_name=_("purchase order"), on_delete=models.CASCADE) + # 合作伙伴 partner = models.ForeignKey(Partner, verbose_name=_("partner"), blank=True, null=True, on_delete=models.CASCADE) + # 采购金额 po_amount = models.DecimalField(_("po amount"), max_digits=14, decimal_places=4, blank=True, null=True) + # 发票金额 vo_amount = models.DecimalField(_("invoice amount"), max_digits=14, decimal_places=4) + # 发票文件 file = models.FileField(_("invoice file"), upload_to='invoice', blank=True, null=True) def __unicode__(self): @@ -251,15 +256,25 @@ class Payment(generic.BO): 采购付款 """ index_weight = 3 + # 付款日期 py_date = models.DateField(_("pay date"), blank=True, null=True, default=datetime.date.today) + # 所属组织 org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + # 编号 code = models.CharField(_("pay code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 采购单 po = models.ForeignKey(PurchaseOrder, verbose_name=_("purchase order"), on_delete=models.CASCADE) + # 合作伙伴 partner = models.ForeignKey(Partner, verbose_name=_("partner"), blank=True, null=True, on_delete=models.CASCADE) + # 采购金额 po_amount = models.DecimalField(_("po amount"), max_digits=14, decimal_places=4, blank=True, null=True) + # 支付金额 py_amount = models.DecimalField(_("pay amount"), max_digits=14, decimal_places=4) + # 银行账户 bank = models.ForeignKey(BankAccount, verbose_name=_("bank account"), blank=True, null=True, on_delete=models.CASCADE) + # 银行回执 response_code = models.CharField(_("response code"), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) + # 备注 memo = models.TextField(_("memo"), blank=True, null=True) def save(self, force_insert=False, force_update=False, using=None, diff --git a/sale/models.py b/sale/models.py index 0b21b6c..97a108a 100644 --- a/sale/models.py +++ b/sale/models.py @@ -32,8 +32,7 @@ class SaleOrder(generic.BO): partner = models.ForeignKey( Partner, verbose_name=_("partner"), - limit_choices_to={ - "partner_type": "C"}, + limit_choices_to={"partner_type": "C"}, on_delete=models.CASCADE) order_date = models.DateField(_("order date")) deliver_date = models.DateField(_("deliver date")) @@ -89,9 +88,7 @@ class SaleItem(models.Model): material = models.ForeignKey( Material, verbose_name=_("material"), - limit_choices_to={ - "is_virtual": "0", - 'can_sale': '1'}, + limit_choices_to={"is_virtual": "0", 'can_sale': '1'}, blank=True, null=True, on_delete=models.CASCADE) @@ -170,8 +167,7 @@ class OfferSheet(generic.BO): partner = models.ForeignKey( Partner, verbose_name=_("partner"), - limit_choices_to={ - "partner_type": "C"}, + limit_choices_to={"partner_type": "C"}, on_delete=models.CASCADE) offer_date = models.DateField(_("offer date")) deliver_date = models.DateField(_("deliver date")) @@ -270,9 +266,7 @@ class OfferItem(models.Model): material = models.ForeignKey( Material, verbose_name=_("material"), - limit_choices_to={ - "is_virtual": "0", - 'can_sale': '1'}, + limit_choices_to={"is_virtual": "0", 'can_sale': '1'}, blank=True, null=True, on_delete=models.CASCADE) diff --git a/selfhelp/models.py b/selfhelp/models.py index 80c6de4..cdda8ea 100644 --- a/selfhelp/models.py +++ b/selfhelp/models.py @@ -122,8 +122,7 @@ class WOItem(models.Model): verbose_name=_("material"), null=True, blank=True, - limit_choices_to={ - "is_virtual": "0"}, + limit_choices_to={"is_virtual": "0"}, on_delete=models.CASCADE) amount = models.DecimalField(_("amount"), max_digits=10, decimal_places=4, blank=True, null=True) measure = models.ForeignKey(Measure, verbose_name=_('measure'), blank=True, null=True, on_delete=models.CASCADE) @@ -327,8 +326,7 @@ class Activity(generic.BO): verbose_name=_("room"), blank=True, null=True, - limit_choices_to={ - 'tp': 20}, + limit_choices_to={'tp': 20}, on_delete=models.CASCADE) location = models.CharField(_("location"), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) classification = models.CharField( From 8f9a63024d3d3288bd6fe9406dbb389fdf6463e8 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Wed, 17 Jun 2020 11:06:56 +0800 Subject: [PATCH 43/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- purchase/admin.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/purchase/admin.py b/purchase/admin.py index 36dab5b..65de15a 100644 --- a/purchase/admin.py +++ b/purchase/admin.py @@ -5,6 +5,7 @@ class POItemInline(admin.TabularInline): + """采购单明细行Inline""" model = POItem fields = ('material', 'measure', 'price', 'cnt', 'tax', 'discount_price') raw_id_fields = ['material'] @@ -58,6 +59,7 @@ def get_changeform_initial_data(self, request): class PurchaseItemAdmin(generic.BOAdmin): + """采购明细管理""" list_display = ['po', 'vender', 'material', 'cnt', 'price', 'tax'] readonly_fields = ['po', 'material', 'cnt', 'price', 'tax'] @@ -66,6 +68,7 @@ def get_queryset(self, request): class InvoiceAdmin(generic.BOAdmin): + """发票管理""" list_display = ['code', 'number', 'vo_date', 'po', 'partner', 'po_amount', 'vo_amount'] readonly_fields = ['partner', 'po_amount'] raw_id_fields = ['po'] @@ -77,6 +80,7 @@ class InvoiceAdmin(generic.BOAdmin): class PaymentAdmin(generic.BOAdmin): + """采购付款管理""" CODE_PREFIX = 'PY' CODE_NUMBER_WIDTH = 4 list_display = ['code', 'py_date', 'po', 'partner', 'po_amount', 'py_amount'] From 54e7c933399b64149b22cf6f2372bf1c2089c11a Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Wed, 17 Jun 2020 11:30:38 +0800 Subject: [PATCH 44/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- organ/models.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/organ/models.py b/organ/models.py index 720de65..46bb7bf 100644 --- a/organ/models.py +++ b/organ/models.py @@ -66,14 +66,16 @@ class OrgUnit(generic.BO): 组织单元 """ UNIT_LEVEL = ( - (1, _('BRANCH')), - (2, _('DEPARTMENT')), - (3, _('OFFICE')), - (4, _('TEAM')), - (5, _('COMMITTEE')) + (1, _('BRANCH')), # 分公司/事业部 + (2, _('DEPARTMENT')), # 一级部门 + (3, _('OFFICE')), # 二级部门/处室/科室 + (4, _('TEAM')), # 组/班 + (5, _('COMMITTEE')) # 委员会 ) index_weight = 2 + # 自关联父级 parent = models.ForeignKey('self', verbose_name=_("parent"), null=True, blank=True, on_delete=models.CASCADE) + # 所属组织 organization = models.ForeignKey(Organization, verbose_name=_('organization'), null=True, blank=True, on_delete=models.CASCADE) # 编号 From a3f4967026f4453abc51348d90258b31755c37a8 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Wed, 17 Jun 2020 11:37:50 +0800 Subject: [PATCH 45/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- organ/models.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/organ/models.py b/organ/models.py index 46bb7bf..bf3230b 100644 --- a/organ/models.py +++ b/organ/models.py @@ -112,13 +112,15 @@ class Position(generic.BO): """ 岗位 """ + # 未用 SERIES = ( - ('A', _("Admin Position")), - ('S', _("Sale Position")), - ('T', _("Technology Position")), - ('P', _("Produce Position")), + ('A', _("Admin Position")), # 管理行政类 + ('S', _("Sale Position")), # 市场营销类 + ('T', _("Technology Position")), # 技术研发类 + ('P', _("Produce Position")), # 生产操作类 ) + # 未用：岗位级别 GRADE = ( ('01', _("BASIC")), ('02', _("MEDIUM")), From cb427983c9e669540938b284dfc8cd31041828ee Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Wed, 17 Jun 2020 14:12:03 +0800 Subject: [PATCH 46/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/const.py | 7 +++++-- syscfg/models.py | 13 +++++++++++++ workflow/models.py | 2 ++ workflow/views.py | 2 ++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/common/const.py b/common/const.py index 958be2a..e4d157e 100644 --- a/common/const.py +++ b/common/const.py @@ -24,8 +24,11 @@ def get_value_list(group): - """ - 获取值列表信息 + """获取值列表信息 + + :param group: str, 组名称 + + :return: ((key1, value1), (key2, value2), ...) """ if group: try: diff --git a/syscfg/models.py b/syscfg/models.py index 3474c6d..3ff709a 100644 --- a/syscfg/models.py +++ b/syscfg/models.py @@ -14,7 +14,9 @@ class Site(ToStringMixin, models.Model): index_weight = 1 begin = models.DateField(_('begin date'), blank=True, null=True) end = models.DateField(_('end date'), blank=True, null=True) + # 站点名称 name = models.CharField(_('site name'), max_length=const.DB_CHAR_NAME_40) + # 描述信息 description = models.TextField(_('site description'), blank=True, null=True) user = models.ManyToManyField(User, verbose_name=_('administrator')) @@ -31,12 +33,18 @@ class Module(generic.BO): 模块管理 """ index_weight = 2 + # 模块编号 code = models.CharField(_("module code"), max_length=const.DB_CHAR_CODE_6, blank=True, null=True) + # 模块名称 name = models.CharField(_("module name"), max_length=const.DB_CHAR_NAME_40) + # URL url = models.URLField(_("module url"), blank=True, null=True, max_length=const.DB_CHAR_NAME_80) + # 权重 weight = models.IntegerField(_("weight"), blank=True, null=True, default=99) icon = models.CharField(_("style class"), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) + # 父级 parent = models.ForeignKey('self', blank=True, null=True, verbose_name=_("parent"), on_delete=models.CASCADE) + # 是否在用 status = models.BooleanField(_("in use"), default=True) class Meta: @@ -49,10 +57,15 @@ class Menu(generic.BO): 菜单管理 """ index_weight = 3 + # 关联的模块 module = models.ForeignKey(Module, verbose_name=_("module"), on_delete=models.CASCADE) + # 编号 code = models.CharField(_("menu code"), max_length=const.DB_CHAR_CODE_6, blank=True, null=True) + # 名称 name = models.CharField(_("menu name"), max_length=const.DB_CHAR_NAME_40) + # URL url = models.URLField(_("menu url"), blank=True, null=True, max_length=const.DB_CHAR_NAME_80) + # 权重 weight = models.IntegerField(_("weight"), blank=True, null=True, default=99) icon = models.CharField(_("style class"), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) status = models.BooleanField(_("in use"), default=True) diff --git a/workflow/models.py b/workflow/models.py index 899ea81..d2553ca 100644 --- a/workflow/models.py +++ b/workflow/models.py @@ -87,9 +87,11 @@ class Node(ToStringMixin, models.Model): approve_node = models.BooleanField(_("approve node"), default=False) handler = models.TextField(_("handler"), blank=True, null=True, help_text=u'自定义SQL语句，优先高于指定用户、岗位、角色') # added by zhugl 2015-05-10 + # 处理类型 handler_type = models.IntegerField(_("handler type"), choices=HANDLER_TYPE, default=1) positions = models.ManyToManyField(Position, verbose_name=_("designated position"), blank=True) # 角色 多对多 + # syscfg.models.Role roles = models.ManyToManyField(Role, verbose_name=_("designated role"), blank=True) # 用户 多对多 users = models.ManyToManyField(User, verbose_name=_("designated user"), blank=True) diff --git a/workflow/views.py b/workflow/views.py index 46ca16f..f5679c9 100644 --- a/workflow/views.py +++ b/workflow/views.py @@ -25,7 +25,9 @@ def compile_node_handler(request, obj, next_node): :return: """ + # 下一个节点处理类 handler = next_node.handler + # 下一个用户处理类 next_user_handler = next_node.next_user_handler # next_user_handler 具有最高优先级 if next_user_handler: From cf43027b9853881a1a9e6b70eff8496f0fd5d6a7 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Wed, 17 Jun 2020 14:23:42 +0800 Subject: [PATCH 47/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/models.py | 3 +++ workflow/views.py | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/workflow/models.py b/workflow/models.py index d2553ca..9f23ae9 100644 --- a/workflow/models.py +++ b/workflow/models.py @@ -85,10 +85,12 @@ class Node(ToStringMixin, models.Model): short_message_notice = models.BooleanField(_("short message notice"), default=False) # 批准节点 approve_node = models.BooleanField(_("approve node"), default=False) + # 处理人 通过自定义SQL语句查询 handler = models.TextField(_("handler"), blank=True, null=True, help_text=u'自定义SQL语句，优先高于指定用户、岗位、角色') # added by zhugl 2015-05-10 # 处理类型 handler_type = models.IntegerField(_("handler type"), choices=HANDLER_TYPE, default=1) + # 岗位 多对多 positions = models.ManyToManyField(Position, verbose_name=_("designated position"), blank=True) # 角色 多对多 # syscfg.models.Role @@ -97,6 +99,7 @@ class Node(ToStringMixin, models.Model): users = models.ManyToManyField(User, verbose_name=_("designated user"), blank=True) # 组织单元 多对多 departments = models.ManyToManyField(OrgUnit, verbose_name=_("designated department"), blank=True) + # 下一个节点 自关联 next = models.ManyToManyField('self', blank=True, verbose_name=_("next node"), symmetrical=False) # added by zhugl 2015-06-30 next_user_handler = models.CharField(_('next user handler'), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) diff --git a/workflow/views.py b/workflow/views.py index f5679c9..87fd478 100644 --- a/workflow/views.py +++ b/workflow/views.py @@ -25,7 +25,7 @@ def compile_node_handler(request, obj, next_node): :return: """ - # 下一个节点处理类 + # 自定义 SQL 语句 handler = next_node.handler # 下一个用户处理类 next_user_handler = next_node.next_user_handler @@ -80,7 +80,7 @@ def compile_node_handler(request, obj, next_node): def start(request, app, model, object_id): - """ + """ 启动工作流 :param request: :return: @@ -159,7 +159,7 @@ def start(request, app, model, object_id): def approve(request, app, model, object_id, operation): - """ + """ 批准 :param request: :param operation: @@ -302,7 +302,7 @@ def approve(request, app, model, object_id, operation): def restart(request, app, model, object_id, instance): - """ + """ 重启 :param request: :param app: From 72d9eb4364aad8686b4aba40ebe4def19ab734fe Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Wed, 17 Jun 2020 15:06:10 +0800 Subject: [PATCH 48/65] =?UTF-8?q?=E7=BB=99=E6=A8=A1=E6=9D=BF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/admin/workflow/node/change_form.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/templates/admin/workflow/node/change_form.html b/templates/admin/workflow/node/change_form.html index 4f8e13c..2bdb81a 100644 --- a/templates/admin/workflow/node/change_form.html +++ b/templates/admin/workflow/node/change_form.html @@ -13,6 +13,7 @@ {% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %} {% if not is_popup %} +{% comment %} 导航栏 {% endcomment %} {% block breadcrumbs %}
{% trans 'Home' %} @@ -23,6 +24,7 @@ {% endblock %} {% endif %} +{% comment %} 主要内容 {% endcomment %} {% block content %}
{% block object-tools %} {% if change %}{% if not is_popup %} @@ -112,12 +114,16 @@

{% trans "workflow approve" %}

{% else %} $("#workflow_submit").hide(); {% endif %} + + {% comment %} 添加额外的按钮 {% endcomment %} {% if extra_buttons %} {% for button in extra_buttons %} $("{{button.title}}").insertAfter("#workflow_submit"); {% endfor %} {% endif %} + {% if readonly %} + {% comment %} 如果是只读 禁用 input select textarea 隐藏提交按钮 隐藏添加按钮 {% endcomment %} $('input,select,textarea').attr('disabled',true); $('div.submit-row').hide(); $('tr.add-row').hide(); @@ -129,21 +135,27 @@

{% trans "workflow approve" %}

} }); + + {% comment %} handler_type 点击处理事件 {% endcomment %} $("input[name='handler_type']").bind('click',function(){ v = $("input[name='handler_type']:checked").val(); if(v==1){ + {% comment %} 指定用户 {% endcomment %} $('div.field-users').show(); $('div.field-positions').hide(); $('div.field-roles').hide(); }else if(v==2){ + {% comment %} 指定岗位 {% endcomment %} $('div.field-users').hide(); $('div.field-positions').show(); $('div.field-roles').hide(); }else if(v==3){ + {% comment %} 指定角色 {% endcomment %} $('div.field-users').hide(); $('div.field-positions').hide(); $('div.field-roles').show(); }else if(v==4){ + {% comment %} 提交人 {% endcomment %} $('div.field-users').hide(); $('div.field-positions').hide(); $('div.field-roles').hide(); From 604ce5b4832e4cd9b230d7fce622dc2182a95c41 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Wed, 17 Jun 2020 15:57:44 +0800 Subject: [PATCH 49/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- syscfg/models.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/syscfg/models.py b/syscfg/models.py index 3ff709a..5c154bf 100644 --- a/syscfg/models.py +++ b/syscfg/models.py @@ -80,10 +80,15 @@ class Role(generic.BO): 角色管理，分配用户所拥有的菜单 """ index_weight = 4 + # 角色编号 code = models.CharField(_("role code"), max_length=const.DB_CHAR_CODE_6, blank=True, null=True) + # 角色名称 name = models.CharField(_("role name"), max_length=const.DB_CHAR_NAME_40) + # 描述 description = models.CharField(_("description"), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) + # 是否在用 status = models.BooleanField(_("in use"), default=True) + # 父级角色 parent = models.ForeignKey('self', blank=True, null=True, verbose_name=_("parent"), on_delete=models.CASCADE) users = models.ManyToManyField(User, verbose_name=_("role users"), blank=True) menus = models.ManyToManyField(Menu, verbose_name=_("role menus"), blank=True) From 6630c8956bd9b46a0b03b5d8df151f25f6f777ab Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Wed, 17 Jun 2020 16:06:37 +0800 Subject: [PATCH 50/65] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AC=94=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- note.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/note.md b/note.md index f5c1d57..f678d92 100644 --- a/note.md +++ b/note.md @@ -65,13 +65,11 @@ - 基础数据 - 项目 - 职员 - - 放在人力资源模块比较好 - 合作伙伴 - 物料 - 计量单位 - 用于标识物料的单位 - 仓库 - - 放在库存管理模块比较好 - 技术参数 - 文档 - 值列表 @@ -93,3 +91,8 @@ - 审批记录 - 认证授权（Django自带） - 内容类型（Django自带） + + +## 优化 + +【基础数据】应用中，可以把【文档】、【值列表】、【导入】模块抽出来放在【系统配置】应用中。 From f5be5cf149574870b74f5740724c199f5c890980 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Wed, 17 Jun 2020 16:40:07 +0800 Subject: [PATCH 51/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- organ/models.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/organ/models.py b/organ/models.py index bf3230b..904034f 100644 --- a/organ/models.py +++ b/organ/models.py @@ -86,12 +86,17 @@ class OrgUnit(generic.BO): short = models.CharField(_("short name"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) # 拼音/英文 pinyin = models.CharField(_("pinyin"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 单元类型 unit_type = models.IntegerField(_("type"), choices=UNIT_LEVEL, default=2) # 状态：是否在用 status = models.BooleanField(_("in use"), default=True) # 是否虚拟 virtual = models.BooleanField(_("is virtual"), default=False) + + ################################################################ + # 联系方式 + ################################################################ # 传真 fax = models.CharField(_("fax"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) # 联系电话 @@ -100,6 +105,7 @@ class OrgUnit(generic.BO): contacts = models.CharField(_("contacts"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) # 邮箱 email = models.CharField(_("email"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 排序权重 weight = models.IntegerField(_("weight"), default=99) @@ -136,6 +142,7 @@ class Position(generic.BO): null=True, blank=True, on_delete=models.CASCADE) # 父级 parent = models.ForeignKey('self', verbose_name=_("parent"), null=True, blank=True, on_delete=models.CASCADE) + # 编号 code = models.CharField(_("position code"), max_length=const.DB_CHAR_CODE_8, blank=True, null=True) # 岗位名称 @@ -144,6 +151,7 @@ class Position(generic.BO): short = models.CharField(_("short name"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) # 拼音/英文 pinyin = models.CharField(_("pinyin"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 岗位序列 series = models.CharField(_("position series"), max_length=1, default='A', choices=const.get_value_list('S014')) # 岗位级别 @@ -152,6 +160,7 @@ class Position(generic.BO): max_length=const.DB_CHAR_CODE_2, default='01', choices=const.get_value_list('S015')) + # 是否虚拟 virtual = models.BooleanField(_("is virtual"), default=False) # 状态：是否在用 From 6f38f824025dab6ff594a46ff56fbf03fb162a20 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Fri, 19 Jun 2020 10:10:38 +0800 Subject: [PATCH 52/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 122 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 119 insertions(+), 3 deletions(-) diff --git a/basedata/models.py b/basedata/models.py index d399143..4c2d8ac 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -979,6 +979,7 @@ class Employee(generic.BO): Position, verbose_name=_('position'), on_delete=models.CASCADE) + # 职员级别 rank = models.CharField( _("employee rank"), max_length=const.DB_CHAR_CODE_2, @@ -990,6 +991,15 @@ class Employee(generic.BO): # 入职日期 startday = models.DateField(_("start date"), blank=True, null=True) # 宗教 + # 00 - 无宗教信仰 + # 10 - 佛教 + # 20 - 喇嘛教 + # 30 - 道教 + # 40 - 天主教 + # 50 - 基督教 + # 70 - 东正教 + # 80 - 伊斯兰教 + # 99 - 其他 religion = models.CharField( _("religion"), max_length=const.DB_CHAR_CODE_2, @@ -999,6 +1009,13 @@ class Employee(generic.BO): null=True, ) # 婚姻状况 + # 10 - 未婚 + # 20 - 初婚 + # 21 - 再婚 + # 22 - 复婚 + # 30 - 丧偶 + # 40 - 离婚 + # 90 - 其他 marital = models.CharField( _("marital status"), max_length=const.DB_CHAR_CODE_2, @@ -1007,6 +1024,19 @@ class Employee(generic.BO): choices=const.get_value_list('S023'), default='10') # 政治面貌 + # 01 - 中国共产党党员 + # 02 - 中国共产党预备党员 + # 03 - 中国共产主义青年团团员 + # 04 - 中国国民党革命委员会会员 + # 05 - 中国民主同盟盟员 + # 06 - 中国民主建国会会员 + # 07 - 中国民主促进会会员 + # 08 - 中国农工民主党党员 + # 09 - 中国致公党党员 + # 10 - 九三学社社员 + # 11 - 台湾民主自治同盟盟员 + # 12 - 无党派民主人士 + # 13 - 群众 party = models.CharField( _("political party"), max_length=const.DB_CHAR_CODE_2, @@ -1015,6 +1045,7 @@ class Employee(generic.BO): choices=const.get_value_list('S026'), default='13') # 民族 + # 01 - 汉族 nation = models.CharField( _("nation"), max_length=const.DB_CHAR_CODE_2, @@ -1023,6 +1054,14 @@ class Employee(generic.BO): choices=const.get_value_list('S021'), default='01') + # 用工形式 + # 1 - 劳动合同制（长期） + # 2 - 劳动合同制（短期） + # 3 - 人事代理制 + # 4 - 劳务派遣制 + # 5 - 非全日制 + # 6 - 业务外包 + # 9 - 其他 ygxs = models.CharField( _("employ ygxs"), max_length=const.DB_CHAR_CODE_2, @@ -1030,6 +1069,17 @@ class Employee(generic.BO): null=True, choices=const.get_value_list('S019'), default='2') + # 人员状态 + # 10 - 在岗工作 + # 11 - 见习期（试用） + # 12 - 待岗 + # 20 - 离职 + # 21 - 退休 + # 22 - 终止劳动合同 + # 23 - 协商解除劳动合同 + # 24 - 劳动者主张解除劳动合同 + # 25 - 用人单位主张解除劳动合同 + # 30 - 死亡 status = models.CharField( _("employ status"), max_length=const.DB_CHAR_CODE_2, @@ -1037,6 +1087,15 @@ class Employee(generic.BO): null=True, choices=const.get_value_list('S016'), default='10') + + # 人员类别 + # 10 - 经营者 + # 20 - 中层管理人员 + # 21 - 一般管理人员 + # 30 - 专业技术人员 + # 40 - 技能人员 + # 50 - 服务人员 + # 99 - 其他人员 category = models.CharField( _("employ category"), max_length=const.DB_CHAR_CODE_2, @@ -1045,6 +1104,15 @@ class Employee(generic.BO): choices=const.get_value_list('S018'), default='21') + # 文化程度 + # 0 - 研究生 + # 10 - 大学本科 + # 20 - 大学专科和专科学校 + # 40 - 技工学校 + # 50 - 高中 + # 60 - 初中 + # 70 - 小学 + # 80 - 文盲或半文盲 literacy = models.CharField( _("literacy"), max_length=const.DB_CHAR_CODE_2, @@ -1052,6 +1120,21 @@ class Employee(generic.BO): choices=const.get_value_list('S024'), blank=True, null=True) + # 专业类别 + # 01 - 哲学 + # 02 - 经济学 + # 03 - 法学 + # 04 - 教育学 + # 05 - 文学 + # 06 - 历史学 + # 07 - 理学 + # 08 - 工学 + # 09 - 农学 + # 10 - 医学 + # 11 - 军事学 + # 12 - 管理学 + # 13 - 建筑学 + # 99 - 其他 major = models.CharField( _("major type"), max_length=const.DB_CHAR_CODE_2, @@ -1060,6 +1143,12 @@ class Employee(generic.BO): choices=const.get_value_list('S038'), default='99') # 学位 + # 1 - 名誉博士 + # 2 - 博士 + # 3 - 硕士 + # 4 - 学士 + # 5 - 双学士 + # 9 - 其他 degree = models.CharField( _("major degree"), max_length=const.DB_CHAR_CODE_2, @@ -1069,6 +1158,7 @@ class Employee(generic.BO): default='4') # 特殊工种 + # 00 - 非特殊工种 spjob = models.CharField( _("special job"), max_length=const.DB_CHAR_CODE_2, @@ -1076,7 +1166,13 @@ class Employee(generic.BO): null=True, choices=const.get_value_list('S042'), default='00') - # 健康状况 + # 身体状况 + # 1 - 健康或良好 + # 2 - 一般或较弱 + # 3 - 有慢性病（一） + # 4 - 有慢性病（二） + # 6 - 残疾 + # 7 - 军残 health = models.CharField( _("health"), max_length=const.DB_CHAR_CODE_2, @@ -1085,7 +1181,13 @@ class Employee(generic.BO): choices=const.get_value_list('S043'), default='1') - # 复转军人标识 + # 复转军人标识 + # 10 - 军转干部 + # 15 - 复员干部 + # 20 - 转业士官 + # 30 - 复员士官 + # 40 - 退役士兵 + # 99 - 非复转军人 tag1 = models.CharField( _("tag1 fzjr"), max_length=const.DB_CHAR_CODE_2, @@ -1094,6 +1196,13 @@ class Employee(generic.BO): choices=const.get_value_list('S039'), default='99') # 党委负责人 + # 1 - 党委（党组）书记 + # 2 - 党委（党组）副书记 + # 3 - 党委常委（党组成员） + # 4 - 纪委书记（纪检组组长） + # 6 - 工会主席 + # 8 - 其他党委（党组）负责人 + # 9 - 非党委负责人 tag2 = models.CharField( _("tag2 dwld"), max_length=const.DB_CHAR_CODE_2, @@ -1102,6 +1211,7 @@ class Employee(generic.BO): choices=const.get_value_list('S040'), default='9') # 董事监事 + # 00 - 非董事监事 tag3 = models.CharField( _("tag3 dsjs"), max_length=const.DB_CHAR_CODE_10, @@ -1110,6 +1220,12 @@ class Employee(generic.BO): choices=const.get_value_list('S041'), default='00') # 兵役状况 + # 0 - 未服兵役 + # 1 - 退出现役 + # 2 - 士兵预备役 + # 3 - 军官预备役 + # 4 - 服现役 + # 9 - 其他 tag4 = models.CharField( _("tag4 byzk"), max_length=const.DB_CHAR_CODE_2, @@ -1287,7 +1403,7 @@ class DataImport(generic.BO): content_type = models.ForeignKey( ContentType, verbose_name=_("content type"), - limit_choices_to={"app_label__in": ['basedata','organ','auth']}, + limit_choices_to={"app_label__in": ['basedata', 'organ', 'auth']}, on_delete=models.CASCADE) # 附件 attach = models.FileField( From c1eb60cbefee34a702c8c81676948083184f690e Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Fri, 19 Jun 2020 17:53:40 +0800 Subject: [PATCH 53/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/basedata/models.py b/basedata/models.py index 4c2d8ac..82c2b3b 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -1328,7 +1328,9 @@ class Education(generic.BO): max_length=const.DB_CHAR_CODE_2, choices=const.get_value_list('S035'), default='1') + # 学校 school = models.CharField(_("school"), max_length=const.DB_CHAR_NAME_120) + # 专业 major = models.CharField( _("major"), max_length=const.DB_CHAR_NAME_120, From 28ce50ae3742bd9be07ecc121a02624aa11eea2b Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Fri, 19 Jun 2020 17:53:48 +0800 Subject: [PATCH 54/65] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AC=94=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- note.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/note.md b/note.md index f678d92..5589240 100644 --- a/note.md +++ b/note.md @@ -26,6 +26,13 @@ sudo apt-get install -y build-essential libssl-dev libffi-dev libxml2 libxml2-dev libxslt1-dev zlib1g-dev sudo apt-get install -y libmysqlclient-dev python3-dev +## 导出 basedata.ValueListItem + + python manage.py dumpdata --format json basedata.ValueList basedata.ValueListItem > value_list.json + +导入 + + python manage.py loaddata value_list.json ## 主要模块说明 From 794d1291524847ac4010a8a22ed15176fab8244e Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Fri, 19 Jun 2020 17:59:14 +0800 Subject: [PATCH 55/65] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/admin.py | 165 ++++++++++++++++++++-------------------------- 1 file changed, 70 insertions(+), 95 deletions(-) diff --git a/basedata/admin.py b/basedata/admin.py index a256857..95508a0 100644 --- a/basedata/admin.py +++ b/basedata/admin.py @@ -28,8 +28,11 @@ class ValueListAdmin(generic.BOAdmin): CODE_NUMBER_WIDTH = 3 CODE_PREFIX = 'S' list_display = ['code', 'name', 'module', 'status'] - fields = (('code',), ('name',), ('module',), ('status', - 'init', 'locked',), ('locked_by', 'lock_time',)) + fields = (('code',), + ('name',), + ('module',), + ('status', 'init', 'locked',), + ('locked_by', 'lock_time',)) raw_id_fields = ['module'] readonly_fields = ['locked_by', 'lock_time'] inlines = [ValueListItemInline] @@ -81,20 +84,8 @@ def get_extra(self, request, obj=None, **kwargs): class PartnerForm(models.ModelForm): - tax_address = fields.CharField( - widget=TextInput( - attrs={ - 'size': 119, - }), - required=False, - label=_("tax address")) - memo = fields.CharField( - widget=Textarea( - attrs={ - 'rows': 3, - 'cols': 85}), - required=False, - label=_("memo")) + tax_address = fields.CharField(widget=TextInput(attrs={'size': 119, }), required=False, label=_("tax address")) + memo = fields.CharField(widget=Textarea(attrs={'rows': 3, 'cols': 85}), required=False, label=_("memo")) class Meta: model = Partner @@ -105,40 +96,31 @@ class PartnerAdmin(generic.BOAdmin): list_display = ['code', 'name', 'partner_type', 'level'] list_display_links = ['code', 'name'] - fields = (('code', 'name',), ('short', 'pinyin',), ('partner_type', 'level'), - ('tax_num', 'tax_account',), ('tax_address',), ('contacts', 'phone',), ('memo',),) + fields = (('code', 'name',), + ('short', 'pinyin',), + ('partner_type', 'level'), + ('tax_num', 'tax_account',), + ('tax_address',), + ('contacts', 'phone',), + ('memo',),) search_fields = ['code', 'name', 'pinyin'] form = PartnerForm save_on_top = True inlines = [AddressInline, BankAccountInline] def get_queryset(self, request): - if request.user.is_superuser or (request.user.has_perm('basedate.view_all_customer') - and request.user.has_perm('basedate.view_all_supplier')): + if request.user.is_superuser or ( + request.user.has_perm('basedate.view_all_customer') and request.user.has_perm('basedate.view_all_supplier')): return super(PartnerAdmin, self).get_queryset(request) elif request.user.has_perm('basedata.view_all_customer'): - return super( - PartnerAdmin, - self).get_queryset(request).filter( - partner_type='C') + return super(PartnerAdmin, self).get_queryset(request).filter(partner_type='C') else: - return super( - PartnerAdmin, - self).get_queryset(request).filter( - partner_type='S') + return super(PartnerAdmin, self).get_queryset(request).filter(partner_type='S') class ProjectForm(models.ModelForm): - income = fields.DecimalField( - required=False, - widget=TextInput( - attrs={ - 'readonly': 'true'})) - expand = fields.DecimalField( - required=False, - widget=TextInput( - attrs={ - 'readonly': 'true'})) + income = fields.DecimalField(required=False, widget=TextInput(attrs={'readonly': 'true'})) + expand = fields.DecimalField(required=False, widget=TextInput(attrs={'readonly': 'true'})) class Meta: model = Project @@ -150,10 +132,16 @@ class ProjectAdmin(generic.BOAdmin): list_display = ['code', 'name', 'status', 'income', 'expand'] list_display_links = ['code', 'name'] fields = ( - ('code', 'name',), ('short', 'pinyin',), - ('partner',), ('status', 'prj_type',), + ('code', 'name',), + ('short', 'pinyin',), + ('partner',), + ('status', 'prj_type',), ('description',), - ('budget', 'income', 'expand',), ('blueprint',), ('offer',), ('business',), ('users',), + ('budget', 'income', 'expand',), + ('blueprint',), + ('offer',), + ('business',), + ('users',), ) search_fields = ['code', 'name'] readonly_fields = ['status'] @@ -206,17 +194,8 @@ def save_model(self, request, obj, form, change): class MaterialForm(models.ModelForm): - name = fields.CharField( - widget=TextInput( - attrs={ - "size": "119"}), - label=_("material name")) - spec = fields.CharField( - widget=TextInput( - attrs={ - "size": "119"}), - required=False, - label=_("specifications")) + name = fields.CharField(widget=TextInput(attrs={"size": "119"}), label=_("material name")) + spec = fields.CharField(widget=TextInput(attrs={"size": "119"}), required=False, label=_("specifications")) class Mata: model = Material @@ -242,9 +221,16 @@ class MaterialAdmin(generic.BOAdmin): list_filter = ['brand', 'tp'] search_fields = ['code', 'name'] fields = ( - ('code', 'barcode'), ('name',), ('spec',), - ('brand',), ('category',), ('status', 'is_equip', 'can_sale', 'is_virtual',), - ('warehouse',), ('tp',), ('measure',), ('stock_price', 'purchase_price', 'sale_price',), + ('code', 'barcode'), + ('name',), + ('spec',), + ('brand',), + ('category',), + ('status', 'is_equip', 'can_sale', 'is_virtual',), + ('warehouse',), + ('tp',), + ('measure',), + ('stock_price', 'purchase_price', 'sale_price',), ) filter_horizontal = ['measure'] inlines = [ExtraParamInline] @@ -273,16 +259,8 @@ class ExpenseAdmin(generic.BOAdmin): class FamilyForm(models.ModelForm): - name = fields.CharField( - widget=TextInput( - attrs={ - "size": "25"}), - label=_("name")) - phone = fields.CharField( - widget=TextInput( - attrs={ - "size": "25"}), - label=_("phone")) + name = fields.CharField(widget=TextInput(attrs={"size": "25"}), label=_("name")) + phone = fields.CharField(widget=TextInput(attrs={"size": "25"}), label=_("phone")) class Meta: model = Family @@ -329,11 +307,28 @@ class EmployeeAdmin(generic.BOAdmin): 'email'] search_fields = ['code', 'name', 'idcard', 'pinyin'] fieldsets = [ - (None, {'fields': [('code', 'phone',), ('name', 'pinyin',), ('gender', 'birthday',), ('idcard', 'country',), - ('position',), ('rank', 'category'), ('status', 'ygxs',), ('workday', 'startday',)]}), - (_('other info'), {'fields': [('hometown', 'address',), ('banknum', 'bankname',), ('email', 'office',), - ('emergency', 'literacy',), ('religion', 'marital',), ('party', 'nation',), ('spjob', 'health',), - ('major', 'degree',), ('tag1', 'tag2',), ('tag3', 'tag4',), ('user',), ], 'classes':['collapse']}), + (None, {'fields': [ + ('code', 'phone',), + ('name', 'pinyin',), + ('gender', 'birthday',), + ('idcard', 'country',), + ('position',), + ('rank', 'category'), + ('status', 'ygxs',), + ('workday', 'startday',) + ]}), + (_('other info'), {'fields': [ + ('hometown', 'address',), + ('banknum', 'bankname',), + ('email', 'office',), + ('emergency', 'literacy',), + ('religion', 'marital',), + ('party', 'nation',), + ('spjob', 'health',), + ('major', 'degree',), + ('tag1', 'tag2',), + ('tag3', 'tag4',), ('user',), + ], 'classes':['collapse']}), ] readonly_fields = ['status', 'ygxs', 'rank', 'category'] inlines = [FamilyInline, EducationInline, WorkExperienceInline] @@ -344,10 +339,7 @@ def get_queryset(self, request): 'basedata.view_all_employee'): return super(EmployeeAdmin, self).get_queryset(request) else: - return super( - EmployeeAdmin, - self).get_queryset(request).filter( - user=request.user) + return super(EmployeeAdmin, self).get_queryset(request).filter(user=request.user) def get_readonly_fields(self, request, obj=None): if request.user.is_superuser: @@ -376,26 +368,12 @@ def changeform_view( if obj.status == '1': extra_context = extra_context or {} extra_context.update(dict(readonly=True)) - return super( - DataImportAdmin, - self).changeform_view( - request, - object_id, - form_url, - extra_context) + return super(DataImportAdmin, self).changeform_view(request, object_id, form_url, extra_context) class DocumentForm(models.ModelForm): - title = fields.CharField( - widget=TextInput( - attrs={ - "size": "119"}), - label=_("title")) - keywords = fields.CharField( - widget=TextInput( - attrs={ - "size": "119"}), - label=_("keywords")) + title = fields.CharField(widget=TextInput(attrs={"size": "119"}), label=_("title")) + keywords = fields.CharField(widget=TextInput(attrs={"size": "119"}), label=_("keywords")) class Meta: model = Document @@ -440,10 +418,7 @@ def get_readonly_fields(self, request, obj=None): def publish(self, request, queryset): import datetime - cnt = queryset.filter( - status='0').update( - status='1', - pub_date=datetime.datetime.now()) + cnt = queryset.filter(status='0').update(status='1', pub_date=datetime.datetime.now()) self.message_user(request, u'%s 个文档发布成功' % cnt) publish.short_description = _('publish selected %(verbose_name_plural)s') From bc2987ba17578a454282e0052b3ca5d6de760234 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 22 Jun 2020 13:52:11 +0800 Subject: [PATCH 56/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/basedata/models.py b/basedata/models.py index 82c2b3b..ae30445 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -767,8 +767,9 @@ class Meta: class MaterialParam(ToStringMixin, models.Model): - """ - 物料扩展参数 + """物料参数 + + 作为多对多的关联表 """ material = models.ForeignKey(Material, on_delete=models.CASCADE) From 1848ae46879e6176c2012579ffb1565ea96c844d Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 22 Jun 2020 14:56:36 +0800 Subject: [PATCH 57/65] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AC=94=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- note.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/note.md b/note.md index 5589240..794dd90 100644 --- a/note.md +++ b/note.md @@ -28,7 +28,7 @@ ## 导出 basedata.ValueListItem - python manage.py dumpdata --format json basedata.ValueList basedata.ValueListItem > value_list.json + python manage.py dumpdata --indent 4 basedata.ValueList basedata.ValueListItem > value_list.json 导入 From 0621c52b3b29b5b106df1268f8703b33592c4ce4 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Wed, 24 Jun 2020 15:21:06 +0800 Subject: [PATCH 58/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- invent/models.py | 9 +++++---- purchase/models.py | 4 +++- templates/admin/invent/stockin/change_form.html | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/invent/models.py b/invent/models.py index b369050..1d7a217 100644 --- a/invent/models.py +++ b/invent/models.py @@ -357,7 +357,7 @@ class WareReturn(generic.BO): org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) - # 关联的出库单 + # 关联的领料单 out = models.ForeignKey(StockOut, verbose_name=_('StockOut'), on_delete=models.CASCADE) # 金额 amount = models.DecimalField(_("money of amount"), max_digits=14, decimal_places=4, blank=True, null=True) @@ -544,10 +544,11 @@ class Meta: class OutItem(InOutDetail): """ - 出库单明细行，继承 InOutDetail 类 + 领料单明细行，继承 InOutDetail 类 """ - # 关联出库单 + # 关联的领料单 master = models.ForeignKey(StockOut, on_delete=models.CASCADE) + # 库存物资 inventory = models.ForeignKey( Inventory, blank=True, @@ -576,7 +577,7 @@ class ReturnItem(InOutDetail): """ # 关联返库单 master = models.ForeignKey(WareReturn, on_delete=models.CASCADE) - # 关联出库单明细行 + # 关联领料单明细行 out_item = models.ForeignKey(OutItem, blank=True, null=True, verbose_name=_('out item'), on_delete=models.CASCADE) out_cnt = models.DecimalField(_("out count"), max_digits=14, decimal_places=4) diff --git a/purchase/models.py b/purchase/models.py index 4d75036..a87fd41 100644 --- a/purchase/models.py +++ b/purchase/models.py @@ -73,7 +73,9 @@ def __unicode__(self): def save(self, force_insert=False, force_update=False, using=None, update_fields=None): super(PurchaseOrder, self).save(force_insert, force_update, using, update_fields) - # 如果折扣金额大于0 + + # 如果折扣金额大于0，按比例会分摊到每一个物料上，并自动计算明细物料中的折旧单价 + # 如果使用SQL语句，因为sqlite3的update语句不支持别名，所以会报错 if self.discount_amount > 0: sql = 'UPDATE purchase_poitem a SET a.discount_price = ' \ 'a.price-((SELECT discount_amount/amount FROM purchase_purchaseorder WHERE id=%s)*a.amount/a.cnt) WHERE a.po_id = %s' diff --git a/templates/admin/invent/stockin/change_form.html b/templates/admin/invent/stockin/change_form.html index 5418990..c1bb0a6 100644 --- a/templates/admin/invent/stockin/change_form.html +++ b/templates/admin/invent/stockin/change_form.html @@ -42,7 +42,7 @@ {% if is_popup %}{% endif %} {% if to_field %}{% endif %} {% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %} -{% if show_workflow_line%} +{% if show_workflow_line %}

{% trans "workflow approve" %}

@@ -53,6 +53,7 @@

{% trans "workflow approve" %}

+ {% comment %} 工作流批准按钮 {% endcomment %} {% trans "submit" %} {% endif %}
From bf55d8c97c07f095db5bc6c6c9ea2ba36e5b55d6 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Wed, 24 Jun 2020 16:12:57 +0800 Subject: [PATCH 59/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- invent/models.py | 8 ++++---- templates/admin/invent/inventory/change_form.html | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/invent/models.py b/invent/models.py index 1d7a217..110cd76 100644 --- a/invent/models.py +++ b/invent/models.py @@ -457,8 +457,8 @@ class Meta: class InOutDetail(models.Model): - """ - 出入库详单，应该设置为抽象类 + """出入库详单 + 因为需要在实时库存显示某物料的出入库状态，需要查询该表，所以不能设置为抽象类 """ PROP = ( @@ -575,9 +575,9 @@ class ReturnItem(InOutDetail): """ 返库单明细行，继承 InOutDetail 类 """ - # 关联返库单 + # 关联的返库单 master = models.ForeignKey(WareReturn, on_delete=models.CASCADE) - # 关联领料单明细行 + # 关联的领料单明细行 out_item = models.ForeignKey(OutItem, blank=True, null=True, verbose_name=_('out item'), on_delete=models.CASCADE) out_cnt = models.DecimalField(_("out count"), max_digits=14, decimal_places=4) diff --git a/templates/admin/invent/inventory/change_form.html b/templates/admin/invent/inventory/change_form.html index 7976ef8..e96fb6e 100644 --- a/templates/admin/invent/inventory/change_form.html +++ b/templates/admin/invent/inventory/change_form.html @@ -132,6 +132,8 @@

{% trans "workflow approve" %}

+ +{% comment %} 出入库历史 {% endcomment %} {% if detail %}

{% trans "InOut History" %}

From ad6b1cbaa7c2a645cc4937a2c055554ca445f3f3 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Sun, 28 Jun 2020 11:00:06 +0800 Subject: [PATCH 60/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 14 ++++++++++++++ invent/models.py | 2 +- midware/cuser.py | 1 + sale/models.py | 18 ++++++++++++++++++ templates/admin/index.html | 5 +++-- 5 files changed, 37 insertions(+), 3 deletions(-) diff --git a/basedata/models.py b/basedata/models.py index ae30445..dccfd56 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -334,25 +334,30 @@ class Project(generic.BO): TYPES = get_value_list('S013') index_weight = 1 + # 项目编号 code = models.CharField( _("project code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 项目名称 name = models.CharField( _("project name"), max_length=const.DB_CHAR_NAME_120) + # 简称 short = models.CharField( _("short name"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 拼音/英文 pinyin = models.CharField( _("pinyin"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 合作伙伴 partner = models.ForeignKey( Partner, blank=True, @@ -360,6 +365,7 @@ class Project(generic.BO): verbose_name=_("partner"), limit_choices_to={"partner_type": "C"}, on_delete=models.CASCADE) + # 状态 status = models.CharField( _("status"), max_length=const.DB_CHAR_CODE_2, @@ -367,6 +373,7 @@ class Project(generic.BO): null=True, default='00', choices=STATUS) + # 项目类型 prj_type = models.CharField( _("project type"), max_length=const.DB_CHAR_CODE_2, @@ -375,8 +382,10 @@ class Project(generic.BO): choices=TYPES, default='00') + # 描述 description = models.TextField(_("description"), blank=True, null=True) + # 预算金额 budget = models.DecimalField( _("budget"), max_digits=10, @@ -396,24 +405,29 @@ class Project(generic.BO): blank=True, null=True) + # 技术/图纸 blueprint = models.FileField( _("blueprint"), upload_to='project', blank=True, null=True) + # 报价单 offer = models.FileField( _("offer sheet"), upload_to='offer sheet', blank=True, null=True) + # 商务/标书 business = models.FileField( _("business document"), upload_to='project', blank=True, null=True) + # 关系人 users = models.ManyToManyField( User, verbose_name=_("related users"), blank=True) + # 组织 org = models.ForeignKey( Organization, verbose_name=_("organization"), diff --git a/invent/models.py b/invent/models.py index 110cd76..c133df9 100644 --- a/invent/models.py +++ b/invent/models.py @@ -492,7 +492,7 @@ class InOutDetail(models.Model): price = models.DecimalField(_("price"), max_digits=14, decimal_places=4, blank=True, null=True) # 增减属性 prop = models.CharField(_("plus or minus property"), max_length=const.DB_CHAR_CODE_2, choices=PROP, default='+') - # 用于存放相关订单编号 + # 原始单据：用于存放相关订单编号 source = models.CharField(_("source"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) diff --git a/midware/cuser.py b/midware/cuser.py index 55df8b9..302179c 100644 --- a/midware/cuser.py +++ b/midware/cuser.py @@ -45,6 +45,7 @@ def process_request(self, request): _thread_local.user = django_user def process_view(self, request, view_func, view_args, view_kwargs): + # app 排序权重 app_weight = { 'selfhelp': 1, 'purchase': 3, diff --git a/sale/models.py b/sale/models.py index 97a108a..93619d5 100644 --- a/sale/models.py +++ b/sale/models.py @@ -28,17 +28,25 @@ class SaleOrder(generic.BO): ('99', _("ALREADY STOCK OUT")), ) index_weight = 2 + # 编号 code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 合作伙伴 partner = models.ForeignKey( Partner, verbose_name=_("partner"), limit_choices_to={"partner_type": "C"}, on_delete=models.CASCADE) + # 订单日期 order_date = models.DateField(_("order date")) + # 交付日期 deliver_date = models.DateField(_("deliver date")) org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + # 描述 description = models.TextField(_("memo"), blank=True, null=True) + + # 联系人 contact = models.CharField(_("contacts"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) phone = models.CharField(_("phone"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) fax = models.CharField(_("fax"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) @@ -125,14 +133,24 @@ class PaymentCollection(generic.BO): 销售回款 """ index_weight = 3 + + # 回款日期 collection_date = models.DateField(_("collection date"), blank=True, null=True, default=datetime.date.today) + # 所属组织 org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + # 回款单号 code = models.CharField(_("collection code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 关联的销售订单 so = models.ForeignKey(SaleOrder, verbose_name=_("sale order"), on_delete=models.CASCADE) + # 合作伙伴 partner = models.ForeignKey(Partner, verbose_name=_("partner"), blank=True, null=True, on_delete=models.CASCADE) + # 合同金额？ order_amount = models.DecimalField(_("order amount"), max_digits=14, decimal_places=4, blank=True, null=True) + # 到账金额？ collection_amount = models.DecimalField(_("collection amount"), max_digits=14, decimal_places=4) + # 银行 bank = models.ForeignKey(BankAccount, verbose_name=_("bank account"), blank=True, null=True, on_delete=models.CASCADE) + # 备注 memo = models.TextField(_("memo"), blank=True, null=True) def __unicode__(self): diff --git a/templates/admin/index.html b/templates/admin/index.html index f273047..bb43591 100644 --- a/templates/admin/index.html +++ b/templates/admin/index.html @@ -13,11 +13,12 @@ {% block breadcrumbs %}
{% trans 'Home' %} -{% for app in maxi_app_list %} +{% comment %} 遍历 maxi_app_list {% endcomment %} +{% for app in maxi_app_list %} | {{ app.name }} - {% endfor %} +
{% endblock %} From 183ae0878a59be2d6a7ff8f9b58085aa7a59ced1 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Sun, 28 Jun 2020 11:49:04 +0800 Subject: [PATCH 61/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sale/models.py | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/sale/models.py b/sale/models.py index 93619d5..8a9746a 100644 --- a/sale/models.py +++ b/sale/models.py @@ -50,11 +50,14 @@ class SaleOrder(generic.BO): contact = models.CharField(_("contacts"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) phone = models.CharField(_("phone"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) fax = models.CharField(_("fax"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 交付地址 deliver_address = models.CharField(_("deliver address"), max_length=const.DB_CHAR_NAME_120, blank=True, null=True) + # 发票类型 invoice_type = models.CharField(_("invoice type"), max_length=const.DB_CHAR_CODE_6, choices=const.get_value_list('S053'), default='10') - + # 金额 amount = models.DecimalField(_("money amount"), max_digits=12, decimal_places=2, blank=True, null=True, default=0.00) + # 折扣金额 discount_amount = models.DecimalField( _("discount amount"), max_digits=12, @@ -181,19 +184,28 @@ class OfferSheet(generic.BO): ('4', _("DROP")), ('9', _("APPROVED")), ) + # 编号 code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 合作伙伴 partner = models.ForeignKey( Partner, verbose_name=_("partner"), limit_choices_to={"partner_type": "C"}, on_delete=models.CASCADE) + # 报价日期 offer_date = models.DateField(_("offer date")) + # 交付日期 deliver_date = models.DateField(_("deliver date")) + # 组织机构 org = models.ForeignKey(Organization, verbose_name=_("organization"), blank=True, null=True, on_delete=models.CASCADE) + # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_40) + # 备注 description = models.TextField(_("memo"), blank=True, null=True) + # 金额 amount = models.DecimalField(_("money amount"), max_digits=12, decimal_places=2, blank=True, null=True, default=0.00) + # 折扣 discount_amount = models.DecimalField( _("discount amount"), max_digits=12, @@ -201,8 +213,10 @@ class OfferSheet(generic.BO): blank=True, null=True, default=0.00) + # 报价员 user = models.ForeignKey(User, verbose_name=_("offer man"), blank=True, null=True, on_delete=models.CASCADE) + # 报价表文件 attach = models.FileField( _('offer sheet file'), blank=True, @@ -278,9 +292,10 @@ class Meta: class OfferItem(models.Model): """ - 订单明细 + 报价明细 """ master = models.ForeignKey(OfferSheet, on_delete=models.CASCADE) + # 物料 material = models.ForeignKey( Material, verbose_name=_("material"), @@ -288,13 +303,21 @@ class OfferItem(models.Model): blank=True, null=True, on_delete=models.CASCADE) + # 计量单位 measure = models.ForeignKey(Measure, verbose_name=_("measure"), blank=True, null=True, on_delete=models.CASCADE) + # 数量 cnt = models.DecimalField(_("count"), max_digits=14, decimal_places=4) + # 品牌 brand = models.CharField(_('brand'), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) + # 成本单价 cost_price = models.DecimalField(_("cost price"), max_digits=14, decimal_places=4, blank=True, null=True) + # 库存单价？ stock_price = models.DecimalField(_("stock price"), max_digits=14, decimal_places=4, blank=True, null=True) + # 销售单价 sale_price = models.DecimalField(_("sale price"), max_digits=14, decimal_places=4, blank=True, null=True) + # 折后单价 discount_price = models.DecimalField(_("discount price"), max_digits=14, decimal_places=4, blank=True, null=True) + # 税率 tax = models.CharField(_("tax rate"), max_length=const.DB_CHAR_CODE_6, choices=const.get_value_list('S052'), default='0.00') create_time = models.DateTimeField(_("create time"), auto_now_add=True) status = models.BooleanField(_("executed"), default=0) From 92cf83550288515a64c51c71d92567a88a3661f6 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Mon, 20 Jul 2020 09:04:16 +0800 Subject: [PATCH 62/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/xls.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugin/xls.py b/plugin/xls.py index 9bfdf0e..f98ce7f 100644 --- a/plugin/xls.py +++ b/plugin/xls.py @@ -34,7 +34,9 @@ def handle(self, obj, f): self.stuff(obj, sheet) def department(self, obj, sheet): + """导入部门""" from organ.models import OrgUnit + row_count = sheet.nrows if obj.is_clear: OrgUnit.objects.update(end=datetime.date.today()) @@ -55,7 +57,9 @@ def department(self, obj, sheet): pass def position(self, obj, sheet): + """导入岗位""" from organ.models import Position, OrgUnit + row_count = sheet.nrows if obj.is_clear: Position.objects.update(end=datetime.date.today()) @@ -82,14 +86,17 @@ def position(self, obj, sheet): pass def stuff(self, obj, sheet): + """导入职员""" from organ.models import Position from basedata.models import Employee from django.contrib.auth.models import User, Group + row_count = sheet.nrows try: group = Group.objects.get_by_natural_key(u'职员') except Exception: pass + for row_index in range(1, row_count): row = sheet.row_values(row_index) position = Position.objects.filter(code=row[8], end__gt=datetime.date.today()).all()[0] From b35fca9bc11ac3fadff65a04839aef19ff3d4518 Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Tue, 21 Jul 2020 18:05:19 +0800 Subject: [PATCH 63/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- invent/admin.py | 1 + midware/cuser.py | 2 ++ plugin/wfactions.py | 1 + plugin/wfusers.py | 7 +++++-- workflow/admin.py | 1 + workflow/models.py | 38 ++++++++++++++++++++++++++++++-------- 6 files changed, 40 insertions(+), 10 deletions(-) diff --git a/invent/admin.py b/invent/admin.py index d443b39..ce51fee 100644 --- a/invent/admin.py +++ b/invent/admin.py @@ -93,6 +93,7 @@ def save_model(self, request, obj, form, change): except Exception as e: # 不存在则创建明细行 pp = item.discount_price or item.price + # 计算税率 if decimal.Decimal(item.tax) > decimal.Decimal(0): pp = pp / (decimal.Decimal(1) + decimal.Decimal(item.tax)) InItem.objects.create( diff --git a/midware/cuser.py b/midware/cuser.py index 302179c..e85c02d 100644 --- a/midware/cuser.py +++ b/midware/cuser.py @@ -58,6 +58,7 @@ def process_view(self, request, view_func, view_args, view_kwargs): if view_func.__name__ == 'index': app_dict = {} for model, model_admin in admin.site._registry.items(): + # 检查是否有module权限 app_label = model._meta.app_label has_module_perms = model_admin.has_module_permission(request) @@ -69,6 +70,7 @@ def process_view(self, request, view_func, view_args, view_kwargs): 'name': capfirst(model._meta.verbose_name_plural), 'object_name': model._meta.object_name, 'perms': perms, + # 获取model的排序权重 'weight': getattr(model, 'index_weight', 99) } if perms.get('change', False): diff --git a/plugin/wfactions.py b/plugin/wfactions.py index 0434df6..33275ed 100644 --- a/plugin/wfactions.py +++ b/plugin/wfactions.py @@ -26,6 +26,7 @@ def action(self, request, obj, node_config, operation=Operation.APPROVE): class TestAction(WorkflowAction): + """测试操作""" name = 'action.test' def action(self, request, obj, node_config, operation=Operation.APPROVE): diff --git a/plugin/wfusers.py b/plugin/wfusers.py index 7d9aad0..1310dc3 100644 --- a/plugin/wfusers.py +++ b/plugin/wfusers.py @@ -23,22 +23,25 @@ def handle(self, request, obj, node_config): class UpPosition(NextUserHandler): - """ + """获取上级职员""" - """ name = 'up.position.user' def handle(self, request, obj, node_config): from basedata.models import Employee, Position + # 获取该用户关联的职员 emp_query = Employee.objects.filter(user=request.user) if emp_query.count() > 0: emp = emp_query.all() + # 获取该职员的上级 parent = [] for e in emp: if e.position and e.position.parent: parent.append(e.position.parent) # print emp # print parent + + # 获取上级职员 query2 = Employee.objects.filter(position__in=parent).exclude(user=None) return [x.user for x in query2.all()] else: diff --git a/workflow/admin.py b/workflow/admin.py index 44a5f12..b724591 100644 --- a/workflow/admin.py +++ b/workflow/admin.py @@ -17,6 +17,7 @@ def get_extra(self, request, obj=None, **kwargs): class WorkflowModelAdmin(admin.ModelAdmin): + """工作流模型""" list_display = ['code', 'name', 'begin', 'end'] inlines = [NodeInline] readonly_fields = ['app_name', 'model_name'] diff --git a/workflow/models.py b/workflow/models.py index 9f23ae9..16efe07 100644 --- a/workflow/models.py +++ b/workflow/models.py @@ -28,6 +28,7 @@ class Modal(ToStringMixin, models.Model): limit_choices_to={"app_label__in": ['basedata', 'organ', 'purchase']}, on_delete=models.CASCADE) app_name = models.CharField(_("app name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) + # 模型名称名称 model_name = models.CharField(_("model name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) # added by zhugl 2015-05-10 # 开始时间 @@ -44,7 +45,7 @@ class Meta: class Node(ToStringMixin, models.Model): - """ + """工作流节点 submitter() upper() user() @@ -61,6 +62,8 @@ class Node(ToStringMixin, models.Model): (4, _("submitter")), # 提交人 ) index_weight = 2 + + # 工作流模型 modal = models.ForeignKey(Modal, verbose_name=_("workflow model"), on_delete=models.CASCADE) # 编号 code = models.CharField(_("node code"), max_length=const.DB_CHAR_CODE_4, blank=True, null=True) @@ -83,13 +86,16 @@ class Node(ToStringMixin, models.Model): email_notice = models.BooleanField(_("email notice"), default=True) # 短信通知 short_message_notice = models.BooleanField(_("short message notice"), default=False) + # 批准节点 approve_node = models.BooleanField(_("approve node"), default=False) - # 处理人 通过自定义SQL语句查询 + + # 处理器 通过自定义SQL语句查询 handler = models.TextField(_("handler"), blank=True, null=True, help_text=u'自定义SQL语句，优先高于指定用户、岗位、角色') # added by zhugl 2015-05-10 - # 处理类型 + # 处理器类型 handler_type = models.IntegerField(_("handler type"), choices=HANDLER_TYPE, default=1) + # 岗位 多对多 positions = models.ManyToManyField(Position, verbose_name=_("designated position"), blank=True) # 角色 多对多 @@ -99,11 +105,14 @@ class Node(ToStringMixin, models.Model): users = models.ManyToManyField(User, verbose_name=_("designated user"), blank=True) # 组织单元 多对多 departments = models.ManyToManyField(OrgUnit, verbose_name=_("designated department"), blank=True) + # 下一个节点 自关联 next = models.ManyToManyField('self', blank=True, verbose_name=_("next node"), symmetrical=False) + # added by zhugl 2015-06-30 next_user_handler = models.CharField(_('next user handler'), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) next_node_handler = models.CharField(_('next node handler'), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) + # 状态字段 status_field = models.CharField(_('status field'), blank=True, null=True, max_length=const.DB_CHAR_NAME_40) # 状态值 @@ -113,6 +122,7 @@ class Node(ToStringMixin, models.Model): def save(self, force_insert=False, force_update=False, using=None, update_fields=None): + # 自动添加code if not self.code: fmt = 'N%02d' self.code = fmt % (self.modal.node_set.count() + 1) @@ -172,21 +182,26 @@ class Meta: class History(ToStringMixin, models.Model): - """ + """审批记录 workflow history """ PROCESS_TYPE = ( - (0, _("SUBMIT")), - (1, _("AGREE")), - (3, _("DENY")), - (4, _("TERMINATE")), + (0, _("SUBMIT")), # 提交 + (1, _("AGREE")), # 同意 + (3, _("DENY")), # 拒绝 + (4, _("TERMINATE")), # 终止 ) index_weight = 5 + inst = models.ForeignKey(Instance, verbose_name=_("workflow instance"), on_delete=models.CASCADE) node = models.ForeignKey(Node, verbose_name=_("workflow node"), blank=True, null=True, on_delete=models.CASCADE) user = models.ForeignKey(User, verbose_name=_("submitter"), on_delete=models.CASCADE) + + # 处理时间 pro_time = models.DateTimeField(_("process time"), auto_now_add=True) + # 处理类型 pro_type = models.IntegerField(_("process type"), choices=PROCESS_TYPE, default=0) + memo = models.CharField(_("memo"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) def get_node_desc(self): @@ -220,15 +235,22 @@ class TodoList(ToStringMixin, models.Model): 待办列表 """ index_weight = 4 + code = models.CharField(_("code"), max_length=const.DB_CHAR_CODE_10, blank=True, null=True) inst = models.ForeignKey(Instance, verbose_name=_("workflow instance"), on_delete=models.CASCADE) node = models.ForeignKey(Node, verbose_name=_("current node"), blank=True, null=True, on_delete=models.CASCADE) + app_name = models.CharField(_("app name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) model_name = models.CharField(_("model name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) + + # 处理人 user = models.ForeignKey(User, verbose_name=_("handler"), on_delete=models.CASCADE) arrived_time = models.DateTimeField(_("arrived time"), auto_now_add=True) + # 已读 is_read = models.BooleanField(_("is read"), default=False) + # 阅读时间 read_time = models.DateTimeField(_("read time"), blank=True, null=True) + # 已完成 status = models.BooleanField(_("is done"), default=False) def save(self, force_insert=False, force_update=False, using=None, From d89ae9a1346acc407d2cf24c37931b1f92ce69ee Mon Sep 17 00:00:00 2001 From: E7EE477C11C98D403F318118733EAA5C Date: Thu, 13 Aug 2020 09:30:50 +0800 Subject: [PATCH 64/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basedata/models.py | 4 + common/generic.py | 16 ++++ selfhelp/models.py | 78 ++++++++++++++++--- selfhelp/views.py | 1 + templates/admin/change_form.html | 29 +++++-- .../admin/selfhelp/workorder/change_form.html | 1 + .../workflow/workflow_start_confirmation.html | 2 + workflow/models.py | 23 +++++- workflow/views.py | 30 ++++++- 9 files changed, 162 insertions(+), 22 deletions(-) diff --git a/basedata/models.py b/basedata/models.py index dccfd56..276595c 100644 --- a/basedata/models.py +++ b/basedata/models.py @@ -818,16 +818,20 @@ class ExtraParam(ToStringMixin, models.Model): ('NUM', _('NUMBER')), ('DATE', _('DATE')), ) + # 关联的物料 material = models.ForeignKey( Material, verbose_name=_("material"), on_delete=models.CASCADE) + # 数据名称 name = models.CharField(_("name"), max_length=const.DB_CHAR_NAME_40) + # 数据类型 data_type = models.CharField( _("data type"), default='CHAR', choices=DATA_TYPE, max_length=const.DB_CHAR_CODE_6) + # 数据源 data_source = models.CharField( _("data source"), blank=True, diff --git a/common/generic.py b/common/generic.py index f22e0cc..0d0f4bb 100644 --- a/common/generic.py +++ b/common/generic.py @@ -147,14 +147,20 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No :return: """ app_info = get_app_model_info_from_request(request) + # 工作流 workflow_modal = None workflow_instance = None has_workflow_modal = False has_workflow_instance = False + show_workflow_line = False + # 显示提交按钮 show_submit_button = False + # 可以重启 can_restart = False + # 可以编辑 can_edit = False + # print app_info if app_info: try: @@ -177,6 +183,7 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No show_workflow_line = True if unread.count() > 0: unread.update(is_read=1, read_time=datetime.datetime.now()) + # 工作流实例已经被拒绝（DENY） 并且当前用户是发起人 if workflow_instance.status == 3 and request.user == workflow_instance.starter: can_restart = True show_workflow_line = True @@ -186,6 +193,8 @@ def changeform_view(self, request, object_id=None, form_url='', extra_context=No if workflow_modal and not workflow_instance: show_submit_button = True + + # 更新额外的内容 extra_context = extra_context or {} ctx = dict( has_workflow_instance=has_workflow_instance, @@ -219,15 +228,22 @@ def history_view(self, request, object_id, extra_context=None): # print app_info if app_info: try: + # 工作流 modal = ContentType.objects.get(app_label='workflow', model='modal') workflow_modal = modal.get_object_for_this_type(app_name=app_info['app'], model_name=app_info['model']) has_workflow_modal = True + + # 工作流实例 instance = ContentType.objects.get(app_label='workflow', model='instance') workflow_instance = instance.get_object_for_this_type(modal=workflow_modal, object_id=app_info['id']) has_workflow_instance = True + + # 审批历史 history = ContentType.objects.get(app_label='workflow', model='history') history_list = history.model_class().objects.filter(inst=workflow_instance) has_history = True + + # 代办事项 todo = ContentType.objects.get(app_label='workflow', model='todolist') todo_list = todo.model_class().objects.filter(inst=workflow_instance, status=0).exclude(node=None) diff --git a/selfhelp/models.py b/selfhelp/models.py index cdda8ea..5084a91 100644 --- a/selfhelp/models.py +++ b/selfhelp/models.py @@ -17,25 +17,32 @@ class WorkOrder(generic.BO): """ - + 工单 """ index_weight = 1 code = models.CharField(_("workorder code"), blank=True, null=True, max_length=const.DB_CHAR_CODE_10) + # 参考工单 refer = models.ForeignKey("self", verbose_name=_("refer wo"), blank=True, null=True, on_delete=models.CASCADE) + # 标题 title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_120) + # 描述信息 description = models.TextField(_("description"), blank=True, null=True) + # 业务域 business_domain = models.CharField( _("business domain"), max_length=const.DB_CHAR_CODE_4, choices=const.get_value_list('S045'), default='OT') + # 分类 classification = models.CharField( _("classification"), max_length=const.DB_CHAR_CODE_4, choices=const.get_value_list('S044'), default='D') + # 服务名称，关联的物料 service = models.ForeignKey(Material, verbose_name=_("service name"), null=True, blank=True, limit_choices_to={"is_virtual": "1"}, on_delete=models.CASCADE) + # 项目 project = models.ForeignKey(Project, verbose_name=_("project"), null=True, blank=True, on_delete=models.CASCADE) status = models.CharField( _("status"), @@ -46,7 +53,9 @@ class WorkOrder(generic.BO): choices=const.get_value_list('S046')) answer = models.TextField(_("answer"), blank=True, null=True) user = models.ForeignKey(User, verbose_name=_("user"), blank=True, null=True, on_delete=models.CASCADE) + # 附件 attach = models.FileField(_('attach'), blank=True, null=True, help_text=u'工单附件，不导入明细。') + # 待导入明细 detail = models.FileField(_('to be imported detail'), blank=True, null=True, help_text=u'您可导入需求明细，模板请参考文档FD0007') def __unicode__(self): @@ -55,12 +64,15 @@ def __unicode__(self): def save(self, force_insert=False, force_update=False, using=None, update_fields=None): super(WorkOrder, self).save(force_insert, force_update, using, update_fields) + + # 获取物料的额外参数 if self.service: material = self.service if self.woextravalue_set.count() < 1 and material.extraparam_set and material.extraparam_set.count() > 0: for param in material.extraparam_set.all(): extra_param = WOExtraValue.objects.create(workorder=self, param_name=param) self.woextravalue_set.add(extra_param) + # 导入明细 item_count = WOItem.objects.filter(workorder=self).count() if self.detail and item_count == 0: path = os.path.join(settings.MEDIA_ROOT, self.detail.name) @@ -101,7 +113,7 @@ class Media: class WOExtraValue(models.Model): """ - + 工单额外数值字段 """ workorder = models.ForeignKey(WorkOrder, verbose_name=_("workorder"), on_delete=models.CASCADE) param_name = models.ForeignKey(ExtraParam, verbose_name=_("extra param"), on_delete=models.CASCADE) @@ -114,9 +126,10 @@ class Meta: class WOItem(models.Model): """ - + 工单明细 """ workorder = models.ForeignKey(WorkOrder, verbose_name=_("workorder"), on_delete=models.CASCADE) + # 关联的物料 material = models.ForeignKey( Material, verbose_name=_("material"), @@ -124,8 +137,11 @@ class WOItem(models.Model): blank=True, limit_choices_to={"is_virtual": "0"}, on_delete=models.CASCADE) + # 总金额 amount = models.DecimalField(_("amount"), max_digits=10, decimal_places=4, blank=True, null=True) + # 单位 measure = models.ForeignKey(Measure, verbose_name=_('measure'), blank=True, null=True, on_delete=models.CASCADE) + # 单价 price = models.DecimalField(_("price"), max_digits=10, decimal_places=4, blank=True, null=True) class Meta: @@ -135,7 +151,7 @@ class Meta: class Loan(generic.BO): """ - + 借款申请 """ LOAD_STATUS = ( ('N', _("NEW")), @@ -147,8 +163,10 @@ class Loan(generic.BO): code = models.CharField(_("loan code"), max_length=const.DB_CHAR_CODE_10, blank=True, null=True) title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_120) description = models.TextField(_("description"), blank=True, null=True) + # 项目 project = models.ForeignKey(Project, verbose_name=_("project"), on_delete=models.CASCADE) user = models.ForeignKey(User, verbose_name=_("user"), blank=True, null=True, on_delete=models.CASCADE) + # 状态 status = models.CharField( _("status"), blank=True, @@ -156,10 +174,15 @@ class Loan(generic.BO): default='N', max_length=const.DB_CHAR_CODE_2, choices=LOAD_STATUS) + # 核销时间（write-off ） logout_time = models.DateTimeField(_("logout time"), blank=True, null=True) + # 借款金额 loan_amount = models.DecimalField(_("loan amount"), max_digits=10, decimal_places=2, blank=True, null=True) + # 核销金额 logout_amount = models.DecimalField(_("logout amount"), max_digits=10, decimal_places=2, blank=True, null=True) + # 支付者 pay_user = models.CharField(_('pay user'), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) + # 支付时间 pay_time = models.DateTimeField(_('pay time'), blank=True, null=True) is_clear = models.BooleanField(_('is clear'), default=False) @@ -191,7 +214,7 @@ class Meta: class Reimbursement(generic.BO): """ - + 费用报销 """ REIM_STATUS = ( ('N', _("NEW")), @@ -203,7 +226,9 @@ class Reimbursement(generic.BO): code = models.CharField(_("fee code"), max_length=const.DB_CHAR_CODE_10, blank=True, null=True) title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_120) description = models.TextField(_("description"), blank=True, null=True) + # 项目 project = models.ForeignKey(Project, verbose_name=_("project"), on_delete=models.CASCADE) + # 工单 wo = models.ForeignKey(WorkOrder, verbose_name=_("work order"), null=True, blank=True, on_delete=models.CASCADE) user = models.ForeignKey(User, verbose_name=_("user"), blank=True, null=True, on_delete=models.CASCADE) org = models.ForeignKey(OrgUnit, verbose_name=_("cost center"), blank=True, null=True, on_delete=models.CASCADE) @@ -216,11 +241,17 @@ class Reimbursement(generic.BO): max_length=const.DB_CHAR_CODE_2, choices=REIM_STATUS) amount = models.DecimalField(_("amount of money"), max_digits=10, decimal_places=2, blank=True, null=True) + # 借款单据 loan = models.ForeignKey(Loan, verbose_name=_("loan record"), blank=True, null=True, on_delete=models.CASCADE) + # 借款金额 loan_amount = models.DecimalField(_("loan amount"), max_digits=10, decimal_places=2, blank=True, null=True) + # 核销金额 logout_amount = models.DecimalField(_("logout amount"), max_digits=10, decimal_places=2, blank=True, null=True) + # 支付金额 pay_amount = models.DecimalField(_("pay amount"), max_digits=10, decimal_places=2, blank=True, null=True) + # 支付时间 pay_time = models.DateTimeField(_("pay time"), blank=True, null=True) + # 支付者 pay_user = models.CharField(_('pay user'), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) def applier(self): @@ -243,6 +274,7 @@ def save(self, force_insert=False, force_update=False, using=None, super(Reimbursement, self).save(force_insert, force_update, using, update_fields) def action_pay(self, request): + """支付操作""" if self.loan: if self.logout_amount is None or self.logout_amount == '': self.logout_amount = self.amount @@ -274,19 +306,24 @@ class Meta: verbose_name = _("reimbursement") verbose_name_plural = _("reimbursements") permissions = ( + # 支付权限 ('financial_pay', _("financial pay")), ) class ReimbursementItem(models.Model): """ - + 费用明细 """ import datetime reimbursement = models.ForeignKey(Reimbursement, verbose_name=_("reimbursement"), on_delete=models.CASCADE) + # expense_account = models.ForeignKey(ExpenseAccount, verbose_name=_("expenses account"), on_delete=models.CASCADE) + # 发生时间 begin = models.DateField(_("occur date"), default=datetime.date.today) + # 金额 amount = models.DecimalField(_("amount of money"), max_digits=10, decimal_places=2) + # 备注 memo = models.CharField(_("memo"), max_length=const.DB_CHAR_NAME_40, blank=True, null=True) def save(self, force_insert=False, force_update=False, using=None, @@ -303,24 +340,32 @@ class Meta: class Activity(generic.BO): """ - + 活动 """ CLASSIFICATION = ( - ('T', _("Train")), - ('M', _("Meeting")), - ('G', _("Community")), + ('T', _("Train")), # 培训 + ('M', _("Meeting")), # 会议 + ('G', _("Community")), # 集体活动 ) index_index_weight = 4 + # 开始时间 begin_time = models.DateTimeField(_('begin time')) + # 结束时间 end_time = models.DateTimeField(_('end time')) + # 报名截止日期 enroll_deadline = models.DateTimeField(_('enroll deadline'), blank=True, null=True) code = models.CharField(_("code"), max_length=const.DB_CHAR_NAME_20, blank=True, null=True) title = models.CharField(_("title"), max_length=const.DB_CHAR_NAME_120) + # 父级：不知道有什么用 parent = models.ForeignKey('self', verbose_name=_("parent"), blank=True, null=True, on_delete=models.CASCADE) description = models.TextField(_("description"), blank=True, null=True) + # 主持人 host = models.CharField(_("host"), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) + # 主讲人 speaker = models.CharField(_("speaker"), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) + # 接受报名 accept_enroll = models.BooleanField(_("accept enroll"), default=1) + # 房间，关联了物料 room = models.ForeignKey( Material, verbose_name=_("room"), @@ -328,7 +373,9 @@ class Activity(generic.BO): null=True, limit_choices_to={'tp': 20}, on_delete=models.CASCADE) + # 地点 location = models.CharField(_("location"), max_length=const.DB_CHAR_NAME_80, blank=True, null=True) + # 活动类别 classification = models.CharField( _("classification"), max_length=const.DB_CHAR_CODE_2, @@ -336,11 +383,17 @@ class Activity(generic.BO): null=True, choices=CLASSIFICATION, default='M') + # 邮件组 mail_list = models.TextField(_("mail list"), blank=True, null=True) + # 邮件通知？ mail_notice = models.BooleanField(_("mail notice"), default=1) + # 短信通知？ short_message_notice = models.BooleanField(_("short message notice"), default=1) + # 微信通知？ weixin_notice = models.BooleanField(_("weixin notice"), default=1) + # 发布状态 status = models.BooleanField(_("published"), default=0) + # 发布时间 publish_time = models.DateTimeField(_("publish time"), blank=True, null=True) attach = models.FileField(_("attach"), blank=True, null=True, upload_to='activity') @@ -351,7 +404,7 @@ class Meta: class Feedback(models.Model): """ - + 反馈 """ RANK = ( ('A', 'A'), @@ -359,10 +412,13 @@ class Feedback(models.Model): ('C', 'C'), ('D', 'D'), ) + # 关联的活动 activity = models.ForeignKey(Activity, on_delete=models.CASCADE) user = models.ForeignKey(User, on_delete=models.CASCADE) + # 反馈时间 feed_time = models.DateTimeField(_("feedback time"), auto_now_add=True) rank = models.CharField(_('rank'), max_length=const.DB_CHAR_CODE_2, blank=True, null=True, choices=RANK, default='B') + # 反馈意见 comment = models.CharField(_("suggest"), blank=True, null=True, max_length=const.DB_CHAR_NAME_80) diff --git a/selfhelp/views.py b/selfhelp/views.py index 1ec2365..efa0f6c 100644 --- a/selfhelp/views.py +++ b/selfhelp/views.py @@ -11,6 +11,7 @@ def pay_action(request, model, object_id): + """付款操作""" title = _("Are you sure?") ct = ContentType.objects.get(app_label='selfhelp', model=model) obj = ct.get_object_for_this_type(id=int(object_id)) diff --git a/templates/admin/change_form.html b/templates/admin/change_form.html index 6f5e458..90c5538 100644 --- a/templates/admin/change_form.html +++ b/templates/admin/change_form.html @@ -41,23 +41,33 @@
{% if is_popup %}{% endif %} {% if to_field %}{% endif %} + +{% comment %} 顶部按钮 {% endcomment %} {% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %} -{% if show_workflow_line%} + +{% comment %} 显示工作流线 {% endcomment %} +{% if show_workflow_line %}

{% trans "workflow approve" %}

+ {% comment %} 可以重启 {% endcomment %} {% if can_restart %} {% trans "restart workflow" %}

{% trans "your apply has been denied,you can restart a new apply" %}

{% else %} - - - - {% trans "submit" %} + {% comment %} 同意 value = 1 {% endcomment %} + + {% comment %} 拒绝 value = 3 {% endcomment %} + + {% comment %} 终止 value = 4 {% endcomment %} + + {% comment %} 提交 {% endcomment %} + {% trans "submit" %} {% endif %}
{% endif %} + {% if errors %}

{% if errors|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} @@ -99,11 +109,15 @@

{% trans "workflow approve" %}

{% if adminform and add %} $('form#{{ opts.model_name }}_form :input:visible:enabled:first').focus() {% endif %} + + {% comment %} 工作流 {% endcomment %} {% if workflow_modal %} + {% comment %} 工作流实例 {% endcomment %} {% if workflow_instance %} workflow_modal = "{{ workflow_modal.code }}"; workflow_instance = "{{ workflow_instance.code }}"; $('tr.add-row').hide(); + {% comment %} 可以编辑 {% endcomment %} {% if can_edit %} $('a.deletelink').hide(); $("#workflow_submit").hide(); @@ -119,11 +133,16 @@

{% trans "workflow approve" %}

{% else %} $("#workflow_submit").hide(); {% endif %} + + {% comment %} 额外的按钮 {% endcomment %} {% if extra_buttons %} {% for button in extra_buttons %} + {% comment %} 工作流提交按钮 {% endcomment %} $("{{button.title}}").insertAfter("#workflow_submit"); {% endfor %} {% endif %} + + {% comment %} 是否只读 {% endcomment %} {% if readonly %} $('input,select,textarea').attr('disabled',true); $('div.submit-row').hide(); diff --git a/templates/admin/selfhelp/workorder/change_form.html b/templates/admin/selfhelp/workorder/change_form.html index 80ca737..6bff40c 100644 --- a/templates/admin/selfhelp/workorder/change_form.html +++ b/templates/admin/selfhelp/workorder/change_form.html @@ -13,6 +13,7 @@ {% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %} {% if not is_popup %} +{% comment %} 导航栏 {% endcomment %} {% block breadcrumbs %}
{% trans 'Home' %} diff --git a/templates/default/workflow/workflow_start_confirmation.html b/templates/default/workflow/workflow_start_confirmation.html index c498ceb..4b6f7fb 100644 --- a/templates/default/workflow/workflow_start_confirmation.html +++ b/templates/default/workflow/workflow_start_confirmation.html @@ -3,6 +3,7 @@ {% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation{% endblock %} +{% comment %} 导航栏 {% endcomment %} {% block breadcrumbs %}
{% trans 'Home' %} @@ -13,6 +14,7 @@
{% endblock %} +{% comment %} 主要内容 {% endcomment %} {% block content %} {% if has_workflow %}

{% blocktrans with escaped_object=object %}Are you sure you want to submit the {{ object_name }} "{{ escaped_object }}"? {% endblocktrans %}

diff --git a/workflow/models.py b/workflow/models.py index 16efe07..cec3f01 100644 --- a/workflow/models.py +++ b/workflow/models.py @@ -53,6 +53,12 @@ class Node(ToStringMixin, models.Model): position() sql() etc:upper('zhangsan','lisi') + + 工作流节点有三种处理方式： + - 第一种是使用自定义的SQL语句，为最高优先级 + - 第二种是使用代码写好的处理类（函数），给 next_user_handler 字段赋值即可 + - 第三种是预先选好的关联用户，比如根据用户、岗位、角色或提交人来处理节点 + """ # 处理类型 HANDLER_TYPE = ( @@ -231,13 +237,16 @@ class Meta: class TodoList(ToStringMixin, models.Model): - """ - 待办列表 + """待办列表 + + 每当工单提交之后，会自动创建一个代办 """ index_weight = 4 code = models.CharField(_("code"), max_length=const.DB_CHAR_CODE_10, blank=True, null=True) + # 工作流实例 inst = models.ForeignKey(Instance, verbose_name=_("workflow instance"), on_delete=models.CASCADE) + # 当前节点 node = models.ForeignKey(Node, verbose_name=_("current node"), blank=True, null=True, on_delete=models.CASCADE) app_name = models.CharField(_("app name"), max_length=const.DB_CHAR_NAME_60, blank=True, null=True) @@ -245,6 +254,7 @@ class TodoList(ToStringMixin, models.Model): # 处理人 user = models.ForeignKey(User, verbose_name=_("handler"), on_delete=models.CASCADE) + # 送达时间 arrived_time = models.DateTimeField(_("arrived time"), auto_now_add=True) # 已读 is_read = models.BooleanField(_("is read"), default=False) @@ -267,12 +277,15 @@ def node_dsc(self): return u'启动' def code_link(self): + """跳转到对应的工单""" return format_html("{}", self.app_name, self.model_name, self.inst.object_id, self.code) code_link.allow_tags = True code_link.short_description = _("code") def href(self): + """跳转到对应的工单""" + # 获取工单的名称并显示 ct = ContentType.objects.get(app_label=self.app_name, model=self.model_name) obj = ct.get_object_for_this_type(id=self.inst.object_id) title = u"%s" % obj @@ -280,6 +293,7 @@ def href(self): self.app_name, self.model_name, self.inst.object_id, title) def modal_dsc(self): + """显示工作流的名称""" return u'%s' % (self.inst.modal.name) modal_dsc.short_description = u'业务流程' @@ -291,6 +305,7 @@ def start_time(self): node_dsc.short_description = _('current node') def submitter(self): + """提交人""" if self.inst.starter.last_name or self.inst.starter.first_name: return u"%s%s" % (self.inst.starter.last_name, self.inst.starter.first_name) return u"%s" % (self.inst.starter.username) @@ -303,7 +318,7 @@ class Meta: def get_modal(app_label, model_name): - """ + """获取工作流 :param app_label: :param model_name: @@ -316,7 +331,7 @@ def get_modal(app_label, model_name): def get_instance(obj): - """ + """获取工作流实例 :param obj: :return: diff --git a/workflow/views.py b/workflow/views.py index 87fd478..775fe06 100644 --- a/workflow/views.py +++ b/workflow/views.py @@ -18,14 +18,14 @@ def compile_node_handler(request, obj, next_node): - """ + """ 获取下一节点的处理者 :param request: :param obj: :param handler: :return: """ - # 自定义 SQL 语句 + # 获取自定义 SQL 语句 handler = next_node.handler # 下一个用户处理类 next_user_handler = next_node.next_user_handler @@ -91,29 +91,40 @@ def start(request, app, model, object_id): title = _("Are you sure?") opts = obj._meta objects_name = force_text(opts.verbose_name) + # 是否有工作流 has_workflow = False + + # 获取工作流 queryset = Modal.objects.filter(content_type=content_type, end__gt=datetime.date.today()).order_by('-end') cnt = queryset.count() workflow_modal = None next_node = None next_users = [] has_next_user = False + if cnt > 0: has_workflow = True workflow_modal = queryset[0] + # 起始节点 query_start_node = workflow_modal.node_set.filter(start=1) + # 第一个节点 query_first_node = workflow_modal.node_set.order_by('id') + if query_start_node.count() > 0: + # 起始节点大于零 next_node = query_start_node[0] elif query_first_node.count() > 0: next_node = query_first_node[0] + if next_node: + # 获取下一节点的处理用户 next_users = compile_node_handler(request, obj, next_node) if len(next_users) > 0: has_next_user = True else: title = _("No workflow model was found") + # 获取工作流实例，判断该对象是否处于工作流中 try: tmp = Instance.objects.get(modal=workflow_modal, object_id=object_id) messages.warning(request, _("the object is already in workflow")) @@ -121,16 +132,25 @@ def start(request, app, model, object_id): except Exception: pass + # POST提交 if request.POST.get("post"): + # 获取提交的列表 val = request.POST.getlist(SELECTED_CHECKBOX_NAME) + # 创建实例 workflow_inst = Instance.objects.create(modal=workflow_modal, object_id=object_id, starter=request.user) workflow_inst.current_nodes.add(next_node) workflow_inst.save() + # 工作流审批记录 workflow_history = History.objects.create(inst=workflow_inst, user=request.user) + + # 创建待办事项，待办事项会在处理人审批的时候使用 for user in User.objects.filter(id__in=val): + todo = TodoList.objects.create(inst=workflow_inst, node=next_node, user=user, app_name=app, model_name=model) TodoList.objects.create(inst=workflow_inst, user=request.user, app_name=app, model_name=model, is_read=True, read_time=datetime.datetime.now(), status=True) + + # 设置工作流中那个模型的状态 if next_node.status_field and next_node.status_value: try: setattr(obj, next_node.status_field, next_node.status_value) @@ -211,14 +231,17 @@ def approve(request, app, model, object_id, operation): pass else: tmp_node = current[0] + # 判断是否是停止终止节点 if tmp_node.stop or tmp_node == all_nodes[0]: next_nodes = ['stop'] is_stop_node = True else: + # 条件处理 if tmp_node.next_node_handler and len(tmp_node.next_node_handler) > 0: hd = tmp_node.next_node_handler klass = NextNodeManager().handlers.get(hd) if klass and isinstance(klass, NextNodeHandler): + # 获取下一节点 next_nodes = klass.handle(request, obj, tmp_node) next_node_description = klass.description if next_nodes and len(next_nodes) > 0: @@ -229,6 +252,7 @@ def approve(request, app, model, object_id, operation): position = all_nodes.index(tmp_node) next_nodes = [all_nodes[position - 1]] + # 提交表单 if request.POST.get("post"): from django.db import transaction val = request.POST.getlist(SELECTED_CHECKBOX_NAME) @@ -249,6 +273,7 @@ def approve(request, app, model, object_id, operation): else: workflow_instance.current_nodes.clear() workflow_instance.current_nodes.add(next_nodes[0]) + # 设置待办事项 for user in User.objects.filter(id__in=val): todo = TodoList.objects.create( inst=workflow_instance, node=next_nodes[0], user=user, app_name=app, model_name=model) @@ -258,6 +283,7 @@ def approve(request, app, model, object_id, operation): obj.save() except Exception: pass + # 创建历史纪录 History.objects.create( inst=workflow_instance, user=request.user, From 1949a4c0759bd3211e456dfcdb1c155e4ffa65c1 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 8 Dec 2021 13:41:05 +0800 Subject: [PATCH 65/65] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 + Install/requirements.txt | 7 +- README.md | 10 +- .../migrations/0003_auto_20211208_1307.py | 153 ++++++++++++++++++ hr/migrations/0003_auto_20211208_1307.py | 53 ++++++ organ/migrations/0003_auto_20211208_1307.py | 23 +++ .../migrations/0003_auto_20211208_1307.py | 23 +++ sale/migrations/0003_auto_20211208_1307.py | 28 ++++ .../migrations/0003_auto_20211208_1307.py | 28 ++++ .../0003_alter_modal_content_type.py | 20 +++ 10 files changed, 342 insertions(+), 8 deletions(-) create mode 100644 basedata/migrations/0003_auto_20211208_1307.py create mode 100644 hr/migrations/0003_auto_20211208_1307.py create mode 100644 organ/migrations/0003_auto_20211208_1307.py create mode 100644 purchase/migrations/0003_auto_20211208_1307.py create mode 100644 sale/migrations/0003_auto_20211208_1307.py create mode 100644 selfhelp/migrations/0003_auto_20211208_1307.py create mode 100644 workflow/migrations/0003_alter_modal_content_type.py diff --git a/.gitignore b/.gitignore index 3168b16..b19fe62 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,8 @@ .vscode/ .venv/ upload/ +settings.py + +.DS_Store +__pycache__ +.idea \ No newline at end of file diff --git a/Install/requirements.txt b/Install/requirements.txt index e65a21a..55eb2b1 100644 --- a/Install/requirements.txt +++ b/Install/requirements.txt @@ -1,4 +1,3 @@ -Django=1.10.6 -PyMySQL=0.7.9 -xlwt=1.0.0 -xlrd=1.2.0 \ No newline at end of file +Django +xlwt +xlrd \ No newline at end of file diff --git a/README.md b/README.md index 7e2a2e7..ccbf1dd 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # Django-ERP Django-ERP是一款基于Django开发的ERP管理软件，包含常用的销售管理、采购管理、库存管理、组织管理等，支持按项目归集费用，支持工作流审批，支持采购单、报价单的批量导入。 -Forked from zhuinfo Django-ERP 感谢他的付出。 +Forked from zhuinfo Django-ERP 感谢他的付出, 和其他网友的辛勤付出。 # 安装指南 -> 我的开发、测试环境是Python2.7的，所以这个文档大多数情况我默认会使用这个条件，有个别测试不到位的可能还需要慢慢完善。 +> 我的开发、测试环境是Python3的，所以这个文档大多数情况我默认会使用这个条件，有个别测试不到位的可能还需要慢慢完善。 -请先确保您已安装了Python 2.7,并已配置好了数据库，本文档会略过这部分内容（理论上Django是可以支持MYSql、PGSQL、SQLite、Oracle等主流数据库的，但是建议不要嘬，用自己熟悉的数据库，因为数据是无价的。） +请先确保您已安装了Python3,并已配置好了数据库，本文档会略过这部分内容（理论上Django是可以支持MYSql、PGSQL、SQLite、Oracle等主流数据库的，但是建议不要嘬，用自己熟悉的数据库，因为数据是无价的。） 验证方法请通过python --version查看版本，以及数据库 确认用户名和密码是否登录正常 后续我争取不上requirements.txt，远期目标我个人是希望能做个dock镜像，并让它能慢慢顺着Python3和新版本的django平滑过渡上去。 @@ -33,8 +33,10 @@ DATABASES = { ## 克隆代码 > git clone https://github.com/bg4hkq/Django-ERP.git - +## 创建数据库 + create database `mis` DEFAULT CHARACTER SET utf8mb4; ## 导入数据库 + > mysql -uroot -proot mis < Install/mis.sql ## 运行测试服务器 diff --git a/basedata/migrations/0003_auto_20211208_1307.py b/basedata/migrations/0003_auto_20211208_1307.py new file mode 100644 index 0000000..5450058 --- /dev/null +++ b/basedata/migrations/0003_auto_20211208_1307.py @@ -0,0 +1,153 @@ +# Generated by Django 3.2.8 on 2021-12-08 13:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('basedata', '0002_auto_20200615_1024'), + ] + + operations = [ + migrations.AlterField( + model_name='address', + name='address_type', + field=models.CharField(default='01', max_length=2, verbose_name='address type'), + ), + migrations.AlterField( + model_name='document', + name='business_domain', + field=models.CharField(default='OT', max_length=4, verbose_name='business domain'), + ), + migrations.AlterField( + model_name='education', + name='degree', + field=models.CharField(blank=True, default='4', max_length=2, null=True, verbose_name='major degree'), + ), + migrations.AlterField( + model_name='education', + name='edu_type', + field=models.CharField(default='1', max_length=2, verbose_name='edu type'), + ), + migrations.AlterField( + model_name='employee', + name='category', + field=models.CharField(blank=True, default='21', max_length=2, null=True, verbose_name='employ category'), + ), + migrations.AlterField( + model_name='employee', + name='country', + field=models.CharField(blank=True, default='CN', max_length=2, null=True, verbose_name='nationality'), + ), + migrations.AlterField( + model_name='employee', + name='degree', + field=models.CharField(blank=True, default='4', max_length=2, null=True, verbose_name='major degree'), + ), + migrations.AlterField( + model_name='employee', + name='gender', + field=models.CharField(default='1', max_length=2, verbose_name='gender'), + ), + migrations.AlterField( + model_name='employee', + name='health', + field=models.CharField(blank=True, default='1', max_length=2, null=True, verbose_name='health'), + ), + migrations.AlterField( + model_name='employee', + name='literacy', + field=models.CharField(blank=True, default='10', max_length=2, null=True, verbose_name='literacy'), + ), + migrations.AlterField( + model_name='employee', + name='major', + field=models.CharField(blank=True, default='99', max_length=2, null=True, verbose_name='major type'), + ), + migrations.AlterField( + model_name='employee', + name='marital', + field=models.CharField(blank=True, default='10', max_length=2, null=True, verbose_name='marital status'), + ), + migrations.AlterField( + model_name='employee', + name='nation', + field=models.CharField(blank=True, default='01', max_length=2, null=True, verbose_name='nation'), + ), + migrations.AlterField( + model_name='employee', + name='party', + field=models.CharField(blank=True, default='13', max_length=2, null=True, verbose_name='political party'), + ), + migrations.AlterField( + model_name='employee', + name='rank', + field=models.CharField(default='00', max_length=2, verbose_name='employee rank'), + ), + migrations.AlterField( + model_name='employee', + name='religion', + field=models.CharField(blank=True, default='00', max_length=2, null=True, verbose_name='religion'), + ), + migrations.AlterField( + model_name='employee', + name='spjob', + field=models.CharField(blank=True, default='00', max_length=2, null=True, verbose_name='special job'), + ), + migrations.AlterField( + model_name='employee', + name='status', + field=models.CharField(blank=True, default='10', max_length=2, null=True, verbose_name='employ status'), + ), + migrations.AlterField( + model_name='employee', + name='tag1', + field=models.CharField(blank=True, default='99', max_length=2, null=True, verbose_name='tag1 fzjr'), + ), + migrations.AlterField( + model_name='employee', + name='tag2', + field=models.CharField(blank=True, default='9', max_length=2, null=True, verbose_name='tag2 dwld'), + ), + migrations.AlterField( + model_name='employee', + name='tag3', + field=models.CharField(blank=True, default='00', max_length=10, null=True, verbose_name='tag3 dsjs'), + ), + migrations.AlterField( + model_name='employee', + name='tag4', + field=models.CharField(blank=True, default='0', max_length=2, null=True, verbose_name='tag4 byzk'), + ), + migrations.AlterField( + model_name='employee', + name='ygxs', + field=models.CharField(blank=True, default='2', max_length=2, null=True, verbose_name='employ ygxs'), + ), + migrations.AlterField( + model_name='family', + name='relation', + field=models.CharField(blank=True, max_length=2, null=True, verbose_name='family title'), + ), + migrations.AlterField( + model_name='family', + name='status', + field=models.CharField(blank=True, default='17', max_length=2, null=True, verbose_name='social status'), + ), + migrations.AlterField( + model_name='material', + name='tp', + field=models.CharField(blank=True, default='10', max_length=2, null=True, verbose_name='mt type'), + ), + migrations.AlterField( + model_name='project', + name='prj_type', + field=models.CharField(blank=True, default='00', max_length=2, null=True, verbose_name='project type'), + ), + migrations.AlterField( + model_name='project', + name='status', + field=models.CharField(blank=True, default='00', max_length=2, null=True, verbose_name='status'), + ), + ] diff --git a/hr/migrations/0003_auto_20211208_1307.py b/hr/migrations/0003_auto_20211208_1307.py new file mode 100644 index 0000000..bc7d30a --- /dev/null +++ b/hr/migrations/0003_auto_20211208_1307.py @@ -0,0 +1,53 @@ +# Generated by Django 3.2.8 on 2021-12-08 13:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('hr', '0002_auto_20200615_1024'), + ] + + operations = [ + migrations.AlterField( + model_name='employeesalaryitem', + name='calculate_way', + field=models.CharField(default='10', max_length=2, verbose_name='calculate way'), + ), + migrations.AlterField( + model_name='entry', + name='category', + field=models.CharField(blank=True, default='21', max_length=2, null=True, verbose_name='employ category'), + ), + migrations.AlterField( + model_name='entry', + name='gender', + field=models.CharField(default='1', max_length=2, verbose_name='gender'), + ), + migrations.AlterField( + model_name='entry', + name='probation_months', + field=models.CharField(default='3', max_length=2, verbose_name='probation months'), + ), + migrations.AlterField( + model_name='entry', + name='rank', + field=models.CharField(default='00', max_length=2, verbose_name='employee rank'), + ), + migrations.AlterField( + model_name='entry', + name='ygxs', + field=models.CharField(blank=True, default='2', max_length=2, null=True, verbose_name='employ ygxs'), + ), + migrations.AlterField( + model_name='salaryitem', + name='classification', + field=models.CharField(default='10', max_length=2, verbose_name='classification'), + ), + migrations.AlterField( + model_name='salaryitem', + name='plus_or_minus', + field=models.CharField(default='+', max_length=2, verbose_name='plus or minus'), + ), + ] diff --git a/organ/migrations/0003_auto_20211208_1307.py b/organ/migrations/0003_auto_20211208_1307.py new file mode 100644 index 0000000..b4ec26e --- /dev/null +++ b/organ/migrations/0003_auto_20211208_1307.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.8 on 2021-12-08 13:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organ', '0002_auto_20200615_1024'), + ] + + operations = [ + migrations.AlterField( + model_name='position', + name='grade', + field=models.CharField(default='01', max_length=2, verbose_name='position grade'), + ), + migrations.AlterField( + model_name='position', + name='series', + field=models.CharField(default='A', max_length=1, verbose_name='position series'), + ), + ] diff --git a/purchase/migrations/0003_auto_20211208_1307.py b/purchase/migrations/0003_auto_20211208_1307.py new file mode 100644 index 0000000..78f842b --- /dev/null +++ b/purchase/migrations/0003_auto_20211208_1307.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.8 on 2021-12-08 13:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('purchase', '0002_auto_20200615_1024'), + ] + + operations = [ + migrations.AlterField( + model_name='poitem', + name='tax', + field=models.CharField(default='0.00', max_length=6, verbose_name='tax rate'), + ), + migrations.AlterField( + model_name='purchaseorder', + name='status', + field=models.CharField(choices=[('00', 'NEW'), ('01', 'IN PROGRESS'), ('04', 'DROP'), ('09', 'APPROVED'), ('99', 'ALREADY STOCK IN')], default='0', max_length=2, verbose_name='status'), + ), + ] diff --git a/sale/migrations/0003_auto_20211208_1307.py b/sale/migrations/0003_auto_20211208_1307.py new file mode 100644 index 0000000..faf6da6 --- /dev/null +++ b/sale/migrations/0003_auto_20211208_1307.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.8 on 2021-12-08 13:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('sale', '0002_auto_20200615_1024'), + ] + + operations = [ + migrations.AlterField( + model_name='offeritem', + name='tax', + field=models.CharField(default='0.00', max_length=6, verbose_name='tax rate'), + ), + migrations.AlterField( + model_name='saleitem', + name='tax', + field=models.CharField(default='0.00', max_length=6, verbose_name='tax rate'), + ), + migrations.AlterField( + model_name='saleorder', + name='invoice_type', + field=models.CharField(default='10', max_length=6, verbose_name='invoice type'), + ), + ] diff --git a/selfhelp/migrations/0003_auto_20211208_1307.py b/selfhelp/migrations/0003_auto_20211208_1307.py new file mode 100644 index 0000000..f0c2f91 --- /dev/null +++ b/selfhelp/migrations/0003_auto_20211208_1307.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.8 on 2021-12-08 13:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('selfhelp', '0002_auto_20200615_1024'), + ] + + operations = [ + migrations.AlterField( + model_name='workorder', + name='business_domain', + field=models.CharField(default='OT', max_length=4, verbose_name='business domain'), + ), + migrations.AlterField( + model_name='workorder', + name='classification', + field=models.CharField(default='D', max_length=4, verbose_name='classification'), + ), + migrations.AlterField( + model_name='workorder', + name='status', + field=models.CharField(blank=True, default='NEW', max_length=6, null=True, verbose_name='status'), + ), + ] diff --git a/workflow/migrations/0003_alter_modal_content_type.py b/workflow/migrations/0003_alter_modal_content_type.py new file mode 100644 index 0000000..d170dee --- /dev/null +++ b/workflow/migrations/0003_alter_modal_content_type.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.8 on 2021-12-08 13:07 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('workflow', '0002_auto_20200615_1024'), + ] + + operations = [ + migrations.AlterField( + model_name='modal', + name='content_type', + field=models.ForeignKey(limit_choices_to={'app_label__in': ['basedata', 'organ', 'purchase']}, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype', verbose_name='content type'), + ), + ]