Browse Source

撤回刚刚提交的1

zengtx 2 years ago
parent
commit
0831ef628c

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/SyShippingDetailsItem.java

@@ -385,7 +385,7 @@ public class SyShippingDetailsItem {
 	@Excel(name = "装箱单回写是否U8已拉取", width = 15)
 	private String isPull;
 	@Excel(name = "下游箱单回写的剩余数量", width = 15)
-	private String packSurplus;
+	private BigDecimal packSurplus;
 
 	public SyShippingDetailsItem(){}
 
@@ -402,7 +402,7 @@ public class SyShippingDetailsItem {
 		this.packId = orderDataVo.getPackId();
 		this.orderQuantity = orderDataVo.getQuantity();
 		this.orderRemainingQuantity = orderDataVo.getQuantity();
-		this.packSurplus = orderDataVo.getQuantity().toString();
+		this.packSurplus = orderDataVo.getQuantity();
 		this.shipmentQuantity = orderDataVo.getQuantity();
 		this.salesTypeText = orderDataVo.getSalesTypeText();