DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2025-08-13 17:25:01 +08:00
parent aa621ecbbc b568a2d924
commit c0a2461d13
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
klp-wms/src/main/java/com/klp/service/impl/WmsPayableServiceImpl.java
View File

@@ -153,6 +153,13 @@ public class WmsPayableServiceImpl implements IWmsPayableService {
WmsPayable updateWmsPayable = new WmsPayable(); WmsPayable updateWmsPayable = new WmsPayable();
updateWmsPayable.setPayableId(bo.getPayableId()); updateWmsPayable.setPayableId(bo.getPayableId());
updateWmsPayable.setPaidAmount(newPaidAmount); updateWmsPayable.setPaidAmount(newPaidAmount);
if(payable.getPaidAmount().compareTo(BigDecimal.ZERO) == 0
&& changePaidAmount.compareTo(BigDecimal.ZERO) > 0){
updateWmsPayable.setStatus("部分支付");
}
if(newPaidAmount.compareTo(payable.getAmount()) == 0){
updateWmsPayable.setStatus("已结清");
}
int countFlag = baseMapper.updateById(updateWmsPayable); int countFlag = baseMapper.updateById(updateWmsPayable);
// 2. 新增资金日记账记录 // 2. 新增资金日记账记录

7
klp-wms/src/main/java/com/klp/service/impl/WmsReceivableServiceImpl.java
View File

@@ -157,6 +157,13 @@ public class WmsReceivableServiceImpl implements IWmsReceivableService {
WmsReceivable updateWmsReceivable = new WmsReceivable(); WmsReceivable updateWmsReceivable = new WmsReceivable();
updateWmsReceivable.setReceivableId(bo.getReceivableId()); updateWmsReceivable.setReceivableId(bo.getReceivableId());
updateWmsReceivable.setPaidAmount(newPaidAmount); updateWmsReceivable.setPaidAmount(newPaidAmount);
if(receivable.getPaidAmount().compareTo(BigDecimal.ZERO) == 0
&& changePaidAmount.compareTo(BigDecimal.ZERO) > 0){
updateWmsReceivable.setStatus("部分支付");
}
if(newPaidAmount.compareTo(receivable.getAmount()) == 0){
updateWmsReceivable.setStatus("已结清");
}
int countFlag = baseMapper.updateById(updateWmsReceivable); int countFlag = baseMapper.updateById(updateWmsReceivable);
// 2. 新增资金日记账记录 // 2. 新增资金日记账记录