调度单增加预付款费
HUOJIN\92525
parent
13607ea10d
commit
817c3fc2e0
|
|
@ -228,7 +228,7 @@ public class Shipment extends Entity {
|
|||
private double fee7=0;
|
||||
/**扩展费→卸货费*/
|
||||
private double fee8=0;
|
||||
/**扩展费*/
|
||||
/**预付款*/
|
||||
private double fee9=0;
|
||||
/**扩展费*/
|
||||
private double fee10=0;
|
||||
|
|
|
|||
|
|
@ -463,7 +463,8 @@ public class DefaultFeeManager extends DefaultBaseManager implements FeeManager
|
|||
s.setFee5(getFeeAmount(billId, BillObjectType.SHIPMENT, "其他费"));
|
||||
s.setFee6(getFeeAmount(billId, BillObjectType.SHIPMENT, "油卡费"));
|
||||
s.setFee8(getFeeAmount(billId, BillObjectType.SHIPMENT, "卸货费"));
|
||||
s.setPayfee(s.getFee1()+s.getFee2()+s.getFee3()-s.getFee5()-s.getFee6()+s.getFee4()+s.getFee8());
|
||||
s.setFee9(getFeeAmount(billId, BillObjectType.SHIPMENT, "预付款"));
|
||||
s.setPayfee(s.getFee1()+s.getFee2()+s.getFee3()-s.getFee5()-s.getFee6()+s.getFee4()+s.getFee8()-s.getFee9());
|
||||
s.setFee7(s.getFee1()+s.getFee2()+s.getFee3()+s.getFee4()+s.getFee8());
|
||||
s.setDescription(s.getDescription());
|
||||
commonDao.store(s);
|
||||
|
|
@ -2500,6 +2501,7 @@ public class DefaultFeeManager extends DefaultBaseManager implements FeeManager
|
|||
saveInputFee(id, billObject, null, "油卡费", shipment.getFee6());
|
||||
saveInputFee(id, billObject, null, "待时费", shipment.getFee4());
|
||||
saveInputFee(id, billObject, null, "卸货费", shipment.getFee8());
|
||||
saveInputFee(id, billObject, null, "预付款", shipment.getFee9());
|
||||
refreshBillFee(id, billObject, Boolean.TRUE);
|
||||
String des="运输费"+shipment.getFee1()+";提货费"+shipment.getFee2()+";送货费"+shipment.getFee3()+";其他费"+shipment.getFee5()+";油卡费"+shipment.getFee6()+";待时费"+shipment.getFee4()+";卸货费"+shipment.getFee8();
|
||||
operationHisManager.storeOperationHis(shipment.getId(), shipment.getCode(), null, des, "成本维护", "录入",null,null,shipment.getQuantity(),shipment.getWeight(),shipment.getVolume(),0, des, "TMS");
|
||||
|
|
|
|||
|
|
@ -97,8 +97,9 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
|
|||
shipment.quantity,
|
||||
CAST(round(shipment.fee7,2) as string),
|
||||
CAST(round(shipment.fee6,2) as string),
|
||||
CAST(round(shipment.fee9,2) as string),
|
||||
CAST(round(shipment.fee5,2) as string),
|
||||
CAST(round(shipment.payfee,2) as string),
|
||||
CAST(round(shipment.otherFee,2) as string),
|
||||
CAST(round(shipment.weight,2) as string),
|
||||
CAST(round(shipment.volume,2) as string),
|
||||
shipment.transportType,
|
||||
|
|
@ -157,8 +158,9 @@ order by shipment.operatorDate desc
|
|||
<column id="shipment.quantity" title="quantity" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="shipment.fee7" title="shipment.fee7" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="shipment.fee6" title="feeName.jjf" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="shipment.fee9" title="预付款" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="shipment.fee5" title="其他费" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="shipment.payfee" title="shipment.payfee" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="shipment.otherFee" title="shipment.otherFee" visible="true" width="60" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="shipment.weight" title="weight" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="shipment.volume" title="volume" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="shipment.transportType" title="shipment.transportType" width="80" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,18 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<modifyDetailPage id="modifyInputLegsFee" title="modifyInputLegsFee" entityClass="com.dev.stms.server.model.shipment.Shipment" onClose="refreshParent" width="960" height="500">
|
||||
<modifyDetailPage id="modifyInputLegsFee" title="modifyInputLegsFee"
|
||||
entityClass="com.dev.stms.server.model.shipment.Shipment" onClose="refreshParent" width="960"
|
||||
height="500">
|
||||
<modify>
|
||||
<inputUIs>
|
||||
<hidden id="shipment.id" reserve="false"/>
|
||||
<hidden id="shipment.status" reserve="false"/>
|
||||
<hidden id="shipment.costStatus" reserve="false"/>
|
||||
<remote id="shipment.carrier.id" title="shipment.carrier" row="1" col="2" span="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false" editModel="uneditable" manualEditable="true" displayColumn="3" percentSignPosition="both" displayedTableHead="序号,编码,名称">
|
||||
<hidden id="shipment.costStatus" reserve="false"/>
|
||||
<remote id="shipment.carrier.id" title="shipment.carrier" row="1" col="2" span="1" readOnly="false"
|
||||
required="true" reserve="false" forceOverride="true" inVisible="false" editModel="uneditable"
|
||||
manualEditable="true" displayColumn="3" percentSignPosition="both"
|
||||
displayedTableHead="序号,编码,名称">
|
||||
<hql><![CDATA[ select
|
||||
carrier.id,
|
||||
carrier.code,
|
||||
|
|
@ -21,10 +26,14 @@
|
|||
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.beInCarrier desc,carrier.beCarrier desc]]></hql>
|
||||
<inputUIs>
|
||||
<text id="carrier.name" title="editShipmentPage.carrier.name" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
|
||||
<text id="carrier.name" title="editShipmentPage.carrier.name" row="1" col="1" span="1"
|
||||
readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"
|
||||
trimSpace="true" isPrecision="false"/>
|
||||
</inputUIs>
|
||||
</remote>
|
||||
<remote id="shipment.vehicle.id" title="shipment.vehicle" row="1" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,车牌号,车型">
|
||||
<remote id="shipment.vehicle.id" title="shipment.vehicle" row="1" col="3" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true"
|
||||
displayColumn="2" percentSignPosition="both" displayedTableHead="序号,车牌号,车型">
|
||||
<hql><![CDATA[ select
|
||||
vehicle.id,
|
||||
vehicle.license,
|
||||
|
|
@ -43,24 +52,33 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
|
|||
/~vehicle.license: and vehicle.license like {vehicle.license}~/
|
||||
]]></hql>
|
||||
<inputUIs>
|
||||
<text id="vehicle.license" title="editShipmentPage.vehicle.license" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
|
||||
<text id="vehicle.license" title="editShipmentPage.vehicle.license" row="2" col="2" span="1"
|
||||
readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"
|
||||
trimSpace="true" isPrecision="false"/>
|
||||
</inputUIs>
|
||||
</remote>
|
||||
<text id="shipment.license" title="editShipmentPage.shipment.license" row="1" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
|
||||
<list id="shipment.unit" title="orders.unit" row="1" col="4" span="1" width="120" readOnly="true" required="false" reserve="false" forceOverride="true" enumType="MeasureUnit" >
|
||||
<text id="shipment.license" title="editShipmentPage.shipment.license" row="1" col="4" span="1"
|
||||
readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"
|
||||
trimSpace="true" isPrecision="true"/>
|
||||
<list id="shipment.unit" title="orders.unit" row="1" col="4" span="1" width="120" readOnly="true"
|
||||
required="false" reserve="false" forceOverride="true" enumType="MeasureUnit">
|
||||
<hql><![CDATA[ SELECT
|
||||
enumerate.enumValue,
|
||||
enumerate.enumValue From Enumerate enumerate
|
||||
where enumerate.enumType = 'MeasureUnit' and enumerate.enumValue in ('VEHICLETYPE','WEIGHT','TICKET') order by enumerate.id]]></hql>
|
||||
</list>
|
||||
<list id="shipment.vehicleType.id" title="sendCar.vehicleType.name" row="2" col="1" span="1" width="120" readOnly="false" required="false" defaultValue="${bb}" reserve="false" forceOverride="true" forceSpace="false" multiple="false" inVisible="false">
|
||||
<list id="shipment.vehicleType.id" title="sendCar.vehicleType.name" row="2" col="1" span="1" width="120"
|
||||
readOnly="false" required="false" defaultValue="${bb}" reserve="false" forceOverride="true"
|
||||
forceSpace="false" multiple="false" inVisible="false">
|
||||
<hql><![CDATA[select d.id,d.name
|
||||
from VehicleType d
|
||||
where d.disabled=false
|
||||
order by d.name,d.id
|
||||
]]></hql>
|
||||
</list>
|
||||
<remote id="shipment.driver.id" title="shipment.driver" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,名称">
|
||||
<remote id="shipment.driver.id" title="shipment.driver" row="2" col="2" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true"
|
||||
displayColumn="2" percentSignPosition="both" displayedTableHead="序号,名称">
|
||||
<hql><![CDATA[ select
|
||||
driver.id,
|
||||
driver.name,
|
||||
|
|
@ -74,15 +92,30 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
|
|||
<eventListener id="shipment.driverPhone" index="4" refreshUI="false"/>
|
||||
</eventListeners>
|
||||
<inputUIs>
|
||||
<text id="driver.name" title="editShipmentPage.driver.name" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
|
||||
<text id="driver.name" title="editShipmentPage.driver.name" row="1" col="1" span="1"
|
||||
readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"
|
||||
trimSpace="true" isPrecision="false"/>
|
||||
</inputUIs>
|
||||
</remote>
|
||||
<text id="shipment.driverName" title="driver.name" row="2" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
|
||||
<text id="shipment.driverPhone" title="editShipmentPage.shipment.driverPhone" row="2" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
|
||||
<text id="shipment.quantity" title="shipment.quantity" row="3" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true" decimal="0"/>
|
||||
<text id="shipment.weight" title="shipment.weight" row="3" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" decimal="2" isPrecision="true"/>
|
||||
<text id="shipment.volume" title="shipment.volume" row="3" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" decimal="2" isPrecision="true"/>
|
||||
<remote id="shipment.secondDriver.id" title="shipment.secondDriver" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,名称">
|
||||
<text id="shipment.driverName" title="driver.name" row="2" col="3" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"
|
||||
isPrecision="true"/>
|
||||
<text id="shipment.driverPhone" title="editShipmentPage.shipment.driverPhone" row="2" col="4" span="1"
|
||||
readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"
|
||||
trimSpace="true" isPrecision="true"/>
|
||||
<text id="shipment.quantity" title="shipment.quantity" row="3" col="2" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"
|
||||
isPrecision="true" decimal="0"/>
|
||||
<text id="shipment.weight" title="shipment.weight" row="3" col="3" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"
|
||||
decimal="2" isPrecision="true"/>
|
||||
<text id="shipment.volume" title="shipment.volume" row="3" col="4" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"
|
||||
decimal="2" isPrecision="true"/>
|
||||
<remote id="shipment.secondDriver.id" title="shipment.secondDriver" row="3" col="1" span="1"
|
||||
readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"
|
||||
manualEditable="true" displayColumn="2" percentSignPosition="both"
|
||||
displayedTableHead="序号,名称">
|
||||
<hql><![CDATA[ select
|
||||
driver.id,
|
||||
driver.name,
|
||||
|
|
@ -92,23 +125,51 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
|
|||
where driver.disabled=false
|
||||
and driver.name like :param and driver.platForm= #{SESSION_PLATFORM} ]]></hql>
|
||||
<inputUIs>
|
||||
<text id="driver.name" title="editShipmentPage.driver.name" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
|
||||
<text id="driver.name" title="editShipmentPage.driver.name" row="1" col="1" span="1"
|
||||
readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"
|
||||
trimSpace="true" isPrecision="false"/>
|
||||
</inputUIs>
|
||||
</remote>
|
||||
<text id="shipment.payfee" title="shipment.payfee" row="4" col="1" span="1" readOnly="true" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true" validator="number" returnType="Double" decimal="2" />
|
||||
<text id="shipment.otherFee" title="shipment.otherFee" row="4" col="2" span="1" readOnly="true" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true" validator="number" returnType="Double" decimal="2" />
|
||||
<text id="shipment.description" title="shipment.description" row="5" col="1" span="4" width="740" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
|
||||
<numberText id="shipment.fee1" title="feeName.ysf" row="8" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee2" title="feeName.thf" row="8" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee3" title="feeName.shf" row="8" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee4" title="feeName.dsf" row="8" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee8" title="feeName.xhf" row="9" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee5" title="feeName.qtf" row="9" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee6" title="feeName.jjf" row="9" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2"/>
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<text id="shipment.payfee" title="shipment.payfee" row="4" col="1" span="1" readOnly="true"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"
|
||||
isPrecision="true" validator="number" returnType="Double" decimal="2"/>
|
||||
<text id="shipment.otherFee" title="shipment.otherFee" row="4" col="2" span="1" readOnly="true"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"
|
||||
isPrecision="true" validator="number" returnType="Double" decimal="2"/>
|
||||
<text id="shipment.description" title="shipment.description" row="5" col="1" span="4" width="740"
|
||||
readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"
|
||||
trimSpace="true" isPrecision="true"/>
|
||||
<numberText id="shipment.fee1" title="feeName.ysf" row="8" col="1" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
|
||||
returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee2" title="feeName.thf" row="8" col="2" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
|
||||
returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee3" title="feeName.shf" row="8" col="3" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
|
||||
returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee4" title="feeName.dsf" row="8" col="4" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
|
||||
returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee8" title="feeName.xhf" row="9" col="1" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
|
||||
returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee5" title="feeName.qtf" row="9" col="2" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
|
||||
returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee6" title="feeName.jjf" row="9" col="3" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
|
||||
returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee9" title="预付款" row="9" col="4" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
|
||||
returnType="Double" decimal="2"/>
|
||||
|
||||
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="saveShipmentFee" title="saveShipmentFee" enableType="none" invisible="false">
|
||||
<enableExpression><![CDATA[(${shipment.status}!='CANCEL')&&${shipment.costStatus} == 'OPEN']]></enableExpression>
|
||||
<enableExpression>
|
||||
<![CDATA[(${shipment.status}!='CANCEL')&&${shipment.costStatus} == 'OPEN']]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="shipment" className="com.dev.stms.server.model.shipment.Shipment"/>
|
||||
</mappings>
|
||||
|
|
@ -119,8 +180,10 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
|
|||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="saveShipmentFeeAndClose" title="saveShipmentFeeAndClose" enableType="none" invisible="false">
|
||||
<enableExpression><![CDATA[(${shipment.status}!='CANCEL')&&${shipment.costStatus} == 'OPEN']]></enableExpression>
|
||||
<commit id="saveShipmentFeeAndClose" title="saveShipmentFeeAndClose" enableType="none"
|
||||
invisible="false">
|
||||
<enableExpression>
|
||||
<![CDATA[(${shipment.status}!='CANCEL')&&${shipment.costStatus} == 'OPEN']]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="shipment" className="com.dev.stms.server.model.shipment.Shipment"/>
|
||||
</mappings>
|
||||
|
|
@ -132,11 +195,11 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
|
|||
<forward name="closeWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<!-- <popup id="shipmentOtherFee" title="shipmentOtherFee" enableType="none" invisible="false" containId="false" pageId="editInputShipmentOtherFeePage"> -->
|
||||
<!-- <enableExpression><![CDATA[${shipment.costStatus} == 'OPEN' ]]></enableExpression> -->
|
||||
<!-- </popup> -->
|
||||
<!-- <popup id="shipmentOtherFee" title="shipmentOtherFee" enableType="none" invisible="false" containId="false" pageId="editInputShipmentOtherFeePage"> -->
|
||||
<!-- <enableExpression><![CDATA[${shipment.costStatus} == 'OPEN' ]]></enableExpression> -->
|
||||
<!-- </popup> -->
|
||||
</buttons>
|
||||
|
||||
|
||||
</modify>
|
||||
<detail autoQuery="false">
|
||||
<datasource><![CDATA[ SELECT
|
||||
|
|
@ -165,35 +228,47 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
|
|||
<columns>
|
||||
<column id="legs.id" title="legs.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.ecNo" title="legs.ecNo" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.consignor.name" title="shipment.customerName" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.fromContact.address" title="fromAddress" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.toContact.address" title="toAddress" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.consignor.name" title="shipment.customerName" visible="true" horizonAlign="center"
|
||||
verticalAlign="middle"/>
|
||||
<column id="legs.fromContact.address" title="fromAddress" visible="true" horizonAlign="center"
|
||||
verticalAlign="middle"/>
|
||||
<column id="legs.toContact.address" title="toAddress" visible="true" horizonAlign="center"
|
||||
verticalAlign="middle"/>
|
||||
<column id="legs.toName" title="l.toName" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
||||
<column id="legs.quantity" title="legs.quantity" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.weight" title="legs.weight" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.volume" title="legs.volume" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.payfee" title="legs.payfee" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.otherFee" title="legs.otherFee" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.fee1" title="legs.fee1" visible="true" width="80" horizonAlign="center" verticalAlign="middle" inputUI="text" />
|
||||
<column id="legs.fee2" title="legs.fee2" visible="true" width="80" horizonAlign="center" verticalAlign="middle" inputUI="text"/>
|
||||
<column id="order.superviseType" width="80" title="orders.superviseType" visible="true" horizonAlign="center" verticalAlign="middle" format="colourZDFormatter" />
|
||||
<column id="legs.order.description" title="order.description" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.quantity" title="legs.quantity" width="60" visible="true" horizonAlign="center"
|
||||
verticalAlign="middle"/>
|
||||
<column id="legs.weight" title="legs.weight" visible="true" width="60" horizonAlign="center"
|
||||
verticalAlign="middle"/>
|
||||
<column id="legs.volume" title="legs.volume" visible="true" width="60" horizonAlign="center"
|
||||
verticalAlign="middle"/>
|
||||
<column id="legs.payfee" title="legs.payfee" visible="true" width="60" horizonAlign="center"
|
||||
verticalAlign="middle"/>
|
||||
<column id="legs.otherFee" title="legs.otherFee" visible="true" width="60" horizonAlign="center"
|
||||
verticalAlign="middle"/>
|
||||
<column id="legs.fee1" title="legs.fee1" visible="true" width="80" horizonAlign="center"
|
||||
verticalAlign="middle" inputUI="text"/>
|
||||
<column id="legs.fee2" title="legs.fee2" visible="true" width="80" horizonAlign="center"
|
||||
verticalAlign="middle" inputUI="text"/>
|
||||
<column id="order.superviseType" width="80" title="orders.superviseType" visible="true"
|
||||
horizonAlign="center" verticalAlign="middle" format="colourZDFormatter"/>
|
||||
<column id="legs.order.description" title="order.description" visible="true" horizonAlign="center"
|
||||
verticalAlign="middle"/>
|
||||
</columns>
|
||||
<buttons>
|
||||
<commit id="saveLegsFee" title="saveLegsFee" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[${shipment.costStatus} == 'OPEN' ]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="shipment.id" className="long"/>
|
||||
<mapping id="map" className="map"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="shipmentManager" methodName="saveLegsFee" parameter="shipment.id,map"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshParent" newEnabled="true" editEnabled="true"/>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="saveLegsFee" title="saveLegsFee" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[${shipment.costStatus} == 'OPEN' ]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="shipment.id" className="long"/>
|
||||
<mapping id="map" className="map"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="shipmentManager" methodName="saveLegsFee" parameter="shipment.id,map"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshParent" newEnabled="true" editEnabled="true"/>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</detail>
|
||||
</modifyDetailPage>
|
||||
|
|
|
|||
|
|
@ -1,324 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- 调度单管理-->
|
||||
<pages>
|
||||
<maintainPage id="maintainShipmentAllPage" title="maintainShipmentAllPage" autoQuery="false">
|
||||
<search>
|
||||
<inputUIs>
|
||||
<text id="shipment.code" title="shipment.code" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
||||
<text id="shipment.relatebill3" title="relatebill3" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
||||
<list id="shipment.status" title="shipment.status" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="ShipmentStatus">
|
||||
<hql><![CDATA[ SELECT
|
||||
enumerate.enumValue,
|
||||
enumerate.enumValue From Enumerate enumerate
|
||||
where enumerate.enumType = 'ShipmentStatus'
|
||||
and enumerate.enumValue not in ('UNAVAILABLE','AVAILABLE','LEAVEWH')
|
||||
order by enumerate.id]]></hql>
|
||||
</list>
|
||||
<list id="shipment.transportType" title="shipment.transportType" row="1" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
|
||||
<hql><![CDATA[ SELECT
|
||||
c.name,
|
||||
c.name
|
||||
FROM CommonCode c
|
||||
WHERE c.disabled=0 and c.codeType='调度方式' order by c.id asc
|
||||
]]></hql>
|
||||
</list>
|
||||
<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="shipment.license" title="vehicle.license" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
||||
<dateRanger id="dispatchDate" title="lfv.sdate" row="3" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="true" fromDate="beginDate" toDate="endDate"/>
|
||||
<date id="shipment.operatorDate" title="dispatchDate" row="3" span="1" readOnly="false" required="false" reserve="true" forceOverride="false" inVisible="true" showTime="false" manualEditable="false" defaultCurrentDate="true"/>
|
||||
|
||||
<date id="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="planFromDate2" title="shipmentOrderQueryPage.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"/>
|
||||
<text id="shipment.driverName" title="shipment.driver" row="5" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
||||
<text id="shipment.customerName" title="shipment.customerName" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
||||
<text id="shipment.operator" title="inputByName" row="6" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
||||
<list id="shipment.superviseType" title="orders.cargoType" row="6" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="SuperviseType" >
|
||||
<hql><![CDATA[ SELECT
|
||||
enumerate.enumValue,
|
||||
enumerate.enumValue From Enumerate enumerate
|
||||
where enumerate.enumType = 'SuperviseType' order by enumerate.id asc ]]></hql>
|
||||
</list>
|
||||
<numberText id="payfee1" title="payfee1" row="7" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/>
|
||||
<numberText id="payfee2" title="payfee2" row="7" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/>
|
||||
<numberText id="shipment.fee7" title="实际成本" row="8" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/>
|
||||
<numberText id="shipment.fee7" title="实际成本" row="8" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/>
|
||||
<text id="toAddress" title="toAddress" row="9" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
||||
<text id="fromAddress" title="fromAddress" row="9" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
||||
<checkbox id="ordersAll" title="isAll" row="16" col="1" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
|
||||
<remote id="shipment.vehicleType.id" title="sendCar.extends1.name" row="11" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,名称">
|
||||
<hql><![CDATA[ select d.id,d.name
|
||||
from VehicleType d
|
||||
where d.disabled=false and d.beDispatch=1 and d.name like :param
|
||||
order by d.sortIndex asc,d.name,d.id
|
||||
]]></hql>
|
||||
<inputUIs>
|
||||
<text id="d.name" title="editShipmentPage.driver.name" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
|
||||
</inputUIs>
|
||||
</remote>
|
||||
<list id="shipment.costStatus" title="成本审核" row="11" col="2" 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>
|
||||
<booleanList id="shipment.needSinglePrice" title="是否支付" row="12" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
|
||||
|
||||
|
||||
</inputUIs>
|
||||
</search>
|
||||
<datasource type="hql"><![CDATA[ SELECT
|
||||
shipment.id,
|
||||
DATE_FORMAT(shipment.operatorDate,'%Y-%m-%d %H:%i'),
|
||||
shipment.code,
|
||||
shipment.customer.name,
|
||||
shipment.license,
|
||||
shipment.vehicleType.name,
|
||||
shipment.driverName,
|
||||
shipment.fromContact.address,
|
||||
shipment.toContact.address,
|
||||
shipment.quantity,
|
||||
CAST(round(shipment.fee7,2) as string),
|
||||
CAST(round(shipment.fee6,2) as string),
|
||||
CAST(round(shipment.payfee,2) as string),
|
||||
CAST(round(shipment.otherFee,2) as string),
|
||||
CAST(round(shipment.weight,2) as string),
|
||||
CAST(round(shipment.volume,2) as string),
|
||||
shipment.transportType,
|
||||
shipment.status,
|
||||
shipment.description,
|
||||
shipment.operator,
|
||||
shipment.costStatus,
|
||||
shipment.needSinglePrice
|
||||
FROM Shipment shipment
|
||||
left JOIN shipment.carrier carrier
|
||||
left JOIN shipment.vehicle vehicle
|
||||
left join shipment.vehicleType vt
|
||||
left join shipment.customer
|
||||
WHERE 1=1
|
||||
and shipment.platForm=#{SESSION_PLATFORM}
|
||||
and shipment.status!='CANCEL'
|
||||
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}~/
|
||||
AND shipment.isShortBarge=false and shipment.platForm= #{SESSION_PLATFORM}
|
||||
/~planFromDate1: AND o.planFromDate >= {planFromDate1}~/
|
||||
/~planFromDate2: AND o.planFromDate<= {planFromDate2}~/
|
||||
/~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}~/
|
||||
/~shipment.payfee: AND shipment.payfee <= {shipment.payfee}~/
|
||||
/~shipment.relatebill3: AND upper(o.relateBill3) like upper({shipment.relatebill3})~/
|
||||
/~shipment.license: AND upper(shipment.license) like upper({shipment.license})~/
|
||||
/~shipment.driverName: AND shipment.driverName like {shipment.driverName}~/
|
||||
/~shipment.customerName: AND shipment.customer.name like {shipment.customerName}~/
|
||||
/~shipment.vehicleType.id: AND shipment.vehicleType.id = {shipment.vehicleType.id}~/
|
||||
/~beginDate: AND (shipment.operatorDate) >= {beginDate} ~/
|
||||
/~endDate: AND (shipment.operatorDate) <= {endDate} ~/
|
||||
/~shipment.superviseType: AND o.superviseType like {shipment.superviseType}~/
|
||||
/~fromAddress: AND shipment.fromContact.address like {fromAddress}~/
|
||||
/~toAddress: AND shipment.toContact.address like {toAddress}~/
|
||||
/~payfee1: AND shipment.payfee >= {payfee1}~/
|
||||
/~payfee2: AND shipment.payfee <= {payfee2}~/
|
||||
/~shipment.fee7: AND shipment.fee7 >= {shipment.fee7}~/
|
||||
/~shipment.fee7: AND shipment.fee7 <= {shipment.fee7}~/
|
||||
/~shipment.operator: AND shipment.operator like {shipment.operator}~/
|
||||
/~shipment.costStatus: AND shipment.costStatus = {shipment.costStatus}~/
|
||||
/~shipment.needSinglePrice: AND shipment.needSinglePrice = {shipment.needSinglePrice}~/
|
||||
order by shipment.operatorDate desc
|
||||
]]></datasource>
|
||||
<columns>
|
||||
<column id="shipment.id" title="shipment.id" visible="false" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="shipment.operatorDate" title="lfv.sdate" visible="true" horizonAlign="left" verticalAlign="middle" format="shipmentDayFormatter"/>
|
||||
<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.license" title="maintainShipmentPage.vehicle.license" width="80" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
||||
<column id="shipment.vehicleType.name" title="sendCar.vehicleType.name" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="shipment.driver.name" title="shipment.driver" width="60" 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.quantity" title="quantity" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="shipment.fee7" title="shipment.fee7" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="shipment.fee6" title="feeName.jjf" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="shipment.payfee" title="shipment.payfee" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="shipment.otherFee" title="shipment.otherFee" visible="true" width="60" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="shipment.weight" title="weight" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="shipment.volume" title="volume" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="shipment.transportType" title="shipment.transportType" width="80" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="shipment.status" title="shipment.status" width="80" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="ShipmentStatus"/>
|
||||
<column id="shipment.description" title="shipment.description" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
||||
<column id="shipment.operator" title="inputByName" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
||||
<column id="shipment.costStatus" title="shipment.costStatus" width="80" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="FeeStatus"/>
|
||||
<column id="shipment.needSinglePrice" title="是否支付" width="80" visible="true" horizonAlign="left" verticalAlign="middle" format="booleanFormat" formatParam="disabled"/>
|
||||
|
||||
</columns>
|
||||
<buttons>
|
||||
<!-- <popup id="manualCreateShipmentButton" title="maintainShipmentPage.manualCreateShipmentButton" enableType="none" invisible="false" containId="false" pageId="modifyShipmentPage"/>-->
|
||||
<popup id="view" title="view" enableType="single" invisible="false" containId="true" pageId="modifyShipmentPage">
|
||||
<!-- <enableExpression><![CDATA[(${shipment.status}=='AVAILABLE'||${shipment.status}=='OPEN')]]></enableExpression> -->
|
||||
</popup>
|
||||
<popup id="inputLegsFee" title="inputPayFee" enableType="single" invisible="false" containId="true" pageId="modifyInputLegsFee">
|
||||
<!-- <enableExpression><![CDATA[(${shipment.costStatus} == 'OPEN')]]></enableExpression> -->
|
||||
</popup>
|
||||
<popup id="legsFeeIn" title="otherFeeInput" enableType="single" invisible="false" containId="true" pageId="modifyLegsFeePage">
|
||||
<!-- <enableExpression><![CDATA[(${shipment.status}!= 'CANCEL'&& ${shipment.costStatus} == 'OPEN')]]></enableExpression> -->
|
||||
</popup>
|
||||
<!-- <commit id="activeShipment" title="maintainShipmentPage.activeShipment" enableType="multi" invisible="false">-->
|
||||
<!-- <enableExpression><![CDATA[(${shipment.status}=='UNAVAILABLE')]]></enableExpression>-->
|
||||
<!-- <mappings>-->
|
||||
<!-- <mapping id="ids" className="list"/>-->
|
||||
<!-- </mappings>-->
|
||||
<!-- <actions>-->
|
||||
<!-- <action managerName="shipmentManager" methodName="activeShipment" parameter="ids"/>-->
|
||||
<!-- </actions>-->
|
||||
<!-- <forwards>-->
|
||||
<!-- <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>-->
|
||||
<!-- </forwards>-->
|
||||
<!-- </commit>-->
|
||||
<!-- <commit id="inactiveShipment" title="maintainShipmentPage.inactive" enableType="multi" invisible="false">-->
|
||||
<!-- <enableExpression><![CDATA[(${shipment.status}=='AVAILABLE')]]></enableExpression>-->
|
||||
<!-- <mappings>-->
|
||||
<!-- <mapping id="ids" className="list"/>-->
|
||||
<!-- </mappings>-->
|
||||
<!-- <actions>-->
|
||||
<!-- <action managerName="shipmentManager" methodName="unactiveShipment" parameter="ids"/>-->
|
||||
<!-- </actions>-->
|
||||
<!-- <forwards>-->
|
||||
<!-- <forward name="refreshWindow" newEnabled="false" editEnabled="false"/>-->
|
||||
<!-- </forwards>-->
|
||||
<!-- </commit>-->
|
||||
<!-- <popup id="editfinal" title="maintainShipmentPage.editfinal" enableType="single" invisible="false" containId="true" pageId="editFinalShipmentPage"/>-->
|
||||
<!-- <popup id="printShipment" title="maintainShipmentPage.printShipment" enableType="single" invisible="false" containId="true" pageId="printShipmentPage">-->
|
||||
<!-- <enableExpression><![CDATA[(${shipment.status} != 'UNAVAILABLE') && (${shipment.status} != 'CANCEL') ]]></enableExpression>-->
|
||||
<!-- </popup>-->
|
||||
<commit id="cancel" title="maintainShipmentPage.cancel" enableType="multi" invisible="false" confirmMessage="maintainShipmentPage.cancel.confirmMessage">
|
||||
<!-- <enableExpression><![CDATA[(${shipment.status}=='AVAILABLE')]]></enableExpression>-->
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="CDShipmentManager" methodName="cancelShipment" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<!-- <popup id="vehicleMileage" title="shipSendArrivePage.vehicleMileage" enableType="single" invisible="false" containId="true" pageId="sendVehicleMileagePage"> -->
|
||||
<!-- <enableExpression><![CDATA[(${shipment.status} == 'ARRIVE')]]></enableExpression> -->
|
||||
<!-- </popup> -->
|
||||
<popup id="send" title="shipSendArrivePage.shipeMentArrivePage.send" enableType="multi" invisible="false" containId="true" pageId="editCDShipSendPage">
|
||||
<enableExpression><![CDATA[(${shipment.status} == 'AVAILABLE') ]]></enableExpression>
|
||||
</popup>
|
||||
<popup id="onroadArrive" title="arriveConfirm" enableType="multi" invisible="false" containId="true" pageId="sendArriveInformPage">
|
||||
<enableExpression><![CDATA[(${shipment.status} == 'RK_ONROAD') ||(${shipment.status} == 'ONROAD') || (${shipment.status} == 'SH_ONROAD') || (${shipment.status} == 'FH_ONROAD')||(${shipment.status} == 'ZC_ONROAD')]]></enableExpression>
|
||||
</popup>
|
||||
<commit id="batchArrive" title="batchArrive" enableType="multi" invisible="false" >
|
||||
<enableExpression><![CDATA[(${shipment.status} == 'RK_ONROAD') ||(${shipment.status} == 'ONROAD') || (${shipment.status} == 'SH_ONROAD') || (${shipment.status} == 'FH_ONROAD')||(${shipment.status} == 'ZC_ONROAD')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="shipmentManager" methodName="batchArrive" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<!-- <popup id="legsFeeIn" title="feeIn" enableType="single" invisible="false" containId="true" pageId="modifyShipmentFeePage">-->
|
||||
<!-- <enableExpression><![CDATA[(${shipment.status}!= 'CANCEL')]]></enableExpression>-->
|
||||
<!-- </popup>-->
|
||||
<!-- <commit id="shipReturn" title="shipReturn" enableType="multi" invisible="false" confirmMessage="maintainTransportBillPage.shipReturn.confirmMessage">-->
|
||||
<!-- <enableExpression><![CDATA[${shipment.status} == 'ARRIVE']]></enableExpression> -->
|
||||
<!-- <mappings>-->
|
||||
<!-- <mapping id="ids" className="list"/>-->
|
||||
<!-- </mappings>-->
|
||||
<!-- <actions>-->
|
||||
<!-- <action managerName="shipmentManager" methodName="cancelShipment" parameter="ids"/>-->
|
||||
<!-- </actions>-->
|
||||
<!-- <forwards>-->
|
||||
<!-- <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>-->
|
||||
<!-- </forwards>-->
|
||||
<!-- </commit>-->
|
||||
<popup id="shipmnetFeeIn" title="shipmnetFeeIn" enableType="single" invisible="false" containId="true" pageId="modifyShipmentFeePage">
|
||||
<!-- <enableExpression><![CDATA[(${shipment.status}!= 'CANCEL'&& ${shipment.costStatus} == 'OPEN')]]></enableExpression> -->
|
||||
</popup>
|
||||
<!-- <popup id="legsFeeIn" title="legsFeeInPut" enableType="single" invisible="false" containId="true" pageId="modifyLegsFeePage"> -->
|
||||
<!-- <enableExpression><![CDATA[(${shipment.status}!= 'CANCEL'&& ${shipment.costStatus} == 'OPEN')]]></enableExpression> -->
|
||||
<!-- </popup> -->
|
||||
<commit id="wholeStatusCheck" title="feeStatusCheck" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[ (${shipment.costStatus} == 'OPEN')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="CDShipmentManager" methodName="orderPaySubmitCheck" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="cancelCheck" title="feeStatuscancelCheck" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[ (${shipment.costStatus} == 'SUBMIT_CHECK')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="CDShipmentManager" methodName="cancelCheck" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<!-- <commit id="adjustImportance" title="adjustImportance" enableType="none" invisible="false"> -->
|
||||
<!-- <mappings> -->
|
||||
<!-- <mapping id="map" className="map"/> -->
|
||||
<!-- </mappings> -->
|
||||
<!-- <actions> -->
|
||||
<!-- <action managerName="shipmentManager" methodName="getQuantityMap" parameter="map"/> -->
|
||||
<!-- </actions> -->
|
||||
<!-- <forwards> -->
|
||||
<!-- <forward name="refreshParent" newEnabled="true" editEnabled="true"/> -->
|
||||
<!-- <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
|
||||
<!-- </forwards> -->
|
||||
<!-- </commit> -->
|
||||
<popup id="avgtrimcost" title="avgtrimcost" enableType="single" invisible="false" containId="true" pageId="modifyAvgTrimCostPage">
|
||||
<!-- <enableExpression><![CDATA[(${shipment.costStatus} == 'OPEN')]]></enableExpression> -->
|
||||
</popup>
|
||||
<!-- <popup id="SeeTrackShipment" title="seeTrack" enableType="multi" invisible="false" containId="true" pageId="modifySeeTrackShipmentPage"> -->
|
||||
<!-- <enableExpression><![CDATA[(${shipment.status} == 'UNAVAILABLE')]]></enableExpression>-->
|
||||
<!-- </popup> -->
|
||||
<!-- <popup id="PayFee" title="PayFee" enableType="none" invisible="false" containId="false" pageId="editPayFeeImportPage"/> -->
|
||||
<!-- <commit id="刷新" title="刷新" enableType="none" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="shipmentManager" methodName="shuaixin" />
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit> -->
|
||||
<!-- <popup id="刷新油卡费" title="刷新油卡费" enableType="none" invisible="false" containId="false" pageId="editYKFPage"/> -->
|
||||
<!-- <popup id="导入" title="导入" enableType="none" invisible="false" containId="false" pageId="editPayFeeImport2Page"/> -->
|
||||
|
||||
</buttons>
|
||||
</maintainPage>
|
||||
</pages>
|
||||
|
|
@ -1,200 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<modifyDetailPage id="modifyInputLegsFee" title="modifyInputLegsFee" entityClass="com.dev.stms.server.model.shipment.Shipment" onClose="refreshParent" width="960" height="500">
|
||||
<modify>
|
||||
<inputUIs>
|
||||
<hidden id="shipment.id" reserve="false"/>
|
||||
<hidden id="shipment.status" reserve="false"/>
|
||||
<hidden id="shipment.costStatus" reserve="false"/>
|
||||
<remote id="shipment.carrier.id" title="shipment.carrier" row="1" col="2" span="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false" editModel="uneditable" 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.beCarrier=true
|
||||
or carrier.beInCarrier=true)
|
||||
and (upper(carrier.code) like :param or carrier.name like :param)
|
||||
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.beInCarrier desc,carrier.beCarrier desc]]></hql>
|
||||
<inputUIs>
|
||||
<text id="carrier.name" title="editShipmentPage.carrier.name" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
|
||||
</inputUIs>
|
||||
</remote>
|
||||
<remote id="shipment.vehicle.id" title="shipment.vehicle" row="1" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,车牌号,车型">
|
||||
<hql><![CDATA[ select
|
||||
vehicle.id,
|
||||
vehicle.license,
|
||||
vehicle.vehicleType.name,
|
||||
vehicle.vehicleType.code,
|
||||
vehicle.vehicleType.id,
|
||||
m.name,
|
||||
m.idCard,
|
||||
m.contact.phone
|
||||
from Vehicle vehicle
|
||||
left join vehicle.vehicleType vt
|
||||
left join vehicle.masterDriver m
|
||||
where vehicle.disabled=false and vehicle.license like :param
|
||||
and (vehicle.status='ENABLE' or vehicle.status is null )
|
||||
and vehicle.carrier.id=${shipment.carrier.id}
|
||||
/~vehicle.license: and vehicle.license like {vehicle.license}~/
|
||||
]]></hql>
|
||||
<inputUIs>
|
||||
<text id="vehicle.license" title="editShipmentPage.vehicle.license" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
|
||||
</inputUIs>
|
||||
</remote>
|
||||
<text id="shipment.license" title="editShipmentPage.shipment.license" row="1" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
|
||||
<list id="shipment.unit" title="orders.unit" row="1" col="4" span="1" width="120" readOnly="true" required="false" reserve="false" forceOverride="true" enumType="MeasureUnit" >
|
||||
<hql><![CDATA[ SELECT
|
||||
enumerate.enumValue,
|
||||
enumerate.enumValue From Enumerate enumerate
|
||||
where enumerate.enumType = 'MeasureUnit' and enumerate.enumValue in ('VEHICLETYPE','WEIGHT','TICKET') order by enumerate.id]]></hql>
|
||||
</list>
|
||||
<list id="shipment.vehicleType.id" title="sendCar.vehicleType.name" row="2" col="1" span="1" width="120" readOnly="false" required="false" defaultValue="${bb}" reserve="false" forceOverride="true" forceSpace="false" multiple="false" inVisible="false">
|
||||
<hql><![CDATA[select d.id,d.name
|
||||
from VehicleType d
|
||||
where d.disabled=false
|
||||
order by d.name,d.id
|
||||
]]></hql>
|
||||
</list>
|
||||
<remote id="shipment.driver.id" title="shipment.driver" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,名称">
|
||||
<hql><![CDATA[ select
|
||||
driver.id,
|
||||
driver.name,
|
||||
driver.idCard,
|
||||
driver.contact.phone
|
||||
from Driver driver
|
||||
where driver.disabled=false
|
||||
and driver.name like :param and driver.platForm= #{SESSION_PLATFORM} ]]></hql>
|
||||
<eventListeners>
|
||||
<eventListener id="shipment.driverName" index="2" refreshUI="false"/>
|
||||
<eventListener id="shipment.driverPhone" index="4" refreshUI="false"/>
|
||||
</eventListeners>
|
||||
<inputUIs>
|
||||
<text id="driver.name" title="editShipmentPage.driver.name" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
|
||||
</inputUIs>
|
||||
</remote>
|
||||
<text id="shipment.driverName" title="driver.name" row="2" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
|
||||
<text id="shipment.driverPhone" title="editShipmentPage.shipment.driverPhone" row="2" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
|
||||
<text id="shipment.quantity" title="shipment.quantity" row="3" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true" decimal="0"/>
|
||||
<text id="shipment.weight" title="shipment.weight" row="3" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" decimal="2" isPrecision="true"/>
|
||||
<text id="shipment.volume" title="shipment.volume" row="3" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" decimal="2" isPrecision="true"/>
|
||||
<remote id="shipment.secondDriver.id" title="shipment.secondDriver" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,名称">
|
||||
<hql><![CDATA[ select
|
||||
driver.id,
|
||||
driver.name,
|
||||
driver.idCard,
|
||||
driver.contact.phone
|
||||
from Driver driver
|
||||
where driver.disabled=false
|
||||
and driver.name like :param and driver.platForm= #{SESSION_PLATFORM} ]]></hql>
|
||||
<inputUIs>
|
||||
<text id="driver.name" title="editShipmentPage.driver.name" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
|
||||
</inputUIs>
|
||||
</remote>
|
||||
<text id="shipment.payfee" title="shipment.payfee" row="4" col="1" span="1" readOnly="true" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true" validator="number" returnType="Double" decimal="2" />
|
||||
<text id="shipment.otherFee" title="shipment.otherFee" row="4" col="2" span="1" readOnly="true" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true" validator="number" returnType="Double" decimal="2" />
|
||||
<text id="shipment.description" title="shipment.description" row="5" col="1" span="4" width="740" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
|
||||
<numberText id="shipment.fee1" title="feeName.ysf" row="8" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee2" title="feeName.thf" row="8" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee3" title="feeName.shf" row="8" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee4" title="feeName.dsf" row="8" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee8" title="feeName.xhf" row="9" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee5" title="feeName.qtf" row="9" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.fee6" title="feeName.jjf" row="9" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2"/>
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="saveShipmentFee" title="saveShipmentFee" enableType="none" invisible="false">
|
||||
<enableExpression><![CDATA[(${shipment.status}!='CANCEL')&&${shipment.costStatus} == 'OPEN']]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="shipment" className="com.dev.stms.server.model.shipment.Shipment"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="feeManager" methodName="saveShipmetInputFee" parameter="shipment"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="saveShipmentFeeAndClose" title="saveShipmentFeeAndClose" enableType="none" invisible="false">
|
||||
<enableExpression><![CDATA[(${shipment.status}!='CANCEL')&&${shipment.costStatus} == 'OPEN']]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="shipment" className="com.dev.stms.server.model.shipment.Shipment"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="feeManager" methodName="saveShipmetInputFee" parameter="shipment"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
<forward name="closeWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<!-- <popup id="shipmentOtherFee" title="shipmentOtherFee" enableType="none" invisible="false" containId="false" pageId="editInputShipmentOtherFeePage"> -->
|
||||
<!-- <enableExpression><![CDATA[${shipment.costStatus} == 'OPEN' ]]></enableExpression> -->
|
||||
<!-- </popup> -->
|
||||
</buttons>
|
||||
|
||||
</modify>
|
||||
<detail autoQuery="false">
|
||||
<datasource><![CDATA[ SELECT
|
||||
legs.id,
|
||||
legs.ecNo,
|
||||
legs.consignor.name,
|
||||
legs.order.fromContact.address,
|
||||
legs.order.toContact.address,
|
||||
legs.order.toName,
|
||||
legs.quantity,
|
||||
CAST(round(legs.weight,2) as string),
|
||||
CAST(round(legs.volume,2) as string),
|
||||
CAST(round(legs.payfee,2) as string),
|
||||
CAST(round(legs.otherFee,2) as string),
|
||||
CAST(round(legs.fee1,2) as string),
|
||||
CAST(round(legs.fee2,2) as string),
|
||||
legs.order.superviseType,
|
||||
legs.description
|
||||
FROM Legs legs
|
||||
left join legs.fromLocation
|
||||
left join legs.toLocation
|
||||
WHERE 1=1
|
||||
/~ shipment.id: AND legs.shipment.id= {shipment.id} ~/
|
||||
ORDER BY legs.sortIndex asc,legs.id
|
||||
]]></datasource>
|
||||
<columns>
|
||||
<column id="legs.id" title="legs.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.ecNo" title="legs.ecNo" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.consignor.name" title="shipment.customerName" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.fromContact.address" title="fromAddress" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.toContact.address" title="toAddress" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.toName" title="l.toName" visible="true" horizonAlign="left" verticalAlign="middle"/>
|
||||
<column id="legs.quantity" title="legs.quantity" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.weight" title="legs.weight" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.volume" title="legs.volume" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.payfee" title="legs.payfee" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.otherFee" title="legs.otherFee" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="legs.fee1" title="legs.fee1" visible="true" width="80" horizonAlign="center" verticalAlign="middle" inputUI="text" />
|
||||
<column id="legs.fee2" title="legs.fee2" visible="true" width="80" horizonAlign="center" verticalAlign="middle" inputUI="text"/>
|
||||
<column id="order.superviseType" width="80" title="orders.superviseType" visible="true" horizonAlign="center" verticalAlign="middle" format="colourZDFormatter" />
|
||||
<column id="legs.order.description" title="order.description" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
</columns>
|
||||
<buttons>
|
||||
<commit id="saveLegsFee" title="saveLegsFee" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[${shipment.costStatus} == 'OPEN' ]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="shipment.id" className="long"/>
|
||||
<mapping id="map" className="map"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="shipmentManager" methodName="saveLegsFee" parameter="shipment.id,map"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshParent" newEnabled="true" editEnabled="true"/>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</detail>
|
||||
</modifyDetailPage>
|
||||
</pages>
|
||||
Loading…
Reference in New Issue