调度单管理：在成本维护中添加垫付车贷款；2、甲醇费；3、易流费。

支付申请管理：增加金额查询

src/main/java/com/dev/stms/server/model/shipment/Shipment.java

@@ -68,9 +68,11 @@ public class Shipment extends Entity {
 	public String getSecondDriverPhone() {
 		return secondDriverPhone;
 	}
+
 	public void setSecondDriverPhone(String secondDriverPhone) {
 		this.secondDriverPhone = secondDriverPhone;
 	}
+
 	/**
 	 * 应收费用,营业额
 	 */
@@ -79,10 +81,6 @@ public class Shipment extends Entity {
 	 * 应付费用--车辆成本
 	 */
 	private double payfee = 0.0;
-	/**
-	 * 盈利
-	 */
-	private double profit = 0.0;
 
 	/**
 	 * 应付其他费用
@@ -119,7 +117,6 @@ public class Shipment extends Entity {
 	private String secondDriverIdentity;// 副司机身份证号
 	private String license;// 车牌号
 	private String driverPhone;// 司机电话
-	private double imprest = 0D;	//供应商成本
 
 	private Date dispatchTime;// 派车时间
 	private Date arriveWHTime;// 入库时间
@@ -129,7 +126,6 @@ public class Shipment extends Entity {
 	private Date leaveTime; // 出发时间
 	private Date arriveTime; // 实际到达时间
 
-
 	/** 业务类型 */
 	private String businessType;
 	/** 车型 */
@@ -230,174 +226,231 @@ public class Shipment extends Entity {
 	private double fee8 = 0;
 	/** 预付款 */
 	private double fee9 = 0;
-	/**扩展费*/
+	/** 扩展费--垫付车贷款 */
 	private double fee10 = 0;
-	
+	/** 供应商成本--甲醇费 */
+	private double imprest = 0D;
+	/** 盈利--易流费 */
+	private double profit = 0.0;
 
 	public double getFee1() {
 		return fee1;
 	}
+
 	public void setFee1(double fee1) {
 		this.fee1 = fee1;
 	}
+
 	public double getFee2() {
 		return fee2;
 	}
+
 	public void setFee2(double fee2) {
 		this.fee2 = fee2;
 	}
+
 	public double getFee3() {
 		return fee3;
 	}
+
 	public void setFee3(double fee3) {
 		this.fee3 = fee3;
 	}
+
 	public double getFee4() {
 		return fee4;
 	}
+
 	public void setFee4(double fee4) {
 		this.fee4 = fee4;
 	}
+
 	public double getFee5() {
 		return fee5;
 	}
+
 	public void setFee5(double fee5) {
 		this.fee5 = fee5;
 	}
+
 	public double getFee6() {
 		return fee6;
 	}
+
 	public void setFee6(double fee6) {
 		this.fee6 = fee6;
 	}
+
 	public double getFee7() {
 		return fee7;
 	}
+
 	public void setFee7(double fee7) {
 		this.fee7 = fee7;
 	}
+
 	public double getFee8() {
 		return fee8;
 	}
+
 	public void setFee8(double fee8) {
 		this.fee8 = fee8;
 	}
+
 	public double getFee9() {
 		return fee9;
 	}
+
 	public void setFee9(double fee9) {
 		this.fee9 = fee9;
 	}
+
+	
 	public double getFee10() { 
 		return fee10; 
 	}
+	  
 	public void setFee10(double fee10) { 
 		this.fee10 = fee10; 
 	}
+	 
+
 	public Date getLoadingTime() {
 		return loadingTime;
 	}
+
 	public void setLoadingTime(Date loadingTime) {
 		this.loadingTime = loadingTime;
 	}
+
 	public Organization getUnloadingCompany() {
 		return unloadingCompany;
 	}
+
 	public void setUnloadingCompany(Organization unloadingCompany) {
 		this.unloadingCompany = unloadingCompany;
 	}
+
 	public String getShipmentDepartment() {
 		return shipmentDepartment;
 	}
+
 	public void setShipmentDepartment(String shipmentDepartment) {
 		this.shipmentDepartment = shipmentDepartment;
 	}
+
 	public String getDeliveryMode() {
 		return deliveryMode;
 	}
+
 	public void setDeliveryMode(String deliveryMode) {
 		this.deliveryMode = deliveryMode;
 	}
+
 	public String getTransportType() {
 		return transportType;
 	}
+
 	public void setTransportType(String transportType) {
 		this.transportType = transportType;
 	}
+
 	public Date getOrderDate() {
 		return orderDate;
 	}
+
 	public void setOrderDate(Date orderDate) {
 		this.orderDate = orderDate;
 	}
+
 	public String getCostStatus() {
 		return costStatus;
 	}
+
 	public void setCostStatus(String costStatus) {
 		this.costStatus = costStatus;
 	}
+
 	public String getTurnoverStatus() {
 		return turnoverStatus;
 	}
+
 	public void setTurnoverStatus(String turnoverStatus) {
 		this.turnoverStatus = turnoverStatus;
 	}
+
 	public boolean isWhetherVent() {
 		return whetherVent;
 	}
+
 	public void setWhetherVent(boolean whetherVent) {
 		this.whetherVent = whetherVent;
 	}
+
 	public boolean isWhetherSign() {
 		return whetherSign;
 	}
+
 	public void setWhetherSign(boolean whetherSign) {
 		this.whetherSign = whetherSign;
 	}
+
 	public boolean isGuard() {
 		return guard;
 	}
+
 	public void setGuard(boolean guard) {
 		this.guard = guard;
 	}
+
 	public boolean isWaitTime() {
 		return waitTime;
 	}
+
 	public void setWaitTime(boolean waitTime) {
 		this.waitTime = waitTime;
 	}
+
 	public boolean isCheck() {
 		return check;
 	}
+
 	public void setCheck(boolean check) {
 		this.check = check;
 	}
+
 	public boolean isOther() {
 		return other;
 	}
+
 	public void setOther(boolean other) {
 		this.other = other;
 	}
 
-	
 	public int getPrintCount() {
 		return printCount;
 	}
+
 	public void setPrintCount(int printCount) {
 		this.printCount = printCount;
 	}
+
 	public Organization getActualCarrier() {
 		return actualCarrier;
 	}
+
 	public void setActualCarrier(Organization actualCarrier) {
 		this.actualCarrier = actualCarrier;
 	}
+
 	public double getOtherFee() {
 		return otherFee;
 	}
+
 	public void setOtherFee(double otherFee) {
 		this.otherFee = otherFee;
 	}
+
 //	public String getCustomerCode() {
 //		return customerCode;
 //	}
@@ -407,407 +460,540 @@ public class Shipment extends Entity {
 	public String getSuperviseType() {
 		return superviseType;
 	}
+
 	public void setSuperviseType(String superviseType) {
 		this.superviseType = superviseType;
 	}
+
 	public String getUnit() {
 		return unit;
 	}
+
 	public void setUnit(String unit) {
 		this.unit = unit;
 	}
+
 	public double getTurnover() {
 		return turnover;
 	}
+
 	public void setTurnover(double turnover) {
 		this.turnover = turnover;
 	}
+
 	public String getOperator() {
 		return operator;
 	}
+
 	public void setOperator(String operator) {
 		this.operator = operator;
 	}
+
 	public Date getOperatorDate() {
 		return operatorDate;
 	}
+
 	public void setOperatorDate(Date operatorDate) {
 		this.operatorDate = operatorDate;
 	}
+
 	public double getQuantityFee() {
 		return quantityFee;
 	}
+
 	public void setQuantityFee(double quantityFee) {
 		this.quantityFee = quantityFee;
 	}
+
 	public double getWeightFee() {
 		return weightFee;
 	}
+
 	public void setWeightFee(double weightFee) {
 		this.weightFee = weightFee;
 	}
+
 	public double getVolumeFee() {
 		return volumeFee;
 	}
+
 	public void setVolumeFee(double volumeFee) {
 		this.volumeFee = volumeFee;
 	}
+
 	public RouteFee getRouteFee() {
 		return routeFee;
 	}
+
 	public void setRouteFee(RouteFee routeFee) {
 		this.routeFee = routeFee;
 	}
+
 	public int getVehicleMileage() {
 		return vehicleMileage;
 	}
+
 	public void setVehicleMileage(int vehicleMileage) {
 		this.vehicleMileage = vehicleMileage;
 	}
+
 	public String getCargoManifest() {
 		return cargoManifest;
 	}
+
 	public void setCargoManifest(String cargoManifest) {
 		this.cargoManifest = cargoManifest;
 	}
+
 	public String getFeeDetail() {
 		return feeDetail;
 	}
+
 	public void setFeeDetail(String feeDetail) {
 		this.feeDetail = feeDetail;
 	}
+
 	public boolean isNeedBackVehicle() {
 		return needBackVehicle;
 	}
+
 	public void setNeedBackVehicle(boolean needBackVehicle) {
 		this.needBackVehicle = needBackVehicle;
 	}
+
 	public boolean isNeedSinglePrice() {
 		return needSinglePrice;
 	}
+
 	public void setNeedSinglePrice(boolean needSinglePrice) {
 		this.needSinglePrice = needSinglePrice;
 	}
+
 	public CarrierServiceType getServiceType() {
 		return serviceType;
 	}
+
 	public void setServiceType(CarrierServiceType serviceType) {
 		this.serviceType = serviceType;
 	}
+
 	public Date getArriveWHTime() {
 		return arriveWHTime;
 	}
+
 	public void setArriveWHTime(Date arriveWHTime) {
 		this.arriveWHTime = arriveWHTime;
 	}
+
 	public Date getDispatchTime() {
 		return dispatchTime;
 	}
+
 	public void setDispatchTime(Date dispatchTime) {
 		this.dispatchTime = dispatchTime;
 	}
+
 	public Date getLeaveWHTime() {
 		return leaveWHTime;
 	}
+
 	public void setLeaveWHTime(Date leaveWHTime) {
 		this.leaveWHTime = leaveWHTime;
 	}
+
+	
 	public double getImprest() { 
 		return imprest; 
 	}
+	  
 	public void setImprest(double imprest) { 
 		this.imprest = imprest; 
 	}
+	 
 	public String getLicense() {
 		return license;
 	}
+
 	public String getDriverPhone() {
 		return driverPhone;
 	}
+
 	public void setDriverPhone(String driverPhone) {
 		this.driverPhone = driverPhone;
 	}
+
 	public void setLicense(String license) {
 		this.license = license;
 	}
+
 	public Organization getPlatForm() {
 		return platForm;
 	}
+
 	public void setPlatForm(Organization platForm) {
 		this.platForm = platForm;
 	}
+
 	public String getGps() {
 		return gps;
 	}
+
 	public void setGps(String gps) {
 		this.gps = gps;
 	}
+
 	public UpdateInfo getUpdateInfo() {
 		return updateInfo;
 	}
+
 	public void setUpdateInfo(UpdateInfo updateInfo) {
 		this.updateInfo = updateInfo;
 	}
+
 	public Date getArriveTime() {
 		return arriveTime;
 	}
+
 	public void setArriveTime(Date arriveTime) {
 		this.arriveTime = arriveTime;
 	}
+
 	public Date getBalanceTime() {
 		return balanceTime;
 	}
+
 	public void setBalanceTime(Date balanceTime) {
 		this.balanceTime = balanceTime;
 	}
+
 	public Organization getCarrier() {
 		return carrier;
 	}
+
 	public void setCarrier(Organization carrier) {
 		this.carrier = carrier;
 	}
+
 	public String getCode() {
 		return code;
 	}
+
 	public void setCode(String code) {
 		this.code = code;
 	}
+
 	public String getCurrentPosition() {
 		return currentPosition;
 	}
+
 	public void setCurrentPosition(String currentPosition) {
 		this.currentPosition = currentPosition;
 	}
+
 	public String getDescription() {
 		return description;
 	}
+
 	public void setDescription(String description) {
 		this.description = description;
 	}
+
 	public Set<Legs> getDetails() {
 		return details;
 	}
+
 	public void setDetails(Set<Legs> details) {
 		this.details = details;
 	}
+
 	public int getDistance() {
 		return distance;
 	}
+
 	public void setDistance(int distance) {
 		this.distance = distance;
 	}
+
 	public Driver getDriver() {
 		return driver;
 	}
+
 	public void setDriver(Driver driver) {
 		this.driver = driver;
 	}
+
 	public String getDriverName() {
 		return driverName;
 	}
+
 	public void setDriverName(String driverName) {
 		this.driverName = driverName;
 	}
+
 	public double getExpense() {
 		return expense;
 	}
+
 	public void setExpense(double expense) {
 		this.expense = expense;
 	}
+
 	public String getFromCode() {
 		return fromCode;
 	}
+
 	public void setFromCode(String fromCode) {
 		this.fromCode = fromCode;
 	}
+
 	public Contact getFromContact() {
 		return fromContact;
 	}
+
 	public void setFromContact(Contact fromContact) {
 		this.fromContact = fromContact;
 	}
+
 	public TransLocation getFromLocation() {
 		return fromLocation;
 	}
+
 	public void setFromLocation(TransLocation fromLocation) {
 		this.fromLocation = fromLocation;
 	}
+
 	public String getFromName() {
 		return fromName;
 	}
+
 	public void setFromName(String fromName) {
 		this.fromName = fromName;
 	}
+
 	public Date getLeaveTime() {
 		return leaveTime;
 	}
+
 	public void setLeaveTime(Date leaveTime) {
 		this.leaveTime = leaveTime;
 	}
+
 	public String getLoading() {
 		return loading;
 	}
+
 	public void setLoading(String loading) {
 		this.loading = loading;
 	}
+
 	public Date getPlanArriveTime() {
 		return planArriveTime;
 	}
+
 	public void setPlanArriveTime(Date planArriveTime) {
 		this.planArriveTime = planArriveTime;
 	}
+
 	public void setPlanArriveTime(String planArriveTime) {
 		this.planArriveTime = DateUtil.formatDateYMD_HM(planArriveTime);
 	}
+
 	public Date getPlanLeaveTime() {
 		return planLeaveTime;
 	}
+
 	public void setPlanLeaveTime(Date planLeaveTime) {
 		this.planLeaveTime = planLeaveTime;
 	}
+
 	public void setPlanLeaveTime(String planLeaveTime) {
 		this.planLeaveTime = DateUtil.formatDateYMD_HM(planLeaveTime);
 	}
+
 	public int getPoints() {
 		return points;
 	}
+
 	public void setPoints(int points) {
 		this.points = points;
 	}
+
 	public Date getPositionTime() {
 		return positionTime;
 	}
+
 	public void setPositionTime(Date positionTime) {
 		this.positionTime = positionTime;
 	}
+
 	public boolean isPrinted() {
 		return printed;
 	}
+
 	public void setPrinted(boolean printed) {
 		this.printed = printed;
 	}
+
 	public double getQuantity() {
 		return quantity;
 	}
+
 	public void setQuantity(double quantity) {
 		this.quantity = quantity;
 	}
+
 	public Driver getSecondDriver() {
 		return secondDriver;
 	}
+
 	public void setSecondDriver(Driver secondDriver) {
 		this.secondDriver = secondDriver;
 	}
+
 	public String getSecondDriverName() {
 		return secondDriverName;
 	}
+
 	public void setSecondDriverName(String secondDriverName) {
 		this.secondDriverName = secondDriverName;
 	}
+
 	public String getShipmentMethod() {
 		return shipmentMethod;
 	}
+
 	public void setShipmentMethod(String shipmentMethod) {
 		this.shipmentMethod = shipmentMethod;
 	}
+
 	public String getStatus() {
 		return status;
 	}
+
 	public void setStatus(String status) {
 		this.status = status;
 	}
+
 	public int getTimes() {
 		return times;
 	}
+
 	public void setTimes(int times) {
 		this.times = times;
 	}
+
 	public String getToCode() {
 		return toCode;
 	}
+
 	public void setToCode(String toCode) {
 		this.toCode = toCode;
 	}
+
 	public Contact getToContact() {
 		return toContact;
 	}
+
 	public void setToContact(Contact toContact) {
 		this.toContact = toContact;
 	}
+
 	public TransLocation getToLocation() {
 		return toLocation;
 	}
+
 	public void setToLocation(TransLocation toLocation) {
 		this.toLocation = toLocation;
 	}
+
 	public String getToName() {
 		return toName;
 	}
+
 	public void setToName(String toName) {
 		this.toName = toName;
 	}
+
 	public String getTracer() {
 		return tracer;
 	}
+
 	public void setTracer(String tracer) {
 		this.tracer = tracer;
 	}
+
 	public Vehicle getVehicle() {
 		return vehicle;
 	}
+
 	public void setVehicle(Vehicle vehicle) {
 		this.vehicle = vehicle;
 	}
+
 	public double getVolume() {
 		return volume;
 	}
+
 	public void setVolume(double volume) {
 		this.volume = volume;
 	}
+
 	public double getWeight() {
 		return weight;
 	}
+
 	public void setWeight(double weight) {
 		this.weight = weight;
 	}
+
 	public String getCarrierTrackCode() {
 		return carrierTrackCode;
 	}
+
 	public void setCarrierTrackCode(String carrierTrackCode) {
 		this.carrierTrackCode = carrierTrackCode;
 	}
+
 	public String getDriverIdentityCard() {
 		return driverIdentityCard;
 	}
+
 	public void setDriverIdentityCard(String driverIdentityCard) {
 		this.driverIdentityCard = driverIdentityCard;
 	}
+
 	public String getSecondDriverIdentity() {
 		return secondDriverIdentity;
 	}
+
 	public void setSecondDriverIdentity(String secondDriverIdentity) {
 		this.secondDriverIdentity = secondDriverIdentity;
 	}
 
-	
 	public Organization getCustomer() {
 		return customer;
 	}
+
 	public void setCustomer(Organization customer) {
 		this.customer = customer;
 	}
+
 	public OrderType getOrderType() {
 		return orderType;
 	}
+
 	public void setOrderType(OrderType orderType) {
 		this.orderType = orderType;
 	}
+
 	public boolean isChecked() {
 		return checked;
 	}
+
 	public void setChecked(boolean checked) {
 		this.checked = checked;
 	}
+
 	public boolean equals(final Object other) {
 		if (!(other instanceof Shipment))
 			return false;
@@ -854,7 +1040,6 @@ public class Shipment extends Entity {
 		return false;
 	}
 
-
 	public boolean isSameReceiver(Legs legs) {
 		for (Legs leg : details) {
 			if (leg.getToCode() != null && legs.getToCode() != null && leg.getToCode().equals(legs.getToCode())
@@ -902,6 +1087,7 @@ public class Shipment extends Entity {
 			addLegsCascade(leg);
 		}
 	}
+
 	public void addLegsCascade(Legs leg) {
 		leg.setShipment(this);
 		details.add(leg);
@@ -931,6 +1117,7 @@ public class Shipment extends Entity {
 
 	/**
 	 * 添加Legs至手工创建调度单
+	 * 
 	 * @param legs
 	 */
 	public void addLegsToManualShip(Legs legs) {
@@ -964,7 +1151,6 @@ public class Shipment extends Entity {
 		resetSortIndex();
 	}
 
-	
 	public void resetSortIndex() {
 		List<Legs> sortLegs = sortDetailsIndex();
 		Legs startleg = sortLegs.get(0);
@@ -987,6 +1173,7 @@ public class Shipment extends Entity {
 
 	/**
 	 * 重置手工创建调度单上的出发地与目的地
+	 * 
 	 * @param legs
 	 */
 	public void resetShipmentLocation() {
@@ -1074,7 +1261,6 @@ public class Shipment extends Entity {
 		this.setPoints(points);
 	}
 
-	
 	public void moveToSortIndex(int srcSortIndex, int sortIndex) {
 		if (srcSortIndex == sortIndex || sortIndex > getMaxSortIndex())
 			return;
@@ -1082,8 +1268,7 @@ public class Shipment extends Entity {
 		for (Legs l : sortDetailsIndex()) {
 			if (l.getSortIndex() == srcSortIndex) {
 				l.setSortIndex(sortIndex);
-			}
+			} else if (flag) {
-			else if(flag){
 				if (l.getSortIndex() < srcSortIndex && l.getSortIndex() >= sortIndex) {
 					l.setSortIndex(l.getSortIndex() + (srcSortIndex - sortIndex));
 				}
@@ -1094,9 +1279,11 @@ public class Shipment extends Entity {
 			}
 		}
 	}
+
 	public Date getBillDate() {
 		return billDate;
 	}
+
 	public void setBillDate(Date billDate) {
 		this.billDate = billDate;
 	}
@@ -1137,6 +1324,7 @@ public class Shipment extends Entity {
 
 	/**
 	 * 处理在途填报节点的填报周期时间
+	 * 
 	 * @param date 在途填报节点的预计完成时间
 	 * @return 填报周期时间
 	 */
@@ -1167,21 +1355,28 @@ public class Shipment extends Entity {
 	public String getBusinessType() {
 		return businessType;
 	}
+
 	public void setBusinessType(String businessType) {
 		this.businessType = businessType;
 	}
+
 	public boolean isInTown() {
-		return (this.getToLocation() != null && this.getFromLocation().getCity().equals(this.getToLocation().getCity()));
+		return (this.getToLocation() != null
+				&& this.getFromLocation().getCity().equals(this.getToLocation().getCity()));
 	}
+
 	public VehicleType getVehicleType() {
 		return vehicleType;
 	}
+
 	public void setVehicleType(VehicleType vehicleType) {
 		this.vehicleType = vehicleType;
 	}
+
 	public String getOrderGroupCode() {
 		return orderGroupCode;
 	}
+
 	public void setOrderGroupCode(String orderGroupCode) {
 		this.orderGroupCode = orderGroupCode;
 	}
@@ -1189,27 +1384,37 @@ public class Shipment extends Entity {
 	public Boolean getIsShortBarge() {
 		return isShortBarge;
 	}
+
 	public void setIsShortBarge(Boolean isShortBarge) {
 		this.isShortBarge = isShortBarge;
 	}
+
 	public double getReceivefee() {
 		return receivefee;
 	}
+
 	public void setReceivefee(double receivefee) {
 		this.receivefee = receivefee;
 	}
+
 	public double getPayfee() {
 		return payfee;
 	}
+
 	public void setPayfee(double payfee) {
 		this.payfee = payfee;
 	}
+
+	
 	public double getProfit() { 
 		return profit; 
 	}
+	  
 	public void setProfit(double profit) { 
 		this.profit = profit; 
 	}
+	
+
 	public Map<String, Object> getClientMap() {
 		Map<String, Object> result = new HashMap<String, Object>();
 		result.put("shipment.id", getId());
@@ -1247,7 +1452,6 @@ public class Shipment extends Entity {
 		result.put("shipment.planLeaveTime", planLeaveTime);
 		result.put("shipment.planArriveTime", planArriveTime);
 		result.put("shipment.needSinglePrice", needSinglePrice);
-		result.put("shipment.imprest",imprest);
 		result.put("shipment.expense", expense);
 		result.put("shipment.needBackVehicle", needBackVehicle);
 		result.put("shipment.description", description);

src/main/java/com/dev/stms/server/service/fee/pojo/DefaultBillFeeManager.java

@@ -321,10 +321,10 @@ public class DefaultBillFeeManager extends DefaultBaseManager implements BillFee
 	public void Refresh(Long BillFeeID){
 		BillFee b = commonDao.load(BillFee.class,BillFeeID);
 		List<Object> Objects1 =  commonDao.findByQuery("select COALESCE(sum(f.totalFee),0) from Fee f "
-				+ " where f.billFee.id =:id and f.feeName.name not in ('其他费','油卡费','预付款') ",
+				+ " where f.billFee.id =:id and f.feeName.name not in ('其他费','油卡费','预付款','垫付车贷款','甲醇费','易流费') ",
 				new String[] { "id"},new Object[] {BillFeeID});
 		List<Object> Objects2 =  commonDao.findByQuery("select COALESCE(sum(f.totalFee),0) from Fee f "
-				+ " where f.billFee.id =:id and f.feeName.name in ('其他费','油卡费','预付款') ",
+				+ " where f.billFee.id =:id and f.feeName.name in ('其他费','油卡费','预付款','垫付车贷款','甲醇费','易流费') ",
 				new String[] { "id"},new Object[] {BillFeeID});
 		b.setTotalFee((Double)Objects1.get(0)-(Double)Objects2.get(0));
 	    commonDao.store(b);

src/main/java/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.java

@@ -464,7 +464,10 @@ public class DefaultFeeManager extends DefaultBaseManager implements FeeManager
 			s.setFee6(getFeeAmount(billId, BillObjectType.SHIPMENT, "油卡费"));
 			s.setFee8(getFeeAmount(billId, BillObjectType.SHIPMENT, "卸货费"));
 			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.setFee10(getFeeAmount(billId, BillObjectType.SHIPMENT, "垫付车贷款"));
+			s.setImprest(getFeeAmount(billId, BillObjectType.SHIPMENT, "甲醇费"));
+			s.setProfit(getFeeAmount(billId, BillObjectType.SHIPMENT, "易流费"));
+			s.setPayfee(s.getFee1()+s.getFee2()+s.getFee3()-s.getFee5()-s.getFee6()+s.getFee4()+s.getFee8()-s.getFee9()-s.getFee10()-s.getImprest()-s.getProfit());
 			s.setFee7(s.getFee1()+s.getFee2()+s.getFee3()+s.getFee4()+s.getFee8());
 			s.setDescription(s.getDescription());
 			commonDao.store(s);
@@ -2505,8 +2508,11 @@ public class DefaultFeeManager extends DefaultBaseManager implements FeeManager
 		saveInputFee(id, billObject, null, "待时费", shipment.getFee4());
 		saveInputFee(id, billObject, null, "卸货费", shipment.getFee8());
 		saveInputFee(id, billObject, null, "预付款", shipment.getFee9());
+		saveInputFee(id, billObject, null, "垫付车贷款", shipment.getFee10());
+		saveInputFee(id, billObject, null, "甲醇费", shipment.getImprest());
+		saveInputFee(id, billObject, null, "易流费", shipment.getProfit());
 		refreshBillFee(id, billObject, Boolean.TRUE);
-		String des="运输费"+shipment.getFee1()+";提货费"+shipment.getFee2()+";送货费"+shipment.getFee3()+";其他费"+shipment.getFee5()+";油卡费"+shipment.getFee6()+";待时费"+shipment.getFee4()+";卸货费"+shipment.getFee8();
+		String des="运输费"+shipment.getFee1()+";提货费"+shipment.getFee2()+";送货费"+shipment.getFee3()+";其他费"+shipment.getFee5()+";油卡费"+shipment.getFee6()+";待时费"+shipment.getFee4()+";卸货费"+shipment.getFee8()+";预付费"+shipment.getFee9()+";垫付车贷款"+shipment.getFee10()+";甲醇费"+shipment.getImprest()+";易流费"+shipment.getProfit();
 		operationHisManager.storeOperationHis(shipment.getId(), shipment.getCode(), null, des, "成本维护", "录入",null,null,shipment.getQuantity(),shipment.getWeight(),shipment.getVolume(),0, des, "TMS");
 	}
 	static Date sdate=new Date();

src/main/java/com/dev/stms/server/service/shipment/pojo/DefaultOrderShipmentManager.java

@@ -127,7 +127,6 @@ public class DefaultOrderShipmentManager extends DefaultBaseManager implements
 					deleteOpFee(shipment);
 					shipment.setPayfee(0);
 					shipment.setTurnover(0);
-					shipment.setProfit(0);
 					shipment.setStatus(ShipmentStatus.CANCEL);
 					if (shipment.getVehicle() != null) {
 						Vehicle v=shipment.getVehicle();

src/webapp/WEB-INF/classes/config/origen/fee/maintainApplyPaymentPage.xml

@@ -5,6 +5,8 @@
         <search>
             <inputUIs>
                 <text id="applyBill.applicant" title="applyBill.applicant" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
+                <numberText id="applyBill.applicationFee" title="applyBill.applicationFee" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"  validator="number" returnType="Double" decimal="2" />
+                
 <!--               	<text id="applyBill.department.name" title="applyBill.department" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/> -->
 <!--              	<text id="applyBill.status" title="applyBill.status" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>-->
 <!--             	<list id="applyBill.generalDepartment.id" title="applyBill.generalDepartment" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" editModel="uneditable"> -->
@@ -69,6 +71,7 @@
 /~applyBill.generalDepartment.id: AND applyBill.generalDepartment.id = {applyBill.generalDepartment.id}~/
  /~applyBill.status: AND applyBill.status like {applyBill.status}~/
  /~account.id: AND applyBill.consignor.id = {account.id}~/
+ /~applyBill.applicationFee: AND applyBill.applicationFee = {applyBill.applicationFee}~/
  /~applyBill.invoiceNo: AND upper(applyBill.invoiceNo) like upper({applyBill.invoiceNo})~/
  ]]></datasource>
         <columns>

src/webapp/WEB-INF/classes/config/origen/shipment/modifyInputLegsFee.xml

@@ -163,7 +163,15 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
                 <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"/>
-                   
+                <numberText id="shipment.fee10" title="垫付车贷款" row="10" col="1" span="1" readOnly="false"
+                            required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
+                            returnType="Double" decimal="2"/>
+                <numberText id="shipment.imprest" title="甲醇费" row="10" col="2" span="1" readOnly="false"
+                            required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
+                            returnType="Double" decimal="2"/>
+                <numberText id="shipment.profit" title="易流费" row="10" col="3" span="1" readOnly="false"
+                            required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
+                            returnType="Double" decimal="2"/>                  
 
             </inputUIs>
             <buttons>

target/cqtms/WEB-INF/classes/config/origen/fee/maintainApplyPaymentPage.xml

@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainApplyPaymentPage" title="maintainApplyPaymentPage" autoQuery="false">
-        <search>
-            <inputUIs>
-                <text id="applyBill.applicant" title="applyBill.applicant" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
-<!--               	<text id="applyBill.department.name" title="applyBill.department" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/> -->
-<!--              	<text id="applyBill.status" title="applyBill.status" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>-->
-<!--             	<list id="applyBill.generalDepartment.id" title="applyBill.generalDepartment" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" editModel="uneditable"> -->
-<!--                     <hql><![CDATA[ SELECT  -->
-<!--  d.id, -->
-<!--  d.name,  -->
-<!--  '' as remark -->
-<!--  FROM Department d  -->
-<!--  WHERE d.disabled = false and d.org =  #{SESSION_PLATFORM} -->
-<!-- ]]></hql> -->
-<!-- 				</list> -->
-            	<list id="applyBill.status" title="applyBill.status" row="2" col="2" span="1" 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')
-  order by enumerate.id]]></hql>
-                </list>
-                <remote id="account.id" title="account.name" row="3" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" manualEditable="true" displayedTableHead="序号,编码,名称">
-                    <hql><![CDATA[select company.id, company.code, company.name from Organization company 
- where  (upper(company.code) like upper(:param) or company.name like :param)
- 		and  (company.beCarrier=true or company.beInCarrier=true)
- 		and (company.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org = #{SESSION_PLATFORM})
-		or company.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org.code = #{PUBLIC_PLATFORM}))
- and company.disabled=false]]></hql>
-              	</remote>
-              	<text id="applyBill.invoiceNo" title="applyBill.invoiceNo" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
-            </inputUIs>
-        </search>
-        <datasource type="hql"><![CDATA[ SELECT applyBill.id,applyBill.applyCode,
- applyBill.consignor.name,
- applyBill.applicationFee,
- applyBill.applicant,
- applyBill.status,
- applyBill.invoiceCompany.companyName,
- applyBill.invoiceCompany.taxpayer,
- applyBill.invoiceCompany.address,
- applyBill.invoiceCompany.phone,
- applyBill.invoiceCompany.bank,
- applyBill.invoiceCompany.accountNumber,
- applyBill.invoiceType,
- applyBill.submitDate,
- applyBill.month,
- applyBill.invoiceNo,
- applyBill.invoiceDate,
- applyBill.taxInfo,
- CAST(round(applyBill.noTaxFee,2) as string),
- CAST(round(applyBill.taxFee,2) as string),
- CAST(round(applyBill.taxMoney,2) as string),
- applyBill.applicationTime,
- applyBill.description
- 
- FROM ApplyBill  applyBill
- left join applyBill.generalDepartment
- left join applyBill.department
-  left join applyBill.invoiceCompany
- WHERE 1=1 
- and  applyBill.platForm=#{SESSION_PLATFORM}
- and applyBill.paymentBill='PAYMENT'
- /~applyBill.applicant: AND applyBill.applicant like {applyBill.applicant}~/
- /~applyBill.department.name: AND applyBill.department.name like {applyBill.department.name}~/
-/~applyBill.generalDepartment.id: AND applyBill.generalDepartment.id = {applyBill.generalDepartment.id}~/
- /~applyBill.status: AND applyBill.status like {applyBill.status}~/
- /~account.id: AND applyBill.consignor.id = {account.id}~/
- /~applyBill.invoiceNo: AND upper(applyBill.invoiceNo) like upper({applyBill.invoiceNo})~/
- ]]></datasource>
-        <columns>
-            <column id="applyBill.id" title="applyBill.id" visible="false" horizonAlign="center" verticalAlign="middle" sortIndex="1" sortType="DESC"/>
-            <column id="applyBill.applyCode" title="applyBill.applyCode" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.consignor" title="fee.account.name" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.applicationFee" title="applyBill.applicationFee" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.applicant" title="applyBill.applicant" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.status" title="applyBill.status" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="FeeStatus"/>
-            <column id="applyBill.invoiceCompany.companyName" title="applyBill.companyName" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.invoiceCompany.taxpayer" title="applyBill.taxpayer" visible="false" horizonAlign="center" verticalAlign="middle" />
-            <column id="applyBill.invoiceCompany.address" title="applyBill.address" visible="false" horizonAlign="center" verticalAlign="middle" />
-            <column id="applyBill.invoiceCompany.phone" title="applyBill.phone" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.invoiceCompany.bank" title="applyBill.bank" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.invoiceCompany.accountNumber" title="applyBill.accountNumber" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.invoiceType" title="applyBill.invoiceType" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="InvoiceType"/>
-            <column id="applyBill.submitDate" width="80" title="applyBill.submitDate" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.month" width="80" title="applyBill.month" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.invoiceNo" width="80" title="applyBill.invoiceNo" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.invoiceDate" width="80" title="applyBill.invoiceDate1" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.taxInfo" title="applyBill.taxInfo" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="applyBill.noTaxFee" width="70" title="abd.noTaxFee" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.taxFee" width="70" title="abd.taxFee" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.applicationTime" title="applyBill.applicationTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="applyBill.description" title="applyBill.description" visible="true" horizonAlign="center" verticalAlign="middle"/>
-        </columns>
-        <buttons>
-            <popup id="newApplyBillButton" title="maintainOrderPage.newOrderButton" enableType="none" invisible="false" containId="false" pageId="modifyApplyBillPayPage"/>
-            <popup id="selectApplyBillrButton" title="maintainOrderPage.selectOrderButton" enableType="single" invisible="false" containId="true" pageId="modifyApplyBillPayPage">
-<!--             <enableExpression><![CDATA[${billFee.status} == 'OPEN'  ]]></enableExpression>-->
-          </popup>
-<!--           <popup id="ViewApplyPayFee" title="ViewApplyPayFee" enableType="single" invisible="false" containId="true" pageId="modifyViewApplyPayFeePage"/> -->
-        
-<!--           <popup id="selectApplyButton" title="selectApplyButton" enableType="single" invisible="false" containId="true" pageId="printZFSQMXPage"> -->
-<!--           </popup> -->
-          <commit id="AuditApplyBillButton" title="AuditButton" enableType="multi" invisible="false" >
-                <enableExpression><![CDATA[${applyBill.status} == 'OPEN'  ]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="applyBillManager" methodName="AuditApplyBill" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
-                </forwards>
-            </commit>
-            <commit id="retrnApplyBill" title="retrnApplyBill" enableType="multi" invisible="false" >
-                <enableExpression><![CDATA[${applyBill.status} == 'SUBMIT'  ]]></enableExpression>
-                <mappings>
-                	<mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="applyBillManager" methodName="retrnApplyBill" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
-                </forwards>
-            </commit>
-<!--            <commit id="retrnApplyBill" title="retrnApplyBill" enableType="multi" invisible="false" confirmMessage="maintainOrderPage.retrnApplyBill.confirmMessage">-->
-<!--                <enableExpression><![CDATA[${applyBill.status} == 'SUBMIT'  ]]></enableExpression>-->
-<!--                <mappings>-->
-<!--                	<mapping id="ids" className="list"/>-->
-<!--                </mappings>-->
-<!--                <actions>-->
-<!--                    <action managerName="applyBillManager" methodName="retrnApplyBill" parameter="ids"/>-->
-<!--                </actions>-->
-<!--                <forwards>-->
-<!--                    <forward name="refreshWindow" newEnabled="true" editEnabled="false"/>-->
-<!--                </forwards>-->
-<!--            </commit>-->
-            <commit id="checkApplyBill" title="checkApplyBill" enableType="multi" invisible="false" >
-                <enableExpression><![CDATA[${applyBill.status} == 'SUBMIT'  ]]></enableExpression>
-                <mappings>
-                	<mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="applyBillManager" methodName="checkApplyBill" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
-                </forwards>
-            </commit>
-<!--             <popup id="InvoiceInfoButton" title="InvoiceInfoButton" enableType="single" invisible="false" containId="true" pageId="editInvoiceInfoPage">-->
-<!--             </popup>-->
-            <commit id="deleteApplyBill" title="deleteOrderFee" enableType="multi" invisible="false" confirmMessage="delete.confirmMessage">
-                <enableExpression><![CDATA[${applyBill.status} == 'OPEN'  ]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="applyBillManager" methodName="deleteApplyBill" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
-                </forwards>
-                
-            </commit>
-<!--             <popup id="printZFSQD" title="print" enableType="single" invisible="false" containId="true" pageId="printZFSQDPage"/>  -->
-<!--             <popup id="printWWZF" title="printWWZF" enableType="none" invisible="false" containId="true" pageId="printWWZFPage"> -->
-<!--              </popup> -->
-<!--              <popup id="printWWZFCB" title="printWWZFCB" enableType="none" invisible="false" containId="true" pageId="printWWZFCBPage"> -->
-<!--              </popup> -->
-        </buttons>
-    </maintainPage>
-</pages>