sync

bottlecap/models.py

@@ -30,7 +30,13 @@ class Factory(models.Model):
 
 class CodeType(models.Model):
     name=models.CharField(_('名称'),max_length=20,unique=True)
-    code=models.CharField(_('代码'),max_length=20,unique=True)
+    
+    # 将来删除code字段
+    code=models.CharField(_('代码'),max_length=20)
+
+    schema=models.CharField(_('生号模式名'),max_length=20,blank=True,null=True)
+    fname= models.CharField(_('生号字段名'),max_length=20,blank=True,null=True)
+
     remark=models.CharField(_('备注'),max_length=50,blank=True,null=True)
 
     class Meta:

company/views.py

@@ -3335,6 +3335,21 @@ def saleman_manage_data(request,what):
                 '<input class="btn btn-default btn-sm" type="button" onclick="openDlg(\'修改\',\'/company/saleman/manage/?obj=sharegroup&id='+str(r[0])+'\')" value="修改" />'
             ])
 
+    elif what == "user_remove_duplicate":
+        s=f"""
+        select cc.last_name,cc.name,cc.xlname from 
+        (select aa.product_series_id,aa.agent_id,aa.last_name ,bb.name,(select name from product_series where id=aa.product_series_id) as xlname   from 
+         ( select unnest ( product_series ) AS product_series_id,
+                                UNNEST ( agent_ids ) AS agent_id,u.last_name
+                              from  logistics.company_user  u
+                                INNER JOIN logistics.company_staffsaldiv d ON u.ID = d.user_id 
+                            where u.company_id={c.id}) aa,
+                            company_company  bb where  aa.agent_id=bb.id)cc
+                            group by last_name,name,xlname order by last_name
+        """
+        cur.execute(s)
+        for r in cur.fetchall():
+            data['data'].append([r[0],r[2],r[1]])
 
     return JsonResponse(data)
 
@@ -6044,6 +6059,7 @@ def auth_txt(request,file_name):
         'verify_4bea59b157182db27513e694a35f9e82.html',
         'verify_f4231134cb40a31aec93ce6b1a815585.html',
         'verify_0e39c9dfb50a1185122580cb831dd788.html',
+        'verify_cc91f7412f03de8913b7b8dc6ceef3ee.html',
         '6Htu9RITWm.txt',
 
         #https证书申请 验证文件
@@ -7326,7 +7342,10 @@ def ajax_company_detail(request):
         'areas':[],
         'lnglat':[],
         'img_logo': '',
-        'remark': ''
+        'remark': '',
+        'province': '',
+        'city': '',
+        'county': ''
     }
     id = request.GET.get("id","")
     if id:
@@ -7352,6 +7371,21 @@ def ajax_company_detail(request):
         rs = cur.fetchall()
         for r in rs:
             data['areas'].append(r[0])
+        
+        cur.execute(f"""
+            SELECT 
+                (select name from gis.adm_map_cn where id = province_gis_id),
+                (select name from gis.adm_map_cn where id = city_gis_id),
+                (select name from gis.adm_map_cn where id = county_gis_id)
+                FROM "company_company"
+            where id = {id}
+        """)
+        r = cur.fetchone()
+        if r:
+            data['province'] = r[0]
+            data['city'] = r[1]
+            data['county'] = r[2]
+            
     else:
         data['e'] = '数据丢失'
 

datacenter/urls.py

@@ -818,8 +818,12 @@ urlpatterns = [
     #2021-06-25
     url(r'^thirdparty/(?P<company_id>\d+)/(?P<vendor>\w+)/(?P<obj>\w+)/$',thirdparty_views.data_post),
     url(r'^thirdparty/(?P<company_id>\d+)/(?P<vendor>\w+)/(?P<obj>\w+)/(?P<action>\w+)/$',thirdparty_views.data_post),
+    
+    # 2024-02-05 酒鬼TMS删除单据(打删除标记) 
+    url(r'^thirdparty/sync/order/(?P<company_id>\d+)/(?P<vendor>\w+)/(?P<action>\w+)/$',thirdparty_views.sync_order),
     #2021-08-04
     url(r'^thirdparty/sync/order/(?P<company_id>\d+)/(?P<vendor>\w+)/$',thirdparty_views.sync_order),
+
     url(r'^thirdparty/app/get/dn/$',thirdparty_views.app_get_order_info),
 
 
@@ -1415,6 +1419,10 @@ urlpatterns = [
     url(r'wx/hfjy_terminal/$',wx_views.hfjy_terminal),
     #2024-01-22 锦诚名品大数据可视化
     url(r'^obj/data_visualization/$',list_views.data_visualization),
+    url(r'^obj/product_delivery/$',list_views.product_delivery),
+    url(r'^obj/labelscan_trend/$',list_views.labelscan_trend),
+     #2024-02-01 按批次不奖
+    url(r'^inventory/GDN/pc_lottery/(?P<id>\d+)/$',inventory_views.gnd_pc_lottery),
 ]
 
 if settings.DEBUG: