From cba4e29b80cad25cdbef7f1d33c32e2132e1a2de Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Fri, 29 Aug 2025 08:52:42 +0800 Subject: [PATCH] =?UTF-8?q?##=20group=20by=20=E8=AF=AD=E5=8F=A5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=86=85=E5=AE=B9=E8=BD=AC=E6=8D=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/report/scm/InventoryMapper.xml | 6 +++--- .../mapper/scm/general/IcGeneralInHMapper.xml | 2 +- .../mapper/scm/general/IcGeneralOutHMapper.xml | 2 +- .../mapper/scm/ic/IcAvailableNumMapper.xml | 15 +++++++-------- .../resources/mapper/scm/ic/IcOnHandNumMapper.xml | 8 ++++---- .../mapper/scm/inventory/IcInventoryHMapper.xml | 2 +- .../mapper/scm/io/IoOrderItemsMapper.xml | 4 ++-- .../resources/mapper/scm/io/IoOrderMapper.xml | 2 +- .../mapper/scm/po/PoOrderItemsMapper.xml | 2 +- .../resources/mapper/scm/po/PoOrderMapper.xml | 4 ++-- .../mapper/scm/purchase/IcPurchaseinHMapper.xml | 4 ++-- .../mapper/scm/sale/IcSaleoutHMapper.xml | 2 +- .../mapper/scm/store/IcStoreHandNumMapper.xml | 4 ++-- .../mapper/scm/trans/IcTransInHMapper.xml | 2 +- .../mapper/scm/trans/IcTransOutHMapper.xml | 4 ++-- .../mapper/scm/trans/TransferOrderItemsMapper.xml | 2 +- .../mapper/scm/trans/TransferOrderMapper.xml | 4 ++-- .../mapper/scm/warn/IcWarnConfigMapper.xml | 10 +++++----- .../mapper/system/sys/SysApprovalMapper.xml | 4 ++-- .../mapper/system/sys/SysUserMenuMapper.xml | 8 ++++---- 20 files changed, 45 insertions(+), 46 deletions(-) diff --git a/bd-business/bd-business-report/src/main/resources/mapper/report/scm/InventoryMapper.xml b/bd-business/bd-business-report/src/main/resources/mapper/report/scm/InventoryMapper.xml index d261bbd..9498acc 100644 --- a/bd-business/bd-business-report/src/main/resources/mapper/report/scm/InventoryMapper.xml +++ b/bd-business/bd-business-report/src/main/resources/mapper/report/scm/InventoryMapper.xml @@ -14,7 +14,7 @@ select pk_product,pk_product_bas,ic.pk_country,specs_name,sum(nonhandnum) nonhandnum from ic_on_hand_num ic inner join (select pk_onhandnum, max(r) specs_name from (select pk_onhandnum, - wm_concat(specs_name) over(partition by pk_onhandnum order by specs_name) r + to_char(wm_concat(specs_name) over(partition by pk_onhandnum order by specs_name)) r from ic_on_hand_specs where del_flag = 0) group by pk_onhandnum) ip @@ -41,7 +41,7 @@ on po.pk_id=pt.pk_order inner join ( select pk_order_items,max(r) specs_name from - (select pk_order_items,wm_concat(specs_name) over (partition by pk_order_items order by specs_name) r + (select pk_order_items,to_char(wm_concat(specs_name) over (partition by pk_order_items order by specs_name)) r from scm_item_specs where del_flag = 0 and order_type=1) group by pk_order_items) sp @@ -58,7 +58,7 @@ on ih.pk_id=ib.pk_transfer_out inner join ( select pk_order_items,max(r) specs_name from - (select pk_order_items,wm_concat(specs_name) over (partition by pk_order_items order by specs_name) r + (select pk_order_items,to_char(wm_concat(specs_name) over (partition by pk_order_items order by specs_name)) r from scm_item_specs where del_flag = 0 and order_type=9) group by pk_order_items) sp diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralInHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralInHMapper.xml index ca99707..87c07b3 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralInHMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralInHMapper.xml @@ -88,7 +88,7 @@ left join bd_product bp on ib.pk_product=bp.pk_id left join ( - select pk_order,pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs + select pk_order,pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=3 group by pk_order,pk_order_items) sp on ib.pk_id=sp.pk_order_items diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralOutHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralOutHMapper.xml index e60a847..e7c7069 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralOutHMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/general/IcGeneralOutHMapper.xml @@ -87,7 +87,7 @@ left join bd_product bp on ib.pk_product=bp.pk_id left join ( - select pk_order,pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs + select pk_order,pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=4 group by pk_order,pk_order_items) sp on ib.pk_id=sp.pk_order_items diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableNumMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableNumMapper.xml index 621d813..c4439c0 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableNumMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcAvailableNumMapper.xml @@ -48,8 +48,7 @@ inner join ( select pk_available_num, max(r) h_specs_name from (select pk_available_num, - wm_concat(pk_specs) - over (partition by pk_available_num order by pk_specs) r + to_char(wm_concat(pk_specs) over (partition by pk_available_num order by pk_specs)) r from ic_available_specs where del_flag = 0) group by pk_available_num) ip @@ -65,8 +64,8 @@ bn.name unit_name,bc.cust_name cubasdoc_name from ic_available_num im inner join ( select pk_available_num,max(r) h_specs_name from - (select pk_available_num,wm_concat(specs_name) - over (partition by pk_available_num order by pk_specs) r + (select pk_available_num, + to_char(wm_concat(specs_name) over (partition by pk_available_num order by pk_specs)) r from ic_available_specs where del_flag = 0 ) group by pk_available_num) b @@ -106,8 +105,8 @@ select ia.* from ic_available_num ia inner join ( select pk_available_num,max(r) pk_specs from - (select pk_available_num,wm_concat(pk_specs) - over (partition by pk_available_num order by pk_specs) r + (select pk_available_num, + to_char(wm_concat(pk_specs) over (partition by pk_available_num order by pk_specs)) r from ic_available_specs where del_flag = 0) where r=replace('${it}',' ','') @@ -123,8 +122,8 @@ select an.* from ic_available_num an inner join ( select pk_available_num,max(r) pk_specs from - (select pk_available_num,wm_concat(pk_specs) - over (partition by pk_available_num order by pk_specs) r + (select pk_available_num, + to_char(wm_concat(pk_specs) over (partition by pk_available_num order by pk_specs)) r from ic_available_specs where del_flag = 0) where r=replace('${it.pkSpecs}',' diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandNumMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandNumMapper.xml index 21fe19d..66c6a17 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandNumMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/ic/IcOnHandNumMapper.xml @@ -80,7 +80,7 @@ select ih.*,ips.pk_specs_type,ips.pk_specs,ips.specs_name from ic_on_hand_num ih inner join ( select pk_onhandnum,max(r) pk_specs from - (select pk_onhandnum,wm_concat(pk_specs) over (partition by pk_onhandnum order by pk_specs) r + (select pk_onhandnum,to_char(wm_concat(pk_specs) over (partition by pk_onhandnum order by pk_specs)) r from ic_on_hand_specs where del_flag = 0) group by pk_onhandnum @@ -101,7 +101,7 @@ select ih.*,ip.h_specs_name from ic_on_hand_num ih inner join ( select pk_onhandnum,max(r) h_specs_name from - (select pk_onhandnum,wm_concat(pk_specs) over (partition by pk_onhandnum order by pk_specs) r + (select pk_onhandnum,to_char(wm_concat(pk_specs) over (partition by pk_onhandnum order by pk_specs)) r from ic_on_hand_specs where del_flag = 0) group by pk_onhandnum) ip @@ -121,7 +121,7 @@ (case when ih.expire_date-sysdate <b.warn_period then 0 else 1 end) display_red,bp.shipping_channel from ic_on_hand_num ih inner join ( select pk_onhandnum,max(r) h_specs_name from - (select pk_onhandnum,wm_concat(specs_name) over (partition by pk_onhandnum order by pk_specs) r + (select pk_onhandnum,to_char(wm_concat(specs_name) over (partition by pk_onhandnum order by pk_specs)) r from ic_on_hand_specs where del_flag = 0) group by pk_onhandnum @@ -145,7 +145,7 @@ select pk_product_bas,warn_period,bs.specs_name from ic_warn_config ic inner join ( select pk_warn_config,max(r) specs_name from - (select pk_warn_config,wm_concat(specs_name) over (partition by pk_warn_config order by pk_specs) r + (select pk_warn_config,to_char(wm_concat(specs_name) over (partition by pk_warn_config order by pk_specs)) r from ic_warn_config_specs where del_flag = 0) group by pk_warn_config diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/inventory/IcInventoryHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/inventory/IcInventoryHMapper.xml index 2573cdc..3be0c36 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/inventory/IcInventoryHMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/inventory/IcInventoryHMapper.xml @@ -88,7 +88,7 @@ left join bd_cubasdoc bc on bc.pk_id = ib.pk_cubasdoc and bc.del_flag=0 left join ( - select pk_order,pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs + select pk_order,pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=10 group by pk_order,pk_order_items) sp on ib.pk_id=sp.pk_order_items diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderItemsMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderItemsMapper.xml index 41d671c..bcc0988 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderItemsMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderItemsMapper.xml @@ -52,7 +52,7 @@ on se.pk_order_items=pt.pk_id and se.order_type=11 and se.del_flag=0 left join ( select pk_order_items,max(r) specs_name from - (select pk_order_items,wm_concat(specs_name) over (partition by pk_order_items order by pk_specs) r + (select pk_order_items,to_char(wm_concat(specs_name) over (partition by pk_order_items order by pk_specs)) r from scm_item_specs where del_flag=0 and order_type=11) group by pk_order_items @@ -60,7 +60,7 @@ on sp.pk_order_items=pt.pk_id left join ( select pk_order_items,max(r) specs_name_id from - (select pk_order_items,wm_concat(pk_specs) over (partition by pk_order_items order by pk_specs) r + (select pk_order_items,to_char(wm_concat(pk_specs) over (partition by pk_order_items order by pk_specs)) r from scm_item_specs where del_flag=0 and order_type=11) group by pk_order_items diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderMapper.xml index a76d116..a77486b 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/io/IoOrderMapper.xml @@ -94,7 +94,7 @@ left join BD_AREA ct on ct.pk_id=po.REC_CITY and ct.del_flag=0 left join BD_AREA co on co.pk_id=po.REC_COUNTY and co.del_flag=0 left join ( - select pk_order,pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs + select pk_order,pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=11 group by pk_order,pk_order_items) sp on pi.pk_id=sp.pk_order_items diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderItemsMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderItemsMapper.xml index 9c63fcb..0267da1 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderItemsMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderItemsMapper.xml @@ -54,7 +54,7 @@ on pt.pk_unit = bn.pk_id left join scm_item_specs se on se.pk_order_items=pt.pk_id and se.order_type=1 - left join (select pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs where del_flag=0 + left join (select pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=1 group by pk_order_items) sp on sp.pk_order_items=pt.pk_id diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderMapper.xml index f3ea966..036bcaa 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/po/PoOrderMapper.xml @@ -104,7 +104,7 @@ left join bd_product_bas bp on pi.pk_product_bas=bp.pk_id left join ( - select pk_order,pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs + select pk_order,pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=1 group by pk_order,pk_order_items) sp on pi.pk_id=sp.pk_order_items @@ -177,7 +177,7 @@ on pt.pk_unit = bn.pk_id left join bd_storehouse bh on pt.pk_storehouse=bh.pk_id - left join (select pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs + left join (select pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=1 group by pk_order_items) sp on sp.pk_order_items=pt.pk_id diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/purchase/IcPurchaseinHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/purchase/IcPurchaseinHMapper.xml index 55ea3b0..166cb6e 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/purchase/IcPurchaseinHMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/purchase/IcPurchaseinHMapper.xml @@ -118,7 +118,7 @@ left join bd_product bp on ib.pk_product=bp.pk_id left join ( - select pk_order,pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs + select pk_order,pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=2 group by pk_order,pk_order_items) sp on ib.pk_id=sp.pk_order_items @@ -183,7 +183,7 @@ left join bd_product bp on ib.pk_product=bp.pk_id left join ( - select pk_order,pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs + select pk_order,pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=2 group by pk_order,pk_order_items) sp on ib.pk_id=sp.pk_order_items diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutHMapper.xml index 1ac96f6..bcf9445 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutHMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/sale/IcSaleoutHMapper.xml @@ -107,7 +107,7 @@ left join bd_product bp on ib.pk_product=bp.pk_id left join ( - select pk_order,pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs + select pk_order,pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=6 group by pk_order,pk_order_items) sp on ib.pk_id=sp.pk_order_items diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/store/IcStoreHandNumMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/store/IcStoreHandNumMapper.xml index ad5fbcf..96e36f4 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/store/IcStoreHandNumMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/store/IcStoreHandNumMapper.xml @@ -49,7 +49,7 @@ select ih.*,ip.pk_specs specs_name_id,ips.pk_specs_type,ips.pk_specs,ips.specs_name from ic_store_hand_num ih inner join ( select pk_onhandnum,max(r) pk_specs from - (select pk_onhandnum,wm_concat(pk_specs) over (partition by pk_onhandnum order by pk_specs) r + (select pk_onhandnum,to_char(wm_concat(pk_specs) over (partition by pk_onhandnum order by pk_specs)) r from ic_store_hand_specs where del_flag = 0) group by pk_onhandnum @@ -79,7 +79,7 @@ ip.specs_name specs_name_id,ips.pk_specs_type,ips.pk_specs,ips.specs_name from ic_store_hand_num ih inner join ( select pk_onhandnum,max(r) specs_name from - (select pk_onhandnum,wm_concat(specs_name) over (partition by pk_onhandnum order by pk_specs) r + (select pk_onhandnum,to_char(wm_concat(specs_name) over (partition by pk_onhandnum order by pk_specs)) r from ic_store_hand_specs where del_flag = 0) group by pk_onhandnum diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransInHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransInHMapper.xml index b706264..7679b92 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransInHMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransInHMapper.xml @@ -106,7 +106,7 @@ left join bd_storehouse bcs on bcs.pk_id =ib.pk_out_storehouse left join ( - select pk_order,pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs + select pk_order,pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=8 group by pk_order,pk_order_items) sp on ib.pk_id=sp.pk_order_items diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransOutHMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransOutHMapper.xml index e163eac..c4cadc1 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransOutHMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/IcTransOutHMapper.xml @@ -105,7 +105,7 @@ left join bd_storehouse bcs on bcs.pk_id =ib.pk_in_storehouse left join ( - select pk_order,pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs + select pk_order,pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=9 group by pk_order,pk_order_items) sp on ib.pk_id=sp.pk_order_items @@ -185,7 +185,7 @@ left join bd_storehouse bcs on bcs.pk_id =ti.pk_in_storehouse left join ( - select pk_order,pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs + select pk_order,pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=9 group by pk_order,pk_order_items) sp on ti.pk_id=sp.pk_order_items diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderItemsMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderItemsMapper.xml index 4520dce..c9b91f1 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderItemsMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderItemsMapper.xml @@ -109,7 +109,7 @@ on bc.pk_id=pt.pk_cubasdoc and bc.del_flag=0 left join scm_item_specs se on se.pk_order_items=pt.pk_id and se.order_type=7 - left join (select pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs where del_flag=0 + left join (select pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=7 group by pk_order_items) sp on sp.pk_order_items=pt.pk_id diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderMapper.xml index 030d6f2..5f0a44c 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/trans/TransferOrderMapper.xml @@ -117,7 +117,7 @@ left join bd_storehouse bcs on bcs.pk_id =ti.pk_in_storehouse left join ( - select pk_order,pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs + select pk_order,pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=7 group by pk_order,pk_order_items) sp on ti.pk_id=sp.pk_order_items @@ -190,7 +190,7 @@ on bcp.pk_id=tr.pk_in_corp left join bd_storehouse bcs on bcs.pk_id =ti.pk_in_storehouse - left join (select pk_order_items,wm_concat(specs_name) specs_name from scm_item_specs where del_flag=0 + left join (select pk_order_items,to_char(wm_concat(specs_name)) specs_name from scm_item_specs where del_flag=0 and order_type=7 group by pk_order_items) sp on sp.pk_order_items=ti.pk_id diff --git a/bd-business/bd-business-scm/src/main/resources/mapper/scm/warn/IcWarnConfigMapper.xml b/bd-business/bd-business-scm/src/main/resources/mapper/scm/warn/IcWarnConfigMapper.xml index 8889630..770b182 100644 --- a/bd-business/bd-business-scm/src/main/resources/mapper/scm/warn/IcWarnConfigMapper.xml +++ b/bd-business/bd-business-scm/src/main/resources/mapper/scm/warn/IcWarnConfigMapper.xml @@ -28,7 +28,7 @@ select ic.*,bp.product_code,bp.product_name,bs.specs_name,ip.pk_specs_type,ip.pk_specs,ip.specs_name item_specs_name from ic_warn_config ic inner join bd_product_bas bp on ic.pk_product_bas=bp.pk_id - inner join (select pk_warn_config,wm_concat(specs_name) specs_name from ic_warn_config_specs + inner join (select pk_warn_config,to_char(wm_concat(specs_name)) specs_name from ic_warn_config_specs where del_flag=0 group by pk_warn_config) bs on ic.pk_id = bs.pk_warn_config @@ -37,8 +37,8 @@ inner join ( select pk_warn_config,max(r) pk_specs from - (select pk_warn_config,wm_concat(pk_specs) - over (partition by pk_warn_config order by pk_specs) r + (select pk_warn_config, to_char(wm_concat(pk_specs) + over (partition by pk_warn_config order by pk_specs)) r from ic_warn_config_specs where del_flag = 0) where r=replace('${it.pkSpecs}',' ','') @@ -77,7 +77,7 @@ on bp.pk_id=ic.pk_product_bas inner join ( select pk_warn_config,max(r) specs_name from - (select pk_warn_config,wm_concat(specs_name) over (partition by pk_warn_config order by pk_specs) r + (select pk_warn_config,to_char(wm_concat(specs_name) over (partition by pk_warn_config order by pk_specs)) r from ic_warn_config_specs where del_flag = 0) group by pk_warn_config @@ -88,7 +88,7 @@ select pk_product_bas,pk_storehouse,sum(NONHANDNUM) NONHANDNUM,ib.specs_name from ic_on_hand_num ih inner join ( select pk_onhandnum,max(r) specs_name from - (select pk_onhandnum,wm_concat(specs_name) over (partition by pk_onhandnum order by pk_specs) r + (select pk_onhandnum,to_char(wm_concat(specs_name) over (partition by pk_onhandnum order by pk_specs)) r from ic_on_hand_specs where del_flag = 0) group by pk_onhandnum) ib diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysApprovalMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysApprovalMapper.xml index aacc1c7..b092785 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysApprovalMapper.xml +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysApprovalMapper.xml @@ -33,13 +33,13 @@ select sa.pk_id, sa.approval_business, tmp.process, - tmp.send, + to_char(tmp.send) send, sa.effective_date from (select sa.pk_id, max(sa.process) process, wm_concat(sus.nick_name) send from (select sa.pk_id, - replace(wm_concat(su.nick_name), ',', ' - ') process + to_char(replace(wm_concat(su.nick_name), ',', ' - ')) process from sys_approval sa left join sys_approval_item sai on sai.pk_approval = sa.pk_id diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysUserMenuMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysUserMenuMapper.xml index ca876bb..f3406ca 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysUserMenuMapper.xml +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysUserMenuMapper.xml @@ -19,8 +19,8 @@ select u.user_id, u.nick_name, u.creation_time, - wm_concat(distinct ur.role_id) role_ids, - wm_concat(distinct um.menu_id) menu_ids + to_char(wm_concat(distinct ur.role_id)) role_ids, + to_char(wm_concat(distinct um.menu_id)) menu_ids from (select u.user_id, u.nick_name, max(um.creation_time) creation_time from sys_user u left join sys_user_menu um @@ -62,8 +62,8 @@