|
@@ -917,7 +917,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
for (MzChargeDetail md : mzChargeDetails) {
|
|
|
MzChargeDetail temp = null;
|
|
|
if (chargeItemCodeList.contains(md.getOrderNo() + "_" + md.getChargeItemCode())) {
|
|
|
- if (Constants.XYF.equals(md.getBillItemCode())) {
|
|
|
+ if (Constants.XYF.equals(md.getBillItemCode()) || Constants.ZCYF.equals(md.getBillItemCode())) {
|
|
|
if (ConfirmFlagEnum.DONE.code.equals(md.getConfirmFlag()) && md.getDecAmount() != null && md.getDecAmount().compareTo(BigDecimal.ZERO) == 1) {
|
|
|
Double oriQuantity = md.getQuantity();
|
|
|
BigDecimal surplus = BigDecimal.valueOf(md.getQuantity()).subtract(md.getDecAmount());
|