Jiaqi.xu

C类法定数量数据类型调整

......@@ -66,7 +66,7 @@ public class BasfMawbDetail implements Serializable {
@ApiModelProperty(value = "第一法定数量")
@NotNull(message="参数firstQty不能为空")
@Column(name = "FIRSTQTY")
private Integer firstQty;
private BigDecimal firstQty;
@ApiModelProperty(value = "成交计量单位")
@Column(name = "GUNIT")
......@@ -98,7 +98,7 @@ public class BasfMawbDetail implements Serializable {
@ApiModelProperty(value = "第二法定数量")
@Column(name = "SECONDQTY")
private Integer secondQty;
private BigDecimal secondQty;
@ApiModelProperty(value = "成交币制")
@Column(name = "TRADECURR")
......
......@@ -87,8 +87,8 @@ public class BasfService {
mawbDetail.setGqty(basfcDetail.getKnockdownNumber());
mawbDetail.setGunit(basfcDetail.getKnockdownUnit());
mawbDetail.setFirstUnit(basfcDetail.getUnitLegalFirst());
mawbDetail.setFirstQty(NumberUtils.bigDecimalToIntger(basfcDetail.getQtyLegalFirst()));
mawbDetail.setSecondQty(NumberUtils.bigDecimalToIntger(basfcDetail.getQtyLegalSecond()));
mawbDetail.setFirstQty(basfcDetail.getQtyLegalFirst());
mawbDetail.setSecondQty(basfcDetail.getQtyLegalSecond());
mawbDetail.setSecondUnit(basfcDetail.getUnitLegalSecond());
mawbDetail.setDeclTotal(basfcDetail.getDeclaredAmount());
mawbDetail.setTradeCurr(basfcDetail.getCurrency());
......
......@@ -173,7 +173,7 @@ public class ChmConsignmentDetailService {
result.setUnitLegalSecondId(secondUnitDictionaryEntries);
result.setUnitLegalSecond(secondUnitDictionaryEntries.getChineseName());
//第二法定数量
result.setQtyLegalSecond(bigDecimalFormat(BigDecimal.valueOf(mawbDetail.getSecondQty())));
result.setQtyLegalSecond(bigDecimalFormat(mawbDetail.getSecondQty()));
}
//成交币制
......