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 16:05:55 +08:00
parent db580c8df1 fe1ca4e1a9
commit 6969708d25
14 changed files with 429 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
klp-wms/src/main/java/com/klp/controller/WmsPayableController.java
View File

@@ -3,7 +3,6 @@ package com.klp.controller;
import java.util.List;
import java.util.Arrays;
import com.klp.domain.bo.WmsReceivableBo;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;

1
klp-wms/src/main/java/com/klp/service/IWmsOrderService.java
View File

@@ -1,6 +1,5 @@
package com.klp.service;
import com.klp.domain.WmsOrder;
import com.klp.domain.vo.WmsOrderVo;
import com.klp.domain.bo.WmsOrderBo;
import com.klp.common.core.page.TableDataInfo;

1
klp-wms/src/main/java/com/klp/service/IWmsPayableService.java
View File

@@ -1,6 +1,5 @@
package com.klp.service;
import com.klp.domain.WmsPayable;
import com.klp.domain.vo.WmsPayableVo;
import com.klp.domain.bo.WmsPayableBo;
import com.klp.common.core.page.TableDataInfo;

1
klp-wms/src/main/java/com/klp/service/IWmsReceivableService.java
View File

@@ -1,6 +1,5 @@
package com.klp.service;
import com.klp.domain.WmsReceivable;
import com.klp.domain.vo.WmsReceivableVo;
import com.klp.domain.bo.WmsReceivableBo;
import com.klp.common.core.page.TableDataInfo;

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

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.klp.domain.WmsJournal;
import com.klp.domain.WmsReceivable;
import com.klp.mapper.WmsJournalMapper;
import com.klp.mapper.WmsSupplierMapper;
import com.klp.service.IWmsJournalService;

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

@@ -169,7 +169,7 @@ public class WmsReceivableServiceImpl implements IWmsReceivableService {
journal.setExpenseAmount(BigDecimal.ZERO);
wmsJournalService.computeBalance(journal);
journal.setRemark("应收款ID: " + bo.getReceivableId());
countFlag +=journalMapper.insert(journal);
countFlag += journalMapper.insert(journal);
return countFlag == 2;
}
}