From 2e0bb234c256e86db8aedd1f28aef4de4194e719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Thu, 14 Dec 2023 11:36:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0185=E7=A5=A8=E7=A7=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/frJob/QueryDetailDataDao.xml  | 6 +++---
 .../src/main/resources/mapper/frJob/RecordToQueryDao.xml    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/frJob/QueryDetailDataDao.xml b/dxhy-core/src/main/resources/mapper/frJob/QueryDetailDataDao.xml
index 6a1156cf..0b230bdc 100644
--- a/dxhy-core/src/main/resources/mapper/frJob/QueryDetailDataDao.xml
+++ b/dxhy-core/src/main/resources/mapper/frJob/QueryDetailDataDao.xml
@@ -64,7 +64,7 @@
             group by r.zbzdh,i.racct
         ) v on t.bzdh = v.zbzdh
         where d.tax_rate = v.sl
-          and t.invoice_type in ('01','03','08','14','31','183')
+          and t.invoice_type in ('01','03','08','14','31','183','185')
           and d.goods_name != '(详见销货清单)'
         group by d.uuid,d.tax_rate
     </select>
@@ -121,7 +121,7 @@
             group by r.zbzdh,i.racct
         ) v on t.bzdh = v.zbzdh
         where d.tax_rate * 100 = v.sl
-          and t.invoice_type in ('01','03','08','14','31','183')
+          and t.invoice_type in ('01','03','08','14','31','183','185')
           and d.goods_name != '(详见销货清单)'
           and t.invoice_status != '2'
         group by d.uuid,d.tax_rate
@@ -166,7 +166,7 @@
             group by r.zbzdh,i.racct
         ) v on t.bzdh = v.zbzdh
         where d.tax_rate * 100 = v.sl
-          and t.invoice_type in ('01','03','08','14','31','183')
+          and t.invoice_type in ('01','03','08','14','31','183','185')
           and d.goods_name != '(详见销货清单)'
           and t.invoice_status != '2'
         group by d.uuid,d.tax_rate
diff --git a/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml b/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml
index fbd07f76..91c18560 100644
--- a/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml
+++ b/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml
@@ -29,7 +29,7 @@
             i.racct as kjkmbh,
             i.txt50 as kjkm,
             sum(CAST(i.zhslj as decimal(20,2))) as sapse,
-            v.belnr as pzh,
+            GROUP_CONCAT(distinct v.belnr ) as pzh,
             v.zbzdh as bzdh,
             v.zbzcgt,
             v.zbzcg,
@@ -80,7 +80,7 @@
             i.racct as kjkmbh,
             i.txt50 as kjkm,
             sum(CAST(i.zwsld as decimal(20,2))) as sapse,
-            v.belnr as pzh,
+            GROUP_CONCAT(distinct v.belnr ) as pzh,
             v.zbzdh as bzdh,
             v.create_time
         FROM
@@ -134,7 +134,7 @@
             i.racct as kjkmbh,
             i.txt50 as kjkm,
             sum(CAST(i.zwsld as decimal(20,2))) as sapse,
-            v.belnr as pzh,
+            GROUP_CONCAT(distinct v.belnr ) as pzh,
             v.zbzdh as bzdh,
             v.create_time
         FROM