From b39016623e5996c72af13915d4466f533010bd2f Mon Sep 17 00:00:00 2001 From: "huojin\\hj" <982011> Date: Fri, 20 Jun 2025 15:08:40 +0800 Subject: [PATCH] no message --- .../config/origen/monitor/maintainWayFillPage.xml | 10 +++++----- .../origen/shipment/maintainOrderLegsDedicatedPage.xml | 5 +++-- .../config/origen/shipment/maintainOrderLegsPage.xml | 5 +++-- .../config/origen/shipment/maintainShipmentAllPage.xml | 8 ++++---- .../config/origen/shipment/maintainShipmentZXPage.xml | 10 +++++----- .../config/origen/shipment/shipmentOrderQueryPage.xml | 6 +++--- .../origen/signOrder/maintainSingOrderAuditingPage.xml | 6 +++--- .../config/origen/signOrder/maintainSingOrderPage.xml | 9 ++++----- 8 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/webapp/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml b/src/webapp/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml index 19e9c02..6cde698 100644 --- a/src/webapp/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml @@ -97,13 +97,13 @@ l.currentPosition, left join l.shipment.vehicle vehicle left join l.shipment.driver driver where 1=1 - and ( /~ordersAll: {ordersAll} = true~/ ) - and (l.executer=#{SESSION_PLATFORM} or l.contractor=#{SESSION_PLATFORM}) + and l.executer=#{SESSION_PLATFORM} and ( - #{SESSION_USERS_NAME} = 'admin' - or o.updateInfo.operatorName = #{SESSION_USERS_NAME} - or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) + o.updateInfo.operatorName = #{SESSION_USERS_NAME} + or #{SESSION_USERS_NAME} = 'admin' + or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') ) ) + and ( /~ordersAll: {ordersAll} = true~/ ) /~orders.customerOrderNO: AND upper(l.order.customerOrderNO) like upper({orders.customerOrderNO})~/ /~l.ecNo: AND upper(l.ecNo) like upper({l.ecNo})~/ /~shipment.shipmentDepartment: AND (( shipment.shipmentDepartment ={shipment.shipmentDepartment} ) diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml index e6d8b00..9f53b40 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml @@ -93,8 +93,9 @@ s 1) ) and ( - #{SESSION_USERS_NAME} = 'admin' - or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME} + l.order.updateInfo.operatorName = #{SESSION_USERS_NAME} + or #{SESSION_USERS_NAME} = 'admin' + or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') ) ) /~l.ecNo: and upper(l.ecNo) like upper({l.ecNo})~/ /~orders.consignor.id: and l.consignor.id = {orders.consignor.id}~/ diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml index 6931789..962f897 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml @@ -119,11 +119,11 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d left join shipment.customer WHERE 1=1 and shipment.platForm=#{SESSION_PLATFORM} - and shipment.status!='CANCEL' + and shipment.status not in ('CANCEL') and ( - #{SESSION_USERS_NAME} = 'admin' - or shipment.operator = #{SESSION_USERS_NAME} - or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) + shipment.operator = #{SESSION_USERS_NAME} + or #{SESSION_USERS_NAME} = 'admin' + or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') ) ) and ((/~shipment.operatorDate :{shipment.operatorDate} ~/=shipment.operatorDate) or ( /~ordersAll: {ordersAll} = true~/ )) /~shipment.code: AND shipment.code like upper({shipment.code})~/ diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml index b4c8eb2..56eeae0 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml @@ -111,15 +111,15 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d left join shipment.vehicleType left join shipment.unloadingCompany WHERE 1=1 + and shipment.platForm= #{SESSION_PLATFORM} and shipment.shipmentDepartment='专线' and shipment.isShortBarge=false - and shipment.platForm= #{SESSION_PLATFORM} + and shipment.status not in ('CANCEL') and ( - #{SESSION_USERS_NAME} = 'admin' - or shipment.operator = #{SESSION_USERS_NAME} - or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) + shipment.operator = #{SESSION_USERS_NAME} + or #{SESSION_USERS_NAME} = 'admin' + or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') ) ) - and (shipment.status!='CANCEL' /~shipment.status: or 'CANCEL' = {shipment.status}~/ ) /~shipment.code: AND shipment.code like upper({shipment.code})~/ /~shipment.status: AND shipment.status = {shipment.status}~/ /~shipment.carrier.id: AND shipment.carrier.id = {shipment.carrier.id}~/ diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml index 67c6f71..1b4f77a 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml @@ -106,9 +106,9 @@ and pf = #{SESSION_PLATFORM} and orders.isShortBarge=false and ( - #{SESSION_USERS_NAME} = 'admin' - or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} - or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) + orders.updateInfo.operatorName = #{SESSION_USERS_NAME} + or #{SESSION_USERS_NAME} = 'admin' + or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') ) ) and ( orders.status in('AVAILABLE','TRANS_AVAILABLE') diff --git a/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml b/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml index b7e7663..65bebbc 100644 --- a/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml @@ -102,9 +102,9 @@ where 1=1 and orders.contractor = #{SESSION_PLATFORM} and ( - #{SESSION_USERS_NAME} = 'admin' - or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} - or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) + orders.updateInfo.operatorName = #{SESSION_USERS_NAME} + or #{SESSION_USERS_NAME} = 'admin' + or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') ) ) and ( orders.status in('AVAILABLE','TRANS_AVAILABLE') diff --git a/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml b/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml index c5dbb2b..30bfaff 100644 --- a/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml @@ -95,14 +95,13 @@ left join orders.extends1 vt1 where 1=1 and orders.contractor = #{SESSION_PLATFORM} - and orders.status !='CANCEL' and ( - #{SESSION_USERS_NAME} = 'admin' - or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} - or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) + orders.updateInfo.operatorName = #{SESSION_USERS_NAME} + or #{SESSION_USERS_NAME} = 'admin' + or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') ) ) and ( - orders.status !='SIGNED' + orders.status not in('SIGNED') or (/~isAll: {isAll} = true~/) ) /~date1: and (DATE_FORMAT(orders.planFromDate,'%Y-%m-%d') >= #{CLIENT_DATE_SESSION} or (orders.planFromDate) >= {date1})~/