md
This commit is contained in:
parent
bd92e59b3c
commit
294f08a924
@ -22,6 +22,7 @@ import cn.hutool.core.util.IdUtil;
|
|||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.googlecode.aviator.AviatorEvaluator;
|
import com.googlecode.aviator.AviatorEvaluator;
|
||||||
import com.xdadan.erp.common.utils.DateUtils;
|
import com.xdadan.erp.common.utils.DateUtils;
|
||||||
|
import com.xdadan.erp.common.utils.DictUtils;
|
||||||
import com.xdadan.erp.common.utils.SecurityUtils;
|
import com.xdadan.erp.common.utils.SecurityUtils;
|
||||||
import com.xdadan.erp.emis.domain.*;
|
import com.xdadan.erp.emis.domain.*;
|
||||||
import com.xdadan.erp.emis.domain.exception.EmisBizError;
|
import com.xdadan.erp.emis.domain.exception.EmisBizError;
|
||||||
@ -434,6 +435,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
|
|||||||
&& exprItem.getEndWeight().doubleValue() > emisWaybill.getSettlementWeight().doubleValue()
|
&& exprItem.getEndWeight().doubleValue() > emisWaybill.getSettlementWeight().doubleValue()
|
||||||
){
|
){
|
||||||
feeItem.setFeeCode(quoteItem.getFeeType());
|
feeItem.setFeeCode(quoteItem.getFeeType());
|
||||||
|
String feeName=DictUtils.getDictLabel("emis_fee_type",quoteItem.getFeeType());
|
||||||
|
feeItem.setFeeName(feeName);
|
||||||
|
|
||||||
feeItem.setQuoteId(quoteItem.getQuoteId());
|
feeItem.setQuoteId(quoteItem.getQuoteId());
|
||||||
feeItem.setExprId(exprItem.getId());
|
feeItem.setExprId(exprItem.getId());
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user