aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-10-13 12:26:03 +08:00
parent ff47dbedd0
commit 092a59e6ac
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java
View File

@ -56,7 +56,7 @@ public class EmisTmsCostFee extends BaseEntity
/* 成本费 */ /* 成本费 */
private BigDecimal costFee; private BigDecimal costFee;
/* 交易时间 */ /* 交易时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
private Date tradeDate; private Date tradeDate;
/* 总票数 */ /* 总票数 */
private Integer sendPieceSum; private Integer sendPieceSum;

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
View File

@ -119,10 +119,8 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
*/ */
@Override @Override
public int reCalcSplitCostFee(String costNo) throws EmisBizError { public int reCalcSplitCostFee(String costNo) throws EmisBizError {
// 获取最新的数据 // 获取最新的数据
EmisTmsCostFee old = emisTmsCostFeeMapper.selectEmisTmsCostFeeByCostNo(costNo); EmisTmsCostFee old = emisTmsCostFeeMapper.selectEmisTmsCostFeeByCostNo(costNo);
// /* 总票数 总重量 总体积 */ // /* 总票数 总重量 总体积 */
BigDecimal totalWeight = BigDecimal.ZERO; BigDecimal totalWeight = BigDecimal.ZERO;
BigDecimal totalVolume = BigDecimal.ZERO; BigDecimal totalVolume = BigDecimal.ZERO;
@ -136,7 +134,6 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
throw new EmisBizError(EmisBizErrorType.FAIL,"子运单数量为空，请检查"); throw new EmisBizError(EmisBizErrorType.FAIL,"子运单数量为空，请检查");
} }
Integer pieceNumber = 0; Integer pieceNumber = 0;
// 计算总重量 // 计算总重量
for (EmisTmsCostFeeRel feeRel: listFeeRel) { for (EmisTmsCostFeeRel feeRel: listFeeRel) {
@ -147,8 +144,6 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
totalVolume=totalVolume.add(emisWaybill.getTotalVolume()); totalVolume=totalVolume.add(emisWaybill.getTotalVolume());
pieceNumber=pieceNumber+emisWaybill.getParcelQty(); pieceNumber=pieceNumber+emisWaybill.getParcelQty();
} }
Integer sendPieceSum = listFeeRel.size(); Integer sendPieceSum = listFeeRel.size();
EmisTmsCostFee emisTmsCostFee = new EmisTmsCostFee(); EmisTmsCostFee emisTmsCostFee = new EmisTmsCostFee();
@ -186,7 +181,6 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
emisTmsCostFeeRelMapper.updateEmisTmsCostFeeRel(updRel); emisTmsCostFeeRelMapper.updateEmisTmsCostFeeRel(updRel);
} }
// 更新信息 // 更新信息
return emisTmsCostFeeMapper.updateEmisTmsCostFee(emisTmsCostFee); return emisTmsCostFeeMapper.updateEmisTmsCostFee(emisTmsCostFee);
} }