From 6c4017e1d3679d512414f0b968563411af9d4cb1 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 29 Apr 2024 14:39:45 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/domain/vo/FeeItem.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java
index 55a201e81..b0d4a2bc4 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java
@@ -26,12 +26,9 @@ public class FeeItem extends VoBase<EmisWaybillFeeitem,FeeItem> {
     // 收费项
     private String remark;
 
-    // 计算表达式
     private String calcExp;
-    // 续重
-    private String addWeight;
-
-
+    /* 续重单价 */
+    private BigDecimal addWeightPrice;
 
     @Override
     public FeeItem toVo(EmisWaybillFeeitem dbItem) {
@@ -43,7 +40,9 @@ public class FeeItem extends VoBase<EmisWaybillFeeitem,FeeItem> {
         voItem.setQuoteId(dbItem.getQuoteId());
         voItem.setExprId(dbItem.getExprId());
         voItem.setOrderNum(dbItem.getOrderNum());
-        voItem.setRemark(dbItem.getRemark());
+        voItem.setCalcExp(dbItem.getCalcExp());
+        voItem.setAddWeightPrice(dbItem.getAddWeightPrice());
+//        voItem.setRemark(dbItem.getRemark());
         return voItem;
     }
 
@@ -57,6 +56,8 @@ public class FeeItem extends VoBase<EmisWaybillFeeitem,FeeItem> {
         dbItem.setQuoteId(voItem.getQuoteId());
         dbItem.setExprId(voItem.getExprId());
         dbItem.setOrderNum(voItem.getOrderNum());
+        dbItem.setCalcExp(voItem.getCalcExp());
+        dbItem.setAddWeightPrice(voItem.getAddWeightPrice());
         dbItem.setRemark(voItem.getRemark());
         return dbItem;
     }