add 2300 【沂蒙山酒业】如图，”盒码回收“功能统计列表增加”标签类型“字段(分三种：箱、盒、瓶)

sales/views.py

@@ -9555,7 +9555,6 @@ def PromotionSeeds_lottery(request):
         data['e'] = '数据丢失'
     return JsonResponse(data)
 
-
 def couponscan(request):
     c=request.user.company
     data = {'data': [], 'clmns': [], 'e': [],
@@ -9570,20 +9569,24 @@ def couponscan(request):
     data["date_from"] = dt_fr
     data["date_to"] = dt_to
     sWhere = "dt between '" + dt_fr + "' and '" + dt_to + "' "
-    data['clmns'] = ['回收时间', '回收单位', '操作人', '标签', '产品名称']
+    data['clmns'] = ['回收时间', '回收单位', '操作人', '标签', '标签类型', '产品名称']
     cur=connection.cursor()
     s=f"""
         select to_char(tm,'yyyy-mm-dd HH24:MI:SS'),coalesce((select name from logistics.company_company where id=company_id limit 1),'')
         ,coalesce((select last_name from logistics.company_user where id =user_id ),''),label_code,
+        case
+            when label_pkg = 1 then '瓶'
+            when label_pkg = 2 then '盒'
+            when label_pkg = 3 then '箱'
+        end,
         coalesce((select name from logistics.product_product where id=product_id ),'')
         from sales_couponscan where {sWhere}  and ancestor_id={c.id}
     """
     cur.execute(s)
     for r in cur.fetchall():
-        data['data'].append([r[0],r[1],r[2],r[3],r[4]])
+        data['data'].append([r[0],r[1],r[2],r[3],r[4],r[5]])
     return render(request,'obj/list_obj.html',data)
 
-
 # Jonathan
 # 奖项投放计划
 @login_required