fix:获取经销商发货数据接口调整

company/views.py

@@ -7553,7 +7553,7 @@ def bonusPoints_edit_list(request, cid, type=None):
         "to_char(tm,'yyyy-mm-dd HH24:MI:SS'),cast(self_points as TEXT) points,cast(company_id as TEXT) from logistics.company_bonuspointslog where company_id = " + str(
         cid) + " and  self_points is not null and self_points> 0 )m " +\
         "left outer join (SELECT name ,id  from company_company )z on z.id = m.company_fr_id::int"
-
+    print(s)
     cur.execute(s)
     r = cur.fetchall()
     for i in r :
@@ -7626,7 +7626,8 @@ def delibery_record(request,user_id):
         (select name from company_company where id = b.company_id),
         (select name from company_company where id = b.company_to_id),
         (select username from company_user where id = b.user_id),
-        x,h,p
+        x,h,p,
+        (select batch_id from inventory_receipt e where e.batch_id=A.batch_id)
         from(
             SELECT
                 batch_id,
@@ -7662,22 +7663,27 @@ def delibery_record(request,user_id):
                 vtype_id
                 ) A 
         LEFT JOIN logistics.inventory_batch b ON A.batch_id = b.id
-        order by batch_id
+        order by A.batch_id
     """
 
     cur.execute(s)
     for r in cur.fetchall():
+        if r[11]:
+            state=1
+        else:
+            state=2
         data['data'].append( {
-            'tm':r[1],  # 时间
-            'vtype':r[2],  # 单据类别
-            'batch_code':r[3],
-            'product':r[4],  # 产品名称
-            'company_fr_name':r[5],  # 操作方
-            'company_to_name':r[6],  # 客户名称
-            'username':r[7],
-            'x':r[8],  # 箱
-            'h':r[9],  # 盒
-            'p':r[10],  # 瓶
+            'tm': r[1],  # 时间
+            'vtype': r[2],  # 单据类别
+            'batch_code': r[3],
+            'product': r[4],  # 产品名称
+            'company_fr_name': r[5],  # 操作方
+            'company_to_name': r[6],  # 客户名称
+            'username': r[7],
+            'x': r[8],  # 箱
+            'h': r[9],  # 盒
+            'p': r[10],  # 瓶
+            'state': state,  #是否确认收货
         })
     return JsonResponse(data)