From 2dc4a662da8dca407d5a48d4fcbd3003c3d892dd Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Fri, 12 Sep 2025 11:00:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E9=99=A9=E5=93=81=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=93=81=E5=90=8D?= =?UTF-8?q?=E3=80=81=E7=94=B5=E5=AD=90=E5=BA=95=E5=B8=90=E5=BA=8F=E5=8F=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E5=87=BA=E5=8F=A3?= =?UTF-8?q?=E6=8A=A5=E6=A3=80=E7=95=8C=E9=9D=A2=EF=BC=9A=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=93=81=E5=90=8D=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/maintainBJCustomsOrderPage.xml | 7 +- .../order/maintainWXPBZCustomsOrderPage.xml | 9 +- .../order/maintainBJCustomsOrderPage.xml | 127 ------------------ .../order/maintainWXPBZCustomsOrderPage.xml | 127 ------------------ 4 files changed, 12 insertions(+), 258 deletions(-) delete mode 100644 target/jjwms/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml delete mode 100644 target/jjwms/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml diff --git a/src/webapp/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml b/src/webapp/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml index 3e4ba1a..18c767c 100644 --- a/src/webapp/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml @@ -7,6 +7,8 @@ + + @@ -52,9 +54,10 @@ and (customsOrder.client.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) or 0=(select nvl(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS}) ) - /~customsOrder.code: and customsOrder.code like upper({customsOrder.code})~/ - /~customsOrder.extend17: and upper(customsOrder.extend17) like upper({customsOrder.extend17})~/ + /~customsOrder.code: and customsOrder.code like ({customsOrder.code})~/ + /~customsOrder.extend17: and upper(customsOrder.extend17) like ({customsOrder.extend17})~/ /~customsOrder.client.name: and customsOrder.client.name like {customsOrder.client.name}~/ + /~customsOrder.itemName: and customsOrder.itemName like {customsOrder.itemName}~/ order by customsOrder.id desc ]]> diff --git a/src/webapp/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml b/src/webapp/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml index 078ff7c..8f1905d 100644 --- a/src/webapp/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml @@ -7,6 +7,9 @@ + + + @@ -52,9 +55,11 @@ and (customsOrder.client.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) or 0=(select nvl(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS}) ) - /~customsOrder.code: and customsOrder.code like upper({customsOrder.code})~/ - /~customsOrder.extend17: and upper(customsOrder.extend17) like upper({customsOrder.extend17})~/ + /~customsOrder.code: and customsOrder.code like {customsOrder.code}~/ + /~customsOrder.extend17: and customsOrder.extend17 like {customsOrder.extend17}~/ /~customsOrder.client.name: and customsOrder.client.name like {customsOrder.client.name}~/ + /~customsOrder.itemName: and customsOrder.itemName like {customsOrder.itemName}~/ + /~customsOrder.electronicLedger: and customsOrder.electronicLedger like {customsOrder.electronicLedger}~/ order by customsOrder.id desc ]]> diff --git a/target/jjwms/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml b/target/jjwms/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml deleted file mode 100644 index 3e4ba1a..0000000 --- a/target/jjwms/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/jjwms/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml b/target/jjwms/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml deleted file mode 100644 index 078ff7c..0000000 --- a/target/jjwms/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -