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 8e03c18..1063507 100644 --- a/src/webapp/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml @@ -99,7 +99,7 @@ l.currentPosition, where 1=1 and ( /~ordersAll: {ordersAll} = true~/ ) and (l.executer=#{SESSION_PLATFORM} or l.contractor=#{SESSION_PLATFORM}) - and (#{SESSION_USERS_NAME} = 'admin' or o.updateInfo.operatorName = #{SESSION_USERS_NAME}) + and (#{SESSION_USERS_NAME} = 'admin' or o.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME} ) ) /~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/maintainShipmentZXPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml index bbab29b..715da83 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml @@ -114,7 +114,7 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d and shipment.shipmentDepartment='专线' and shipment.isShortBarge=false and shipment.platForm= #{SESSION_PLATFORM} - and (#{SESSION_USERS_NAME} = 'admin' or shipment.operator = #{SESSION_USERS_NAME}) + and (#{SESSION_USERS_NAME} = 'admin' or shipment.operator = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME} ) ) 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}~/ diff --git a/target/cqtms/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml b/target/cqtms/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml index 8e03c18..1063507 100644 --- a/target/cqtms/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml +++ b/target/cqtms/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml @@ -99,7 +99,7 @@ l.currentPosition, where 1=1 and ( /~ordersAll: {ordersAll} = true~/ ) and (l.executer=#{SESSION_PLATFORM} or l.contractor=#{SESSION_PLATFORM}) - and (#{SESSION_USERS_NAME} = 'admin' or o.updateInfo.operatorName = #{SESSION_USERS_NAME}) + and (#{SESSION_USERS_NAME} = 'admin' or o.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME} ) ) /~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/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml b/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml index bbab29b..715da83 100644 --- a/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml +++ b/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml @@ -114,7 +114,7 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d and shipment.shipmentDepartment='专线' and shipment.isShortBarge=false and shipment.platForm= #{SESSION_PLATFORM} - and (#{SESSION_USERS_NAME} = 'admin' or shipment.operator = #{SESSION_USERS_NAME}) + and (#{SESSION_USERS_NAME} = 'admin' or shipment.operator = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME} ) ) 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}~/