diff --git a/src/main/java/com/dev/stms/server/model/shipment/Shipment.java b/src/main/java/com/dev/stms/server/model/shipment/Shipment.java
index 63e193d..25eb854 100644
--- a/src/main/java/com/dev/stms/server/model/shipment/Shipment.java
+++ b/src/main/java/com/dev/stms/server/model/shipment/Shipment.java
@@ -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;
diff --git a/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.java b/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.java
index a20a9f9..6b27a64 100644
--- a/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.java
+++ b/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.java
@@ -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");
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml
index 349f014..b409e58 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml
@@ -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
+
+
-
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/modifyInputLegsFee.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/modifyInputLegsFee.xml
index fd957eb..f809cf7 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipment/modifyInputLegsFee.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipment/modifyInputLegsFee.xml
@@ -1,13 +1,18 @@
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
@@ -119,8 +180,10 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
-
-
+
+
+
@@ -132,11 +195,11 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml b/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml
deleted file mode 100644
index 349f014..0000000
--- a/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml
+++ /dev/null
@@ -1,324 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- = {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
-]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/target/cqtms/WEB-INF/classes/config/origen/shipment/modifyInputLegsFee.xml b/target/cqtms/WEB-INF/classes/config/origen/shipment/modifyInputLegsFee.xml
deleted file mode 100644
index fd957eb..0000000
--- a/target/cqtms/WEB-INF/classes/config/origen/shipment/modifyInputLegsFee.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-