From 092a59e6ac1f779f66eb6574699a0b73cc4bac35 Mon Sep 17 00:00:00 2001 From: linfso Date: Sun, 13 Oct 2024 12:26:03 +0800 Subject: [PATCH] md --- .../java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java | 2 +- .../erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java index d4a7a00b7..b309742e1 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java @@ -56,7 +56,7 @@ public class EmisTmsCostFee extends BaseEntity /* 成本费 */ private BigDecimal costFee; /* 交易时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") private Date tradeDate; /* 总票数 */ private Integer sendPieceSum; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java index df68f70d1..be9663495 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java @@ -119,10 +119,8 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService */ @Override public int reCalcSplitCostFee(String costNo) throws EmisBizError { - // 获取最新的数据 EmisTmsCostFee old = emisTmsCostFeeMapper.selectEmisTmsCostFeeByCostNo(costNo); - // /* 总票数 总重量 总体积 */ BigDecimal totalWeight = BigDecimal.ZERO; BigDecimal totalVolume = BigDecimal.ZERO; @@ -136,7 +134,6 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService throw new EmisBizError(EmisBizErrorType.FAIL,"子运单数量为空，请检查"); } - Integer pieceNumber = 0; // 计算总重量 for (EmisTmsCostFeeRel feeRel: listFeeRel) { @@ -147,8 +144,6 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService totalVolume=totalVolume.add(emisWaybill.getTotalVolume()); pieceNumber=pieceNumber+emisWaybill.getParcelQty(); } - - Integer sendPieceSum = listFeeRel.size(); EmisTmsCostFee emisTmsCostFee = new EmisTmsCostFee(); @@ -186,7 +181,6 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService emisTmsCostFeeRelMapper.updateEmisTmsCostFeeRel(updRel); } - // 更新信息 return emisTmsCostFeeMapper.updateEmisTmsCostFee(emisTmsCostFee); }