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 eec6a16..8e03c18 100644 --- a/src/webapp/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml @@ -99,6 +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}) /~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 e0ae26f..2abdcd9 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml @@ -90,6 +90,7 @@ s 1)) + and (#{SESSION_USERS_NAME} = 'admin' or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME}) /~l.ecNo: and upper(l.ecNo) like upper({l.ecNo})~/ /~orders.consignor.id: and l.consignor.id = {orders.consignor.id}~/ /~l.fromContact.address: and l.fromContact.address like {l.fromContact.address}~/ 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 b409e58..23f8568 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml @@ -116,6 +116,7 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d WHERE 1=1 and shipment.platForm=#{SESSION_PLATFORM} and shipment.status!='CANCEL' + and (#{SESSION_USERS_NAME} = 'admin' or shipment.operator = #{SESSION_USERS_NAME}) and ((/~shipment.operatorDate :{shipment.operatorDate} ~/=shipment.operatorDate) or ( /~ordersAll: {ordersAll} = true~/ )) /~shipment.code: AND shipment.code like upper({shipment.code})~/ /~shipment.transportType: AND shipment.transportType = {shipment.transportType}~/ 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 d8f4f0f..bbab29b 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml @@ -114,6 +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 (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/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml index e2cac6c..fc85cf9 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml @@ -103,6 +103,7 @@ left join orders.toLocation.city.zone toZone left join orders.routeFee WHERE pf = #{SESSION_PLATFORM} and orders.isShortBarge=false + and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME}) and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ )) /~order.code: AND orders.code like {order.code}~/ /~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/ 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 a913dc8..f78f687 100644 --- a/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml @@ -100,6 +100,7 @@ left join orders.contractor as pf left join orders.extends1 vt1 where orders.contractor = #{SESSION_PLATFORM} + and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME}) and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ )) /~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/ /~orders.signNo: AND orders.signNo LIKE {orders.signNo}~/ 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 0f03f2f..0208e51 100644 --- a/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml @@ -63,10 +63,9 @@ orders.toName, orders.status, orders.arriveTime, - ov.license, - ov.vehicleTypeName, - ov.driver_name, - ov.driver_phone, + orders.vehicleCode, + orders.expectLicense, + orders.driverName, orders.carPeople, orders.costStatus, orders.unit, @@ -85,17 +84,19 @@ orders.mailTime, orders.description, orders.imageStatus, + orders.updateInfo.operatorName, 'ORDER', 'ORDER' - FROM Order orders,OrderLegsView ov + FROM Order orders left join orders.contractor as pf left join orders.fromLocation as of left join orders.toLocation as ot left join orders.routeFee - left join orders.extends1 vt1 - where orders.contractor = #{SESSION_PLATFORM} and ov.id=orders.id - and orders.status !='CANCEL' - and (orders.status !='SIGNED' or (/~isAll: {isAll} = true~/)) + left join orders.extends1 vt1 + where orders.contractor = #{SESSION_PLATFORM} + and orders.status !='CANCEL' + and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME}) + and (orders.status !='SIGNED' or (/~isAll: {isAll} = true~/)) /~date1: and (DATE_FORMAT(orders.planFromDate,'%Y-%m-%d') >= #{CLIENT_DATE_SESSION} or (orders.planFromDate) >= {date1})~/ /~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/ /~ov.carrierName: AND (ov.shCarrierName LIKE {ov.carrierName} or ov.gysCarrierName LIKE {ov.carrierName})~/ @@ -131,7 +132,6 @@ order by orders.planFromDate desc,orders.id desc ]]> - @@ -154,6 +154,7 @@ order by orders.planFromDate desc,orders.id desc ]]> + 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 eec6a16..8e03c18 100644 --- a/target/cqtms/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml +++ b/target/cqtms/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml @@ -99,6 +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}) /~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/maintainOrderLegsDedicatedPage.xml b/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml index e0ae26f..2abdcd9 100644 --- a/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml +++ b/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml @@ -90,6 +90,7 @@ s 1)) + and (#{SESSION_USERS_NAME} = 'admin' or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME}) /~l.ecNo: and upper(l.ecNo) like upper({l.ecNo})~/ /~orders.consignor.id: and l.consignor.id = {orders.consignor.id}~/ /~l.fromContact.address: and l.fromContact.address like {l.fromContact.address}~/ 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 d8f4f0f..bbab29b 100644 --- a/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml +++ b/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml @@ -114,6 +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 (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/shipment/shipmentOrderQueryPage.xml b/target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml index e2cac6c..fc85cf9 100644 --- a/target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml +++ b/target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml @@ -103,6 +103,7 @@ left join orders.toLocation.city.zone toZone left join orders.routeFee WHERE pf = #{SESSION_PLATFORM} and orders.isShortBarge=false + and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME}) and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ )) /~order.code: AND orders.code like {order.code}~/ /~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/ diff --git a/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml b/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml index a913dc8..f78f687 100644 --- a/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml +++ b/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml @@ -100,6 +100,7 @@ left join orders.contractor as pf left join orders.extends1 vt1 where orders.contractor = #{SESSION_PLATFORM} + and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME}) and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ )) /~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/ /~orders.signNo: AND orders.signNo LIKE {orders.signNo}~/ diff --git a/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml b/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml index 0f03f2f..0208e51 100644 --- a/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml +++ b/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml @@ -63,10 +63,9 @@ orders.toName, orders.status, orders.arriveTime, - ov.license, - ov.vehicleTypeName, - ov.driver_name, - ov.driver_phone, + orders.vehicleCode, + orders.expectLicense, + orders.driverName, orders.carPeople, orders.costStatus, orders.unit, @@ -85,17 +84,19 @@ orders.mailTime, orders.description, orders.imageStatus, + orders.updateInfo.operatorName, 'ORDER', 'ORDER' - FROM Order orders,OrderLegsView ov + FROM Order orders left join orders.contractor as pf left join orders.fromLocation as of left join orders.toLocation as ot left join orders.routeFee - left join orders.extends1 vt1 - where orders.contractor = #{SESSION_PLATFORM} and ov.id=orders.id - and orders.status !='CANCEL' - and (orders.status !='SIGNED' or (/~isAll: {isAll} = true~/)) + left join orders.extends1 vt1 + where orders.contractor = #{SESSION_PLATFORM} + and orders.status !='CANCEL' + and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME}) + and (orders.status !='SIGNED' or (/~isAll: {isAll} = true~/)) /~date1: and (DATE_FORMAT(orders.planFromDate,'%Y-%m-%d') >= #{CLIENT_DATE_SESSION} or (orders.planFromDate) >= {date1})~/ /~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/ /~ov.carrierName: AND (ov.shCarrierName LIKE {ov.carrierName} or ov.gysCarrierName LIKE {ov.carrierName})~/ @@ -131,7 +132,6 @@ order by orders.planFromDate desc,orders.id desc ]]> - @@ -154,6 +154,7 @@ order by orders.planFromDate desc,orders.id desc ]]> +