增加成本审核查询
huojin\hj
parent
7c85c3882d
commit
b3374362a0
|
|
@ -41,7 +41,13 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
|
||||||
<text id="shipment.operator" title="inputByName" row="7" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
<text id="shipment.operator" title="inputByName" row="7" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
||||||
<text id="shipment.customerName" title="shipment.customerName" row="7" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
<text id="shipment.customerName" title="shipment.customerName" row="7" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
||||||
|
|
||||||
<checkbox id="isAll" title="isAll" row="8" col="1" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
|
<list id="shipment.costStatus" title="成本审核" row="8" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="FeeStatus" >
|
||||||
|
<hql><![CDATA[ SELECT
|
||||||
|
enumerate.enumValue,
|
||||||
|
enumerate.enumValue From Enumerate enumerate
|
||||||
|
where enumerate.enumType = 'FeeStatus' and enumerate.enumValue in('OPEN','SUBMIT_CHECK','CHECK') order by enumerate.id asc ]]></hql>
|
||||||
|
</list>
|
||||||
|
<checkbox id="isAll" title="isAll" row="9" col="1" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
|
||||||
</inputUIs>
|
</inputUIs>
|
||||||
</search>
|
</search>
|
||||||
<datasource type="hql"><![CDATA[ SELECT
|
<datasource type="hql"><![CDATA[ SELECT
|
||||||
|
|
@ -99,6 +105,7 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
|
||||||
/~endDate1: AND (shipment.operatorDate) <= {endDate1}~/
|
/~endDate1: AND (shipment.operatorDate) <= {endDate1}~/
|
||||||
/~shipment.operator: AND shipment.operator like {shipment.operator}~/
|
/~shipment.operator: AND shipment.operator like {shipment.operator}~/
|
||||||
/~shipment.customerName: AND shipment.customer.name like {shipment.customerName}~/
|
/~shipment.customerName: AND shipment.customer.name like {shipment.customerName}~/
|
||||||
|
/~shipment.costStatus: AND shipment.costStatus = {shipment.costStatus}~/
|
||||||
order by shipment.id desc
|
order by shipment.id desc
|
||||||
]]></datasource>
|
]]></datasource>
|
||||||
<columns>
|
<columns>
|
||||||
|
|
|
||||||
|
|
@ -1,163 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<pages>
|
|
||||||
<maintainPage id="maintainShipmentCDFeeViewPage" title="maintainShipmentCDFeeViewPage" autoQuery="false">
|
|
||||||
<search>
|
|
||||||
<inputUIs>
|
|
||||||
<text id="shipment.code" title="shipment.code" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
|
||||||
<text id="shipment.relatebill3" title="relatebill3" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
|
||||||
<remote id="shipment.carrier.id" title="shipment.carrier" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="3" percentSignPosition="both" displayedTableHead="序号,编码,名称">
|
|
||||||
<hql><![CDATA[ select
|
|
||||||
carrier.id,
|
|
||||||
carrier.code,
|
|
||||||
carrier.name
|
|
||||||
from Organization carrier
|
|
||||||
where carrier.disabled=false
|
|
||||||
and (carrier.code like upper(:param) or carrier.name like :param )
|
|
||||||
and (carrier.beCarrier = true
|
|
||||||
or carrier.beInCarrier=true)
|
|
||||||
and (carrier.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org = #{SESSION_PLATFORM})
|
|
||||||
or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org.code = #{PUBLIC_PLATFORM}))
|
|
||||||
/~carrier.name: and carrier.name like {carrier.name}~/
|
|
||||||
order by carrier.sortIndex asc,carrier.id asc
|
|
||||||
]]></hql>
|
|
||||||
<inputUIs>
|
|
||||||
<text id="carrier.name" title="maintainShipmentPage.carrier.name" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
|
||||||
</inputUIs>
|
|
||||||
</remote>
|
|
||||||
<text id="vehicle.license" title="vehicle.license" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
|
||||||
<dateRanger id="shipment.operatorDate" title="lfv.sdate" row="3" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="startDate" toDate="endDate"/>
|
|
||||||
<remote id="shipment.routeFee.id" title="order.routeFee.name" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="3" percentSignPosition="both" displayedTableHead="序号,代码,名称">
|
|
||||||
<hql><![CDATA[ select d.id,d.code,d.name
|
|
||||||
from RouteFee d
|
|
||||||
where (d.code like upper(:param) or d.name like :param)
|
|
||||||
and d.disabled=false and d.platForm=#{SESSION_PLATFORM}
|
|
||||||
/~d.name: and d.name like {d.name}~/]]></hql>
|
|
||||||
<inputUIs>
|
|
||||||
<text id="d.name" title="maintainVehicleRegFeePage.department.name" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
|
|
||||||
</inputUIs>
|
|
||||||
</remote>
|
|
||||||
<text id="shipment.driverName" title="shipment.driver" row="5" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
|
||||||
<dateRanger id="shipment.orderDate" title="order.orderDate" row="6" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="startDate1" toDate="endDate1"/>
|
|
||||||
<text id="shipment.operator" title="inputByName" row="7" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
|
||||||
<text id="shipment.customerName" title="shipment.customerName" row="7" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
|
||||||
|
|
||||||
<checkbox id="isAll" title="isAll" row="8" col="1" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
|
|
||||||
</inputUIs>
|
|
||||||
</search>
|
|
||||||
<datasource type="hql"><![CDATA[ SELECT
|
|
||||||
shipment.id,
|
|
||||||
shipment.code,
|
|
||||||
shipment.customer.name,
|
|
||||||
carrier.shortName,
|
|
||||||
shipment.license,
|
|
||||||
shipment.vehicleType.name,
|
|
||||||
shipment.driverName,
|
|
||||||
shipment.secondDriverName,
|
|
||||||
shipment.costStatus,
|
|
||||||
CAST(round(shipment.payfee,2) as string),
|
|
||||||
shipment.orderGroupCode,
|
|
||||||
shipment.fromContact.address,
|
|
||||||
shipment.toContact.address,
|
|
||||||
shipment.routeFee.name,
|
|
||||||
shipment.superviseType,
|
|
||||||
shipment.unit,
|
|
||||||
shipment.quantity,
|
|
||||||
CAST(round(shipment.weight,2) as string),
|
|
||||||
CAST(round(shipment.volume,2) as string),
|
|
||||||
shipment.planLeaveTime,
|
|
||||||
shipment.planArriveTime,
|
|
||||||
shipment.leaveTime,
|
|
||||||
shipment.arriveTime,
|
|
||||||
shipment.description,
|
|
||||||
shipment.operatorDate,
|
|
||||||
shipment.operator
|
|
||||||
FROM Shipment shipment
|
|
||||||
left JOIN shipment.carrier carrier
|
|
||||||
left JOIN shipment.driver driver
|
|
||||||
left JOIN shipment.vehicle vehicle
|
|
||||||
left join shipment.vehicleType vt
|
|
||||||
left join shipment.routeFee routeFee
|
|
||||||
left join shipment.vehicleType
|
|
||||||
left join shipment.customer
|
|
||||||
WHERE 1=1
|
|
||||||
AND shipment.platForm= #{SESSION_PLATFORM}
|
|
||||||
and ((shipment.costStatus in ('SUBMIT_CHECK') and shipment.costStatus!='OPEN' )
|
|
||||||
or ( /~isAll: {isAll} = true~/ and shipment.costStatus!='OPEN' ))
|
|
||||||
/~shipment.code: AND shipment.code like upper({shipment.code})~/
|
|
||||||
/~shipment.status: AND shipment.status = {shipment.status}~/
|
|
||||||
/~shipment.planLeaveTime: AND shipment.planLeaveTime = {shipment.planLeaveTime}~/
|
|
||||||
/~shipment.planArriveTime: AND shipment.planArriveTime = {shipment.planArriveTime}~/
|
|
||||||
/~shipment.carrier.id: AND shipment.carrier.id = {shipment.carrier.id}~/
|
|
||||||
/~vehicle.license: AND shipment.vehicle.license <= {vehicle.license}~/
|
|
||||||
/~shipment.payfee: AND shipment.payfee <= {shipment.payfee}~/
|
|
||||||
/~shipment.relatebill3: AND upper(shipment.orderGroupCode) like upper({shipment.relatebill3})~/
|
|
||||||
/~shipment.driverName: AND shipment.driverName like {shipment.driverName}~/
|
|
||||||
/~shipment.routeFee.id: AND shipment.routeFee.id = {shipment.routeFee.id}~/
|
|
||||||
/~startDate: AND (shipment.operatorDate) >= {startDate}~/
|
|
||||||
/~endDate: AND (shipment.operatorDate) <= {endDate}~/
|
|
||||||
/~startDate1: AND (shipment.operatorDate) >= {startDate1}~/
|
|
||||||
/~endDate1: AND (shipment.operatorDate) <= {endDate1}~/
|
|
||||||
/~shipment.operator: AND shipment.operator like {shipment.operator}~/
|
|
||||||
/~shipment.customerName: AND shipment.customer.name like {shipment.customerName}~/
|
|
||||||
order by shipment.id desc
|
|
||||||
]]></datasource>
|
|
||||||
<columns>
|
|
||||||
<column id="shipment.id" title="shipment.id" visible="false" horizonAlign="center" verticalAlign="middle" />
|
|
||||||
<column id="shipment.code" title="shipment.code" visible="true" horizonAlign="left" verticalAlign="middle" />
|
|
||||||
<column id="shipment.customerName" title="shipment.customerName" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.carrier.name" title="shipment.carrier" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.license" title="maintainShipmentPage.vehicle.license" width="80" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.vehicleType.name" title="sendCar.vehicleType.name" width="80" visible="true" horizonAlign="center" verticalAlign="middle" />
|
|
||||||
<column id="shipment.driver.name" title="shipment.driver" width="80" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.secondDriverName" title="secondDriverName" width="80" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.costStatus" title="shipment.costStatus" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="FeeStatus"/>
|
|
||||||
<column id="shipment.payfee" title="shipment.payfee" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.orderGroupCode" title="orders.relateBill3" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.fromContact.address" title="fromAddress" visible="true" horizonAlign="left" verticalAlign="middle" />
|
|
||||||
<column id="shipment.toContact.address" title="toAddress" visible="true" horizonAlign="left" verticalAlign="middle" />
|
|
||||||
<column id="shipment.routeFee.name" title="shipment.routeFee.name" visible="true" horizonAlign="center" verticalAlign="middle" />
|
|
||||||
<column id="shipment.superviseType" title="orders.superviseType" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="SuperviseType"/>
|
|
||||||
<column id="shipment.unit" title="orders.unit" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="MeasureUnit"/>
|
|
||||||
<column id="shipment.quantity" title="shipment.quantity" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.weight" title="shipment.weight" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.volume" title="shipment.volume" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.planLeaveTime" title="shipment.planLeaveTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.planArriveTime" title="shipment.planArriveTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.leaveTime" title="shipment.leaveTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.arriveTime" title="shipment.arriveTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.description" title="shipment.description" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.operatorDate" title="lfv.sdate" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="shipment.operator" title="updateInfo.operatorName" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
</columns>
|
|
||||||
<buttons>
|
|
||||||
<commit id="shipmentPayCheck" title="orderPayCheck" enableType="multi" invisible="false">
|
|
||||||
<enableExpression><![CDATA[ (${shipment.costStatus} == 'SUBMIT_CHECK' ) ]]></enableExpression>
|
|
||||||
<mappings>
|
|
||||||
<mapping id="ids" className="list"/>
|
|
||||||
</mappings>
|
|
||||||
<actions>
|
|
||||||
<action managerName="orderShipmentManager" methodName="shipmentPayCheck" parameter="ids"/>
|
|
||||||
</actions>
|
|
||||||
<forwards>
|
|
||||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
|
||||||
</forwards>
|
|
||||||
</commit>
|
|
||||||
<commit id="shipmentPayCancelCheck" title="orderPayCancelCheck" enableType="multi" invisible="false">
|
|
||||||
<enableExpression><![CDATA[ (${shipment.costStatus} == 'CHECK')]]></enableExpression>
|
|
||||||
<mappings>
|
|
||||||
<mapping id="ids" className="list"/>
|
|
||||||
</mappings>
|
|
||||||
<actions>
|
|
||||||
<action managerName="orderShipmentManager" methodName="shipmentPayCancelCheck" parameter="ids"/>
|
|
||||||
</actions>
|
|
||||||
<forwards>
|
|
||||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
|
||||||
</forwards>
|
|
||||||
</commit>
|
|
||||||
<popup id="viewShipmentPayFee" title="viewOrderPayFee" enableType="single" invisible="false" containId="true" pageId="viewShipmentFeePage"/>
|
|
||||||
<popup id="avgtrimcost" title="viewavgtrimcost" enableType="single" invisible="false" containId="true" pageId="modifyAvgTrimCostViewPage">
|
|
||||||
<!-- <enableExpression><![CDATA[(${shipment.costStatus} == 'OPEN')]]></enableExpression> -->
|
|
||||||
</popup>
|
|
||||||
</buttons>
|
|
||||||
</maintainPage>
|
|
||||||
</pages>
|
|
||||||
Loading…
Reference in New Issue