Merge remote-tracking branch 'origin/task' into release

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

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