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 39b76a3..04093ca 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 @@ -88,7 +88,7 @@ public class Shipment extends Entity { private double otherFee = 0.0; private int distance = 0; // 里程数 - private double expense = 0D; // 提发成本费用 + private Date balanceTime; // 结算时间(创建时间) private String fromCode; // 发货方代码 private String fromName; // 发货方名称 @@ -232,6 +232,8 @@ public class Shipment extends Entity { private double imprest = 0D; /** 盈利--易流费 */ private double profit = 0.0; + /** 提发成本费用--垫付车辆保险费 */ + private double expense = 0D; // public double getFee1() { return fee1; diff --git a/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultBillFeeManager.java b/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultBillFeeManager.java index e1df241..6429d85 100644 --- a/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultBillFeeManager.java +++ b/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 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 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); 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 63e99c4..50513f3 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 @@ -467,7 +467,8 @@ public class DefaultFeeManager extends DefaultBaseManager implements FeeManager 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.setExpense(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.getExpense()); s.setFee7(s.getFee1()+s.getFee2()+s.getFee3()+s.getFee4()+s.getFee8()); s.setDescription(s.getDescription()); commonDao.store(s); @@ -2511,8 +2512,9 @@ public class DefaultFeeManager extends DefaultBaseManager implements FeeManager saveInputFee(id, billObject, null, "垫付车贷款", shipment.getFee10()); saveInputFee(id, billObject, null, "甲醇费", shipment.getImprest()); saveInputFee(id, billObject, null, "易流费", shipment.getProfit()); + saveInputFee(id, billObject, null, "垫付车辆保险费", shipment.getExpense()); refreshBillFee(id, billObject, Boolean.TRUE); - String des="运输费"+shipment.getFee1()+";提货费"+shipment.getFee2()+";送货费"+shipment.getFee3()+";其他费"+shipment.getFee5()+";油卡费"+shipment.getFee6()+";待时费"+shipment.getFee4()+";卸货费"+shipment.getFee8()+";预付费"+shipment.getFee9()+";垫付车贷款"+shipment.getFee10()+";甲醇费"+shipment.getImprest()+";易流费"+shipment.getProfit(); + String des="运输费"+shipment.getFee1()+";提货费"+shipment.getFee2()+";送货费"+shipment.getFee3()+";其他费"+shipment.getFee5()+";油卡费"+shipment.getFee6()+";待时费"+shipment.getFee4()+";卸货费"+shipment.getFee8()+";预付费"+shipment.getFee9()+";垫付车贷款"+shipment.getFee10()+";甲醇费"+shipment.getImprest()+";易流费"+shipment.getProfit()+";垫付车辆保险费"+shipment.getExpense(); operationHisManager.storeOperationHis(shipment.getId(), shipment.getCode(), null, des, "成本维护", "录入",null,null,shipment.getQuantity(),shipment.getWeight(),shipment.getVolume(),0, des, "TMS"); } static Date sdate=new Date(); 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 c6ad753..88fc8b3 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml @@ -102,6 +102,7 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d CAST(round(shipment.fee10,2) as string), CAST(round(shipment.imprest,2) as string), CAST(round(shipment.profit,2) as string), + CAST(round(shipment.expense,2) as string), CAST(round(shipment.payfee,2) as string), CAST(round(shipment.weight,2) as string), CAST(round(shipment.volume,2) as string), @@ -164,9 +165,10 @@ 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 93f8fcf..7118457 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipment/modifyInputLegsFee.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipment/modifyInputLegsFee.xml @@ -171,7 +171,10 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d returnType="Double" decimal="2"/> + returnType="Double" decimal="2"/> +