Showing
3 changed files
with
4 additions
and
1 deletions
| @@ -249,7 +249,7 @@ public class ReceiptLedgerInfoController extends DefaultBaseController { | @@ -249,7 +249,7 @@ public class ReceiptLedgerInfoController extends DefaultBaseController { | ||
| 249 | //存款平账 | 249 | //存款平账 |
| 250 | UpdateReceiptLedgerInfoVo updateVo1 = new UpdateReceiptLedgerInfoVo(); | 250 | UpdateReceiptLedgerInfoVo updateVo1 = new UpdateReceiptLedgerInfoVo(); |
| 251 | updateVo1.setId(result.get(0).getId()); | 251 | updateVo1.setId(result.get(0).getId()); |
| 252 | - receiptLedgerInfoService.depositReconciliation(updateVo); | 252 | + receiptLedgerInfoService.depositReconciliation(updateVo1); |
| 253 | } else { | 253 | } else { |
| 254 | throw new DefaultClientException("没有匹配的存款台账明细数据！"); | 254 | throw new DefaultClientException("没有匹配的存款台账明细数据！"); |
| 255 | } | 255 | } |
| @@ -318,6 +318,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge | @@ -318,6 +318,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge | ||
| 318 | data.setEndAccountReceivable(quantity.negate()); | 318 | data.setEndAccountReceivable(quantity.negate()); |
| 319 | } | 319 | } |
| 320 | data.setApplyStatus(vo.getApplyStatus()); | 320 | data.setApplyStatus(vo.getApplyStatus()); |
| 321 | + data.setDebtStatus(vo.getDebtStatus()); | ||
| 321 | data.setCoordinateDate(vo.getCoordinateDate()); | 322 | data.setCoordinateDate(vo.getCoordinateDate()); |
| 322 | data.setRemark(vo.getRemark()); | 323 | data.setRemark(vo.getRemark()); |
| 323 | data.setSecondCoordinateDate(vo.getSecondCoordinateDate()); | 324 | data.setSecondCoordinateDate(vo.getSecondCoordinateDate()); |
| @@ -166,6 +166,7 @@ | @@ -166,6 +166,7 @@ | ||
| 166 | returned_amount, | 166 | returned_amount, |
| 167 | end_account_receivable, | 167 | end_account_receivable, |
| 168 | apply_status, | 168 | apply_status, |
| 169 | + debt_status, | ||
| 169 | coordinate_date, | 170 | coordinate_date, |
| 170 | remark, | 171 | remark, |
| 171 | second_coordinate_date, | 172 | second_coordinate_date, |
| @@ -200,6 +201,7 @@ | @@ -200,6 +201,7 @@ | ||
| 200 | #{item.returnedAmount}, | 201 | #{item.returnedAmount}, |
| 201 | #{item.endAccountReceivable}, | 202 | #{item.endAccountReceivable}, |
| 202 | #{item.applyStatus}, | 203 | #{item.applyStatus}, |
| 204 | + #{item.debtStatus}, | ||
| 203 | #{item.coordinateDate}, | 205 | #{item.coordinateDate}, |
| 204 | #{item.remark}, | 206 | #{item.remark}, |
| 205 | #{item.secondCoordinateDate}, | 207 | #{item.secondCoordinateDate}, |