add: sync 116 20240702 14:48 UTC+8

.gitignore

@@ -5,6 +5,7 @@
 /static
 /log
 /logs
+*/*.pem
 
 ### 不同步settings文件
 /datacenter/settings.py

banquet/forms.py

@@ -7,4 +7,20 @@ from django.utils.translation import gettext_lazy as _
 class CategoryForm(ModelForm):
     class Meta:
         model = Category
-        fields = ['name','remark']
+        fields = ['name','remark']
\ No newline at end of file
+
+# 2024-06-24
+class PolicyForm(ModelForm):
+    class Meta:
+        model= Policy
+        fields = '__all__'
+        widgets = {
+            'company': forms.HiddenInput(),
+        }
+
+    def __init__(self, *args, **kwargs):        
+        super(PolicyForm, self).__init__(*args, **kwargs)
+        #self.fields['company'].queryset = Company.objects.filter(level_id=1) 
+        self.fields['dt_start'].widget.attrs['class'] = "datepicker"
+        self.fields['dt_end'].widget.attrs['class'] = "datepicker"
+

banquet/models.py

@@ -17,7 +17,77 @@ class Category(models.Model):
         verbose_name_plural = _('宴会分类')
 
 
+
+
+# 2024-06-26
+class Policy(models.Model):
+    company = models.ForeignKey('company.Company', verbose_name=_('公司'), on_delete=models.CASCADE, related_name='policy_company')
+    name = models.CharField(_('政策名称'), max_length=100)          
+    bonus_type=models.SmallIntegerField(_('奖励类型'),choices=(
+            (1,_('现金')),
+            #(2,_('积分')),
+        ),default=1)
+    package_basis=models.SmallIntegerField(_('奖励依据'),choices=(
+            (3,_('消费者扫码箱数')),
+            (1,_('消费者扫码瓶数')),
+        ),default=3)   
+    location_constrain=models.SmallIntegerField(_('扫码销售区域限制'),choices=(
+            (1,_('限制')),
+            (0,_('不限制')),
+        ),default=1)
+    dt_start=models.DateField(_('开始日期'),blank=True,null=True)
+    dt_end=models.DateField(_('结束日期'),blank=True,null=True)
+    products=models.JSONField(_('产品限定'),default=list) 
+    
+    grades=models.JSONField(_('奖励等级'),default=list)
+    # [{
+    #    'qty':'equivlence',
+    #    'products':{'id':'0','name':'','value':0}}
+    # }]      
+    depend_on_product=models.SmallIntegerField(_('奖励区分产品'),choices=(
+            (0,_('不区分')),
+            (1,_('区分'))
+        ),default=0)
+    sql=models.CharField(_('条件语句'),max_length=1000,blank=True,null=True)
+    dt = models.DateField(_('生成日期'),auto_now_add=True,  blank=True, null=True, db_index=True)
+    tm = models.DateTimeField(_('生成时间'), auto_now_add=True)
+    remark = models.CharField(_('备注说明'), max_length=100, blank=True, null=True)
+
+    class Meta:
+        verbose_name = _('奖励政策')
+        verbose_name_plural = _('奖励政策')
+        unique_together=('company','name')
+
+    # 2024-06-27
+    def save(self, *args, **kwargs):
+        # 根据扫码(x:箱，p:瓶)数，产品(product_id),生成计算奖励的sql语句  
+        if self.grades:
+            s=''
+            if self.depend_on_product:
+                # 同一等级根据产品确定具体奖励
+                for g in self.grades:                
+                    ss=" case"
+                    for v in g["vals"]:
+                        ss=ss+" when product_id="+v["product_id"]+" then "+str(v["value"])
+                    # 不是指定产品的，返回0
+                    ss=ss+" else 0 end"
+                    s=s+ " when "+g['exp'].lower().replace('＜','<').replace('≤','<=').replace('＞','>').replace('≥','>=')+" then "+ss
+                     
+            else:
+                # 同一等级奖励不分产品
+                for g in grades:                
+                    s=s+" when "+g['exp'].lower().replace('＜','<').replace('≤','<').replace('＞','>').replace('≥','>=')+\
+                        " then "+str(g['vals'][0]['value'])
+            # 不在指定扫码数量等级的，返回0
+            self.sql="case "+s+" else 0 end"  
+        super(Policy, self).save(*args, **kwargs)
+
+
+
 class Apply(models.Model):
+    # 2024-06-27 原模型已有一个字符串类型的policy字段，外键名改作strategy
+    strategy=models.ForeignKey(Policy,verbose_name=_('奖励政策'),related_name='apply_policy',on_delete=models.CASCADE, blank=True,null=True)
+
     ancestor = models.ForeignKey('company.Company', verbose_name=_(
         '体系名称'), on_delete=models.CASCADE, related_name='apply_ancestor')
     company = models.ForeignKey('company.Company', verbose_name=_(
@@ -56,6 +126,11 @@ class Apply(models.Model):
     channelpromotions = models.ForeignKey('sales.ChannelPromotions', verbose_name=_('所属渠道返利'),
                                           on_delete=models.CASCADE, related_name='apply_activity',
                                           blank=True, null=True)
+    # 2024-06-28
+    is_closed=models.BooleanField(_('是否已关闭'),default=False,blank=True,null=True,db_index=True)
+    tm_closed=models.DateTimeField(_('关闭时间'), blank=True, null=True)
+    closed_by=models.ForeignKey('company.User',verbose_name=_('关闭人'),related_name='apply_closed_by',on_delete=models.CASCADE,blank=True,null=True)
+    
 
     class Meta:
         verbose_name = _('宴会申请')
@@ -86,3 +161,68 @@ class Apply_Pictures(models.Model):
     class Meta:
         verbose_name = _('宴会申请图片')
         verbose_name_plural = _('宴会申请图片')
+
+
+
+
+# 2024-06-27 宴会（消费者）扫码记录/申请人扫码核销
+class Writeoff(models.Model):
+    policy=models.ForeignKey(Policy,verbose_name=_('奖励政策'),related_name='writeoff_policy',on_delete=models.CASCADE,blank=True,null=True)
+    apply = models.ForeignKey(Apply,verbose_name=_('宴会申请'),related_name='writeoff_apply', on_delete=models.CASCADE,blank=True,null=True)
+    ancestor = models.ForeignKey('company.Company', verbose_name=_('所属企业'), related_name='writeoff_ancestor',on_delete=models.CASCADE)
+    agent=models.ForeignKey('company.Company', verbose_name=_('经销商'),related_name='writeoff_agent',on_delete=models.CASCADE)
+    user=models.ForeignKey('company.User',verbose_name=_('扫码人'),related_name='writeoff_user',on_delete=models.CASCADE)
+    product=models.ForeignKey('product.Product',verbose_name=_('产品名称'),related_name='writeoff_product',on_delete=models.CASCADE)
+    lng_lat = ArrayField(models.DecimalField(_('经纬度'), max_digits=12, decimal_places=8), blank=True, null=True)
+    province=models.CharField(_('省份'),max_length=100,blank=True,null=True)
+    city=models.CharField(_('城市'),max_length=100,blank=True,null=True)    
+    label_id = models.BigIntegerField(_('标签ID'), db_index=True)
+    label_pk_id = models.BigIntegerField(_('标签PKID'), db_index=True)
+    label_code = models.CharField(_('标签号码'), max_length=20, db_index=True)
+    label_pkg = models.SmallIntegerField(_('标签类型'), db_index=True) 
+    dt = models.DateField(_('扫码日期'),auto_now_add=True, db_index=True)
+    tm = models.DateTimeField(_('扫码时间'), auto_now_add=True)
+    remark = models.CharField(_('备注说明'), max_length=100, blank=True, null=True)    
+
+    class Meta:
+        verbose_name = _('扫码核销记录')
+        verbose_name_plural = _('扫码核销记录')
+
+
+# 2024-06-27 结算后，宴会申请剩余的实物明细
+class Surplus(models.Model):
+    ancestor = models.ForeignKey('company.Company',verbose_name=_('所属企业'), related_name='surplus_ancestor',on_delete=models.CASCADE)
+    agent=models.ForeignKey('company.Company', verbose_name=_('经销商'),related_name='surplus_agent',on_delete=models.CASCADE)
+    policy=models.ForeignKey(Policy,verbose_name=_('奖励政策'),related_name='surplus_policy',on_delete=models.CASCADE,blank=True,null=True)
+    apply = models.ForeignKey(Apply,verbose_name=_('宴会申请'),related_name='surplus_apply', on_delete=models.CASCADE,blank=True,null=True)    
+    product=models.ForeignKey('product.Product',verbose_name=_('产品名称'),related_name='surplus_product',on_delete=models.CASCADE)
+    qty_x=models.IntegerField(_('剩余箱数'),default=0)
+    qty_p=models.IntegerField(_('剩余瓶数'),default=0)    
+    dt = models.DateField(_('生成日期'),auto_now_add=True, db_index=True)
+    tm = models.DateTimeField(_('生成时间'), auto_now_add=True)
+    remark = models.CharField(_('备注说明'), max_length=100, blank=True, null=True)   
+
+    class Meta:
+        verbose_name = _('宴会结余')
+        verbose_name_plural = _('宴会结余')
+
+
+
+# 2024-06-27 结算后，经销商奖励
+class Bonus(models.Model):
+    ancestor = models.ForeignKey('company.Company',verbose_name=_('所属企业'), related_name='bonus_ancestor',on_delete=models.CASCADE)
+    agent=models.ForeignKey('company.Company', verbose_name=_('经销商'),related_name='bonus_agent',on_delete=models.CASCADE)
+    policy=models.ForeignKey(Policy,verbose_name=_('奖励政策'),related_name='bonus_policy',on_delete=models.CASCADE,blank=True,null=True)    
+    apply=models.ForeignKey(Apply,verbose_name=_('宴会申请'),related_name='bonus_appley',on_delete=models.CASCADE,blank=True,null=True)
+    product=models.ForeignKey('product.Product',verbose_name=_('产品名称'),related_name='bonus_product',on_delete=models.CASCADE)
+    qty_x=models.IntegerField(_('箱数'),default=0)
+    qty_p=models.IntegerField(_('瓶数'),default=0)
+    amt=models.DecimalField(_('奖励值'), max_digits=12, decimal_places=2, default=0)
+    dt = models.DateField(_('生成日期'),auto_now_add=True, db_index=True)
+    tm = models.DateTimeField(_('生成时间'), auto_now_add=True)
+    remark = models.CharField(_('备注说明'), max_length=100, blank=True, null=True)
+
+    class Meta:
+        verbose_name = _('奖励结算')
+        verbose_name_plural = _('奖励结算')
+

bottlecap/models.py

@@ -91,3 +91,42 @@ class DownloadLog(models.Model):
 
     def __str__(self):
         return self.file_name
+
+class SyncLog(models.Model):
+    '''
+    从内网同步业务通知单码数据日志
+    '''
+    inform_id=models.IntegerField(_('业务通知单ID'),db_index=True)
+    qty_tt=models.IntegerField(_('码总数量'),blank=True,null=True)
+    qty_sync=models.IntegerField(_('本次同步数量'),blank=True,null=True)
+    remark=models.CharField(_('备注说明'),max_length=50,blank=True,null=True)
+    dt=models.DateField(_('日期'),auto_now_add=True,db_index=True)
+    tm=models.DateTimeField(_('时间'),auto_now_add=True)
+
+    class Meta:
+        verbose_name=_('同步内网码数据日志')
+        verbose_name_plural=_('同步内网码数据日志')
+
+    #def __str__(self):
+    #    return self.file_name
+
+
+class UploadLog(models.Model):
+    '''
+    瓶盖厂上传内外码绑定日志
+    '''
+    batch_id=models.IntegerField(_('瓶盖厂绑定batch_id'),db_index=True)
+    segment=models.CharField(_('内码号段'),max_length=10)
+    cap_inform_id=models.IntegerField(_('内码所属业务通知单id'),db_index=True)
+    cap_qty_tt=models.IntegerField(_('内码总数量'))
+    cap_qty_ok=models.IntegerField(_('内码写入数量'))
+    outter_inform_id=models.IntegerField(_('外码所属业务通知单id'),db_index=True)
+    outter_qty_tt=models.IntegerField(_('外码总数量'))
+    outter_qty_ok=models.IntegerField(_('外码写入数量'))
+    remark=models.CharField(_('备注说明'),max_length=50,blank=True,null=True)
+    dt=models.DateField(_('日期'),auto_now_add=True,db_index=True)
+    tm=models.DateTimeField(_('时间'),auto_now_add=True)
+
+    class Meta:
+        verbose_name=_('瓶盖厂上传内码数据日志')
+        verbose_name_plural=_('瓶盖厂上传内码数据日志')