|
@@ -230,8 +230,8 @@ public class OrderController extends BladeController {
|
|
|
item.setItem(count + "");
|
|
item.setItem(count + "");
|
|
|
item.setNumberRows((int) count);
|
|
item.setNumberRows((int) count);
|
|
|
}
|
|
}
|
|
|
- item.setSurplusShipNum(item.getGoodsTotalShipNum().subtract(item.getOutGoodsTotalShipNum()));
|
|
|
|
|
- item.setSurplusShipAmount(item.getGoodsTotalShipAmount().subtract(item.getOutGoodsTotalShipAmount()));
|
|
|
|
|
|
|
+ item.setSurplusShipNum(item.getGoodsTotalShipNum().subtract(item.getOutGoodsTotalShipNum()).subtract(item.getReturnsNumber()));
|
|
|
|
|
+ item.setSurplusShipAmount(item.getGoodsTotalShipAmount().subtract(item.getOutGoodsTotalShipAmount()).subtract(item.getReturnsAmount()));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|