Browse Source

1.BL_2018100024:核销单-应收冲应付,部分账款核销后,第二次核销单据已核销的近额未记录

heqinwei 7 years ago
parent
commit
667d7d8e8b

+ 6 - 1
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/VerificationServiceImpl.java

@@ -308,7 +308,12 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         subledger.setSl_date(verification.getVc_date());
         subledger.setSl_date(verification.getVc_date());
         subledger.setSl_ym(DateUtils.getYm(verification.getVc_date()));
         subledger.setSl_ym(DateUtils.getYm(verification.getVc_date()));
         subledger.setSl_orderamount(new Double(0));
         subledger.setSl_orderamount(new Double(0));
-        subledger.setSl_yamount(new Double(0));
+        if ("receivable_offset_payable".equals(kind)) {
+            subledger.setSl_yamount((subledger.getSl_orderamount() ==null?new Double(0): subledger.getSl_amount())-
+                    (subledger.getSl_namount() == null ? new Double(0) : subledger.getSl_namount()));
+        }else {
+            subledger.setSl_yamount(new Double(0));
+        }
         subledger.setSl_remark(verification.getVc_remark());
         subledger.setSl_remark(verification.getVc_remark());
         subledger.setSl_discount(new Double(0));
         subledger.setSl_discount(new Double(0));
         subledger.setSl_ym(DateUtils.getYm(verification.getVc_date()));
         subledger.setSl_ym(DateUtils.getYm(verification.getVc_date()));