no message
HUOJIN\92525
parent
0f0ea4dd2b
commit
22c59653cb
|
|
@ -89,7 +89,6 @@
|
||||||
left join orders.fromCityCountiy fromCity
|
left join orders.fromCityCountiy fromCity
|
||||||
left join orders.toCityCountiy toCity
|
left join orders.toCityCountiy toCity
|
||||||
left join toCity.zone toZone
|
left join toCity.zone toZone
|
||||||
left join orders.routeFee
|
|
||||||
WHERE pf = #{SESSION_PLATFORM}
|
WHERE pf = #{SESSION_PLATFORM}
|
||||||
and (orders.status in('INPUT','AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ ))
|
and (orders.status in('INPUT','AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ ))
|
||||||
and orders.consignor.name not in('武汉大金','上海大金','大金旧件','孝感高理','一汽大众','大众','大众韵达')
|
and orders.consignor.name not in('武汉大金','上海大金','大金旧件','孝感高理','一汽大众','大众','大众韵达')
|
||||||
|
|
|
||||||
|
|
@ -1,253 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<pages>
|
|
||||||
<maintainPage id="shipmentGeneralOrderPage" title="shipmentGeneralOrderPage" autoQuery="false" height="2000">
|
|
||||||
<search>
|
|
||||||
<inputUIs>
|
|
||||||
<text id="orders.relateBill3" title="orders.relateBill3" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
|
|
||||||
<text id="orders.customerOrderNO" title="orders.customerOrderNO" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
|
|
||||||
<remote id="orders.consignor.id" title="consignor" row="2" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" displayColumn="2" editModel="uneditable" displayedTableHead="序号,简称,名称">
|
|
||||||
<hql><![CDATA[SELECT
|
|
||||||
org.id,
|
|
||||||
org.shortName,
|
|
||||||
org.name
|
|
||||||
FROM Organization org
|
|
||||||
where org.beCustomer=true
|
|
||||||
and (upper(org.code) like upper(:param) or org.name like :param)
|
|
||||||
and (org.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org = #{SESSION_PLATFORM})
|
|
||||||
or org.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org.code = #{PUBLIC_PLATFORM}))
|
|
||||||
and org.disabled=false and org.name not in('武汉大金','上海大金','大金旧件','孝感高理','一汽大众','大众','大众韵达')
|
|
||||||
]]></hql>
|
|
||||||
</remote>
|
|
||||||
<text id="orders.fromContact.address" title="fromAddress" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
|
|
||||||
<text id="orders.toContact.address" title="toAddress" row="3" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
|
|
||||||
<date id="orders.planFromDate1" title="orders.planFromDate" row="4" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
|
|
||||||
<date id="orders.planFromDate2" title="maintainOrderPage.listMaintainOrderPage.order.orderDate2" row="4" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
|
|
||||||
<dateRanger id="orders.updateInfo.updateTime" title="updateInfo.updateTime" row="5" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="startDate" toDate="endDate"/>
|
|
||||||
|
|
||||||
<list id="order.status" title="order.status" row="11" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="OrderStatus">
|
|
||||||
<hql><![CDATA[ SELECT
|
|
||||||
case when t.enumValue ='INPUT' then 'AVAILABLE' else t.enumValue end,
|
|
||||||
t.enumValue
|
|
||||||
FROM Enumerate t
|
|
||||||
WHERE t.enumType = 'OrderStatus' and t.enumValue in('ARRIVED_GOODS','DISPATCHED','ARRIVED','ONROAD','AVAILABLE','TRANS_AVAILABLE','SIGNED')
|
|
||||||
ORDER BY t.id]]></hql>
|
|
||||||
</list>
|
|
||||||
<text id="customerName" title="shipment.customerName" row="11" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
|
|
||||||
<checkbox id="ordersAll" title="ordersAll" row="16" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
|
|
||||||
<list id="order.selfDelivery" title="orders.selfDelivery" row="16" col="3" span="1" readOnly="false" required="false" reserve="true" forceOverride="true" enumType="BooleanType">
|
|
||||||
<hql><![CDATA[ SELECT
|
|
||||||
enumerate.enumValue,
|
|
||||||
enumerate.enumValue From Enumerate enumerate
|
|
||||||
where enumerate.enumType = 'BooleanType'
|
|
||||||
order by enumerate.id
|
|
||||||
]]></hql>
|
|
||||||
</list>
|
|
||||||
<!-- <checkbox id="selfDelivery" title="orders.selfDelivery" row="16" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
|
|
||||||
</inputUIs>
|
|
||||||
</search>
|
|
||||||
<datasource type="hql"><![CDATA[ SELECT
|
|
||||||
orders.id,
|
|
||||||
orders.relateBill3,
|
|
||||||
orders.customerOrderNO,
|
|
||||||
orders.consignor.name,
|
|
||||||
orders.invName,
|
|
||||||
orders.fromContact.address,
|
|
||||||
orders.toContact.address,
|
|
||||||
orders.toName,
|
|
||||||
case when orders.status ='AVAILABLE' then 'INPUT' else orders.status end ,
|
|
||||||
orders.shipmentMethod,
|
|
||||||
orders.selfDelivery,
|
|
||||||
orders.quantity,
|
|
||||||
round(orders.weight,4),
|
|
||||||
round(orders.volume,4),
|
|
||||||
orders.predictFee,
|
|
||||||
orders.containerBill,
|
|
||||||
toZone.name,
|
|
||||||
fromCity.name||'-'||toCity.name,
|
|
||||||
orders.relateBill1,
|
|
||||||
orders.predictRemark,
|
|
||||||
orders.planFromDate,
|
|
||||||
orders.planArriveTime,
|
|
||||||
orders.toContact.linkman,
|
|
||||||
orders.toContact.phone,
|
|
||||||
orders.paymentMethod,
|
|
||||||
orders.cash,
|
|
||||||
orders.deliveryMode,
|
|
||||||
orders.packUnit,
|
|
||||||
orders.description1,
|
|
||||||
orders.description,
|
|
||||||
orders.updateInfo.operatorName,
|
|
||||||
orders.updateInfo.updateTime,
|
|
||||||
'ORDER',
|
|
||||||
'ORDER'
|
|
||||||
FROM Order as orders
|
|
||||||
left join orders.orderType as ot
|
|
||||||
left join orders.contractor as pf
|
|
||||||
left join orders.fromLocation froml
|
|
||||||
left join orders.toLocation tol
|
|
||||||
left join orders.fromCityCountiy fromCity
|
|
||||||
left join orders.toCityCountiy toCity
|
|
||||||
left join toCity.zone toZone
|
|
||||||
left join orders.routeFee
|
|
||||||
WHERE pf = #{SESSION_PLATFORM}
|
|
||||||
and (orders.status in('INPUT','AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ ))
|
|
||||||
and orders.consignor.name not in('武汉大金','上海大金','大金旧件','孝感高理','一汽大众','大众','大众韵达')
|
|
||||||
/~order.code: AND orders.code like {order.code}~/
|
|
||||||
/~orders.customerOrderNO: AND upper(orders.customerOrderNO) like upper({orders.customerOrderNO})~/
|
|
||||||
/~order.status: AND orders.status = {order.status}~/
|
|
||||||
/~orders.planFromDate1: AND trunc(orders.planFromDate) >= {orders.planFromDate1}~/
|
|
||||||
/~orders.planFromDate2: AND trunc(orders.planFromDate) <= {orders.planFromDate2}~/
|
|
||||||
/~orders.consignor.id: AND orders.consignor.id = {orders.consignor.id}~/
|
|
||||||
/~orders.fromContact.address: AND orders.fromContact.address like {orders.fromContact.address}~/
|
|
||||||
/~orders.toContact.address: AND (toCity.zone.name||toCity.name||orders.toContact.address) like {orders.toContact.address}~/
|
|
||||||
/~orders.relateBill3: AND upper(orders.relateBill3) like upper({orders.relateBill3})~/
|
|
||||||
/~orders.declare: AND upper(orders.declare) like upper({orders.declare})~/
|
|
||||||
/~order.region: AND orders.region = {order.region}~/
|
|
||||||
/~customerName: AND orders.consignor.name like {customerName}~/
|
|
||||||
/~startDate: AND trunc(orders.updateInfo.updateTime) >= {startDate}~/
|
|
||||||
/~endDate: AND trunc(orders.updateInfo.updateTime) <= {endDate}~/
|
|
||||||
/~order.selfDelivery: AND ((orders.selfDelivery is not null and 'false'={order.selfDelivery} ) or (orders.selfDelivery is null and 'true'={order.selfDelivery} ))~/
|
|
||||||
order by orders.relateBill3 desc,orders.id desc
|
|
||||||
]]></datasource>
|
|
||||||
<columns>
|
|
||||||
<column id="orders.id" title="order.id" visible="false" horizonAlign="center" verticalAlign="middle" />
|
|
||||||
<column id="orders.relateBill3" width="125" title="orders.relateBill3" visible="true" horizonAlign="center" verticalAlign="middle" format="colourOrderFormatter"/>
|
|
||||||
<column id="orders.customerOrderNO" width="125" title="orders.customerOrderNO" visible="true" horizonAlign="center" verticalAlign="middle" />
|
|
||||||
<column id="orders.consignor.name" width="70" title="consignor" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="orders.invName" width="70" title="orders.invName" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="orders.fromContact.address" title="fromAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="orders.toContact.address" title="toAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="orders.toName" title="orders.toName" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="orders.status" width="60" title="order.status" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="OrderStatus"/>
|
|
||||||
<column id="orders.shipmentMethod" width="60" title="orders.shipmentMethod" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="ShipmentMethod"/>
|
|
||||||
<column id="orders.selfDelivery" width="60" title="orders.selfDelivery" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat" formatParam="selfDelivery" sortType="ASC"/>
|
|
||||||
<!-- <column id="orders.expectLicense" width="60" title="orders.expectLicense" visible="true" horizonAlign="center" verticalAlign="middle"/> -->
|
|
||||||
<column id="orders.quantity" width="60" title="quantity" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
|
||||||
<column id="orders.weight" width="70" title="weight" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
|
||||||
<column id="orders.volume" width="70" title="volume" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
|
||||||
<column id="orders.predictFee" width="70" title="orders.predictFee" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
|
||||||
<column id="orders.containerBill" width="60" title="orders.containerBill" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat" formatParam="selfDelivery" sortType="ASC"/>
|
|
||||||
<column id="toZone.name" title="toZone.name" width="60" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="siteName" title="siteName" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="orders.relateBill1" width="120" title="orders.thdh" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
|
||||||
<column id="orders.predictRemark" width="60" title="orders.predictRemark" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="orders.planFromDate" width="80" title="orders.planFromDate" visible="true" horizonAlign="center" verticalAlign="middle" format="orderDateFormatter"/>
|
|
||||||
<column id="orders.planArriveTime" width="125" title="orders.planArriveTime" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="orders.toContact.linkman" title="linkman" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="orders.toContact.phone" title="phone" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="orders.paymentMethod" title="orders.paymentMethod" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="orders.cash" title="orders.cash" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="orders.deliveryMode" title="orders.deliveryMode" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="orders.packUnit" title="orders.packUnit" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
|
|
||||||
<column id="orders.description1" title="order.description1" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="orders.description" title="order.description2" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="updateInfo.operatorName" title="inputByName" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="updateInfo.updateTime" title="updateInfo.updateTime" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
|
||||||
<column id="checkImageView" width="80" title="checkImageView" visible="true" horizonAlign="left" format="lookPictureFormatter"/>
|
|
||||||
<column id="checkImageDown" width="80" title="checkImageDown" visible="true" horizonAlign="left" format="downloadPictureFormatter" />
|
|
||||||
</columns>
|
|
||||||
<buttons>
|
|
||||||
<popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editGeneralOrderPage"/>
|
|
||||||
<popup id="edit" title="edit" enableType="single" invisible="false" containId="true" pageId="editGeneralOrderPage">
|
|
||||||
<!-- <enableExpression><![CDATA[${orders.status} == 'AVAILABLE']]></enableExpression>-->
|
|
||||||
</popup>
|
|
||||||
<!-- <popup id="editParticularly" title="editParticularly" enableType="single" invisible="false" containId="true" pageId="editLegsOrderPageTwo"> -->
|
|
||||||
<!-- </popup> -->
|
|
||||||
<!-- <popup id="printMultiOrder" title="availableAndPrintMultiOrder" enableType="multi" invisible="false" containId="true" pageId="printMultiOrderPage"/> -->
|
|
||||||
<commit id="multiAvailable" title="maintainOrderPage.availableOrderButton" enableType="multi" invisible="false">
|
|
||||||
<enableExpression><![CDATA[${orders.status} == 'INPUT' || ${orders.status} == 'CHECKED']]></enableExpression>
|
|
||||||
<mappings>
|
|
||||||
<mapping id="ids" className="list"/>
|
|
||||||
</mappings>
|
|
||||||
<actions>
|
|
||||||
<action managerName="orderManager" methodName="availableTransOrder" parameter="ids"/>
|
|
||||||
</actions>
|
|
||||||
<forwards>
|
|
||||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
|
||||||
</forwards>
|
|
||||||
</commit>
|
|
||||||
<popup id="editParticularly" title="editParticularly" enableType="single" invisible="false" containId="true" pageId="editLegsOrderPageTwo">
|
|
||||||
|
|
||||||
</popup>
|
|
||||||
|
|
||||||
<commit id="customerselfing" title="maintainOrderPage.customerSelf" enableType="single" invisible="false">
|
|
||||||
<enableExpression><![CDATA[${orders.status} == 'INPUT' ]]></enableExpression>
|
|
||||||
<mappings>
|
|
||||||
<mapping id="ids" className="list"/>
|
|
||||||
</mappings>
|
|
||||||
<actions>
|
|
||||||
<action managerName="orderManager" methodName="customerSelf" parameter="ids"/>
|
|
||||||
</actions>
|
|
||||||
<forwards>
|
|
||||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
|
||||||
</forwards>
|
|
||||||
</commit>
|
|
||||||
|
|
||||||
<commit id="cancelOrder" title="cancelOrder" enableType="multi" invisible="false" confirmMessage="maintainOrderPage.deleteOrder.confirmMessage">
|
|
||||||
<enableExpression><![CDATA[${orders.status} == 'INPUT' || ${orders.status} == 'AVAILABLE' ]]></enableExpression>
|
|
||||||
<mappings>
|
|
||||||
<mapping id="ids" className="list"/>
|
|
||||||
</mappings>
|
|
||||||
<actions>
|
|
||||||
<action managerName="orderManager" methodName="cancelOrder" parameter="ids"/>
|
|
||||||
</actions>
|
|
||||||
<forwards>
|
|
||||||
<forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
|
|
||||||
</forwards>
|
|
||||||
</commit>
|
|
||||||
<commit id="deleteOrder" title="delete" enableType="multi" invisible="false" >
|
|
||||||
<enableExpression><![CDATA[${orders.status} == 'INPUT' || ${orders.status} == 'CANCEL' ]]></enableExpression>
|
|
||||||
<mappings>
|
|
||||||
<mapping id="ids" className="list"/>
|
|
||||||
</mappings>
|
|
||||||
<actions>
|
|
||||||
<action managerName="orderManager" methodName="removeOrders" parameter="ids"/>
|
|
||||||
</actions>
|
|
||||||
<forwards>
|
|
||||||
<forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
|
|
||||||
</forwards>
|
|
||||||
</commit>
|
|
||||||
<commit id="unavailableOrderButton" title="maintainOrderPage.unAvailableOrderButton" enableType="multi" invisible="false">
|
|
||||||
<enableExpression><![CDATA[(${orders.status} == 'TRANS_AVAILABLE')]]></enableExpression>
|
|
||||||
<mappings>
|
|
||||||
<mapping id="ids" className="list"/>
|
|
||||||
</mappings>
|
|
||||||
<actions>
|
|
||||||
<action managerName="orderManager" methodName="unAvailableOrder" parameter="ids"/>
|
|
||||||
</actions>
|
|
||||||
<forwards>
|
|
||||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
|
||||||
</forwards>
|
|
||||||
</commit>
|
|
||||||
<!-- <popup id="view" title="viewOrderLegs" enableType="single" invisible="false" containId="true" pageId="viewOrderLegsPage"/> -->
|
|
||||||
<!-- -->
|
|
||||||
<!-- <popup id="showOrderDetail" title="shipmentLegsQueryPage.showOrderDetail" enableType="single" invisible="false" containId="true" pageId="showOrderDetailPage"/> -->
|
|
||||||
<!-- <popup id="lookLegs" title="shipmentLegsQueryPage.lookLegs" enableType="single" invisible="false" containId="true" pageId="lookLegsPage"/> -->
|
|
||||||
<!-- <popup id="lookLegsProduct" title="shipmentLegsQueryPage.lookLegsProduct" enableType="single" invisible="false" containId="true" pageId="lookLegsProductPage"/> -->
|
|
||||||
<!-- <popup id="packLegButton" title="shipmentLegsQueryPage.packLegButton" enableType="single" invisible="false" containId="true" pageId="modifyLegPackingPage"/> -->
|
|
||||||
-->
|
|
||||||
<popup id="printOrder" title="printOrder" enableType="multi" invisible="false" containId="true" pageId="printOrderPage"/>
|
|
||||||
<!-- <popup id="feeIn" title="feeIn" enableType="single" invisible="false" containId="true" pageId="modifyShipmentBillFeePage"/> -->
|
|
||||||
<!-- <popup id="editImportOrderPage" title="editImportOrderPage" enableType="none" invisible="false" containId="false" pageId="editImportKEJOrderPage"/> -->
|
|
||||||
<popup id="ImportCurrencyOrder" title="通用订单导入" enableType="none" invisible="false" containId="false" pageId="editImportCurrencyOrderPage"/>
|
|
||||||
<popup id="importImage" title="shipmentOrderQueryPage.importImage" enableType="single" invisible="false" containId="true" pageId="importImageDDYQPage"/>
|
|
||||||
<popup id="printOrderFd" title="printOrderFd" enableType="single" invisible="false" containId="true" pageId="printOrderFdPage"/>
|
|
||||||
<popup id="printOrderSH" title="printOrderSH" enableType="multi" invisible="false" containId="true" pageId="printOrderDeliveryPage"/>
|
|
||||||
<commit id="refreshOrderFee" title="refreshOrderFee" enableType="multi" invisible="false">
|
|
||||||
<enableExpression><![CDATA[${orders.status} != 'INPUT' && ${orders.status} != 'CHECKED']]></enableExpression>
|
|
||||||
<mappings>
|
|
||||||
<mapping id="ids" className="list"/>
|
|
||||||
</mappings>
|
|
||||||
<actions>
|
|
||||||
<action managerName="orderManager" methodName="refreshOrderFee" parameter="ids"/>
|
|
||||||
</actions>
|
|
||||||
<forwards>
|
|
||||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
|
||||||
</forwards>
|
|
||||||
</commit>
|
|
||||||
<popup id="ImportCurrencyOrderFee" title="订单费用导入" enableType="none" invisible="false" containId="false" pageId="editImportCurrencyOrderFeePage"/>
|
|
||||||
</buttons>
|
|
||||||
</maintainPage>
|
|
||||||
</pages>
|
|
||||||
Loading…
Reference in New Issue