Jiaqi.xu

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

...@@ -66,7 +66,7 @@ public class BasfMawbDetail implements Serializable { ...@@ -66,7 +66,7 @@ public class BasfMawbDetail implements Serializable {
66 @ApiModelProperty(value = "第一法定数量") 66 @ApiModelProperty(value = "第一法定数量")
67 @NotNull(message="参数firstQty不能为空") 67 @NotNull(message="参数firstQty不能为空")
68 @Column(name = "FIRSTQTY") 68 @Column(name = "FIRSTQTY")
69 - private Integer firstQty; 69 + private BigDecimal firstQty;
70 70
71 @ApiModelProperty(value = "成交计量单位") 71 @ApiModelProperty(value = "成交计量单位")
72 @Column(name = "GUNIT") 72 @Column(name = "GUNIT")
...@@ -98,7 +98,7 @@ public class BasfMawbDetail implements Serializable { ...@@ -98,7 +98,7 @@ public class BasfMawbDetail implements Serializable {
98 98
99 @ApiModelProperty(value = "第二法定数量") 99 @ApiModelProperty(value = "第二法定数量")
100 @Column(name = "SECONDQTY") 100 @Column(name = "SECONDQTY")
101 - private Integer secondQty; 101 + private BigDecimal secondQty;
102 102
103 @ApiModelProperty(value = "成交币制") 103 @ApiModelProperty(value = "成交币制")
104 @Column(name = "TRADECURR") 104 @Column(name = "TRADECURR")
......
...@@ -87,8 +87,8 @@ public class BasfService { ...@@ -87,8 +87,8 @@ public class BasfService {
87 mawbDetail.setGqty(basfcDetail.getKnockdownNumber()); 87 mawbDetail.setGqty(basfcDetail.getKnockdownNumber());
88 mawbDetail.setGunit(basfcDetail.getKnockdownUnit()); 88 mawbDetail.setGunit(basfcDetail.getKnockdownUnit());
89 mawbDetail.setFirstUnit(basfcDetail.getUnitLegalFirst()); 89 mawbDetail.setFirstUnit(basfcDetail.getUnitLegalFirst());
90 - mawbDetail.setFirstQty(NumberUtils.bigDecimalToIntger(basfcDetail.getQtyLegalFirst())); 90 + mawbDetail.setFirstQty(basfcDetail.getQtyLegalFirst());
91 - mawbDetail.setSecondQty(NumberUtils.bigDecimalToIntger(basfcDetail.getQtyLegalSecond())); 91 + mawbDetail.setSecondQty(basfcDetail.getQtyLegalSecond());
92 mawbDetail.setSecondUnit(basfcDetail.getUnitLegalSecond()); 92 mawbDetail.setSecondUnit(basfcDetail.getUnitLegalSecond());
93 mawbDetail.setDeclTotal(basfcDetail.getDeclaredAmount()); 93 mawbDetail.setDeclTotal(basfcDetail.getDeclaredAmount());
94 mawbDetail.setTradeCurr(basfcDetail.getCurrency()); 94 mawbDetail.setTradeCurr(basfcDetail.getCurrency());
......
...@@ -173,7 +173,7 @@ public class ChmConsignmentDetailService { ...@@ -173,7 +173,7 @@ public class ChmConsignmentDetailService {
173 result.setUnitLegalSecondId(secondUnitDictionaryEntries); 173 result.setUnitLegalSecondId(secondUnitDictionaryEntries);
174 result.setUnitLegalSecond(secondUnitDictionaryEntries.getChineseName()); 174 result.setUnitLegalSecond(secondUnitDictionaryEntries.getChineseName());
175 //第二法定数量 175 //第二法定数量
176 - result.setQtyLegalSecond(bigDecimalFormat(BigDecimal.valueOf(mawbDetail.getSecondQty()))); 176 + result.setQtyLegalSecond(bigDecimalFormat(mawbDetail.getSecondQty()));
177 } 177 }
178 178
179 //成交币制 179 //成交币制
......