|
@@ -384,6 +384,8 @@ public class SyShippingDetailsItem {
|
|
|
private String masterMetering;
|
|
|
@Excel(name = "装箱单回写是否U8已拉取", width = 15)
|
|
|
private String isPull;
|
|
|
+ @Excel(name = "下游箱单回写的剩余数量", width = 15)
|
|
|
+ private String packSurplus;
|
|
|
|
|
|
public SyShippingDetailsItem(){}
|
|
|
|
|
@@ -399,7 +401,8 @@ public class SyShippingDetailsItem {
|
|
|
this.smallPo = orderDataVo.getSmallPo();
|
|
|
this.packId = orderDataVo.getPackId();
|
|
|
this.orderQuantity = orderDataVo.getQuantity();
|
|
|
- //this.orderRemainingQuantity = orderDataVo.getQuantity();
|
|
|
+ this.orderRemainingQuantity = orderDataVo.getQuantity();
|
|
|
+ this.packSurplus = orderDataVo.getQuantity();
|
|
|
this.shipmentQuantity = orderDataVo.getQuantity();
|
|
|
this.salesTypeText = orderDataVo.getSalesTypeText();
|
|
|
|