sfms3.0
/
sfms3.0
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

SCP bug HL-6104 SCP询证函中预付金额没有取到

hella_online_20240924
高竟松 10 months ago
parent
0c47d515b1
commit
f25bedd717
4 changed files with 33 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierApbalance/vo/SupplierApbalanceDetailPageReqVO.java
  2. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierApbalanceDetail/SupplierApbalanceDetailMapper.java
  3. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierApbalanceMain/SupplierApbalanceMainMapper.java
  4. 47
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierApbalanceMain/SupplierApbalanceMainServiceImpl.java

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierApbalance/vo/SupplierApbalanceDetailPageReqVO.java
View File

@ -65,6 +65,10 @@ public class SupplierApbalanceDetailPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] ttEffDate;
@Schema(description = "凭证月首日")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] ttEffDateFirst;
@Schema(description = "付款周期")
private String ttCreditTerm;

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierApbalanceDetail/SupplierApbalanceDetailMapper.java
View File

@ -36,6 +36,7 @@ public interface SupplierApbalanceDetailMapper extends BaseMapperX<SupplierApbal
.betweenIfPresent(SupplierApbalanceDetailDO::getTtDueDate, reqVO.getTtDueDate())
.betweenIfPresent(SupplierApbalanceDetailDO::getTtInvDate, reqVO.getTtInvDate())
.betweenIfPresent(SupplierApbalanceDetailDO::getTtEffDate, reqVO.getTtEffDate())
.eqIfPresent(SupplierApbalanceDetailDO::getTtEffDateFirst, reqVO.getTtEffDateFirst())
.eqIfPresent(SupplierApbalanceDetailDO::getTtCreditTerm, reqVO.getTtCreditTerm())
.eqIfPresent(SupplierApbalanceDetailDO::getTtGltype, reqVO.getTtGltype())
.eqIfPresent(SupplierApbalanceDetailDO::getMasterId, reqVO.getMasterId())

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierApbalanceMain/SupplierApbalanceMainMapper.java
View File

@ -2,6 +2,7 @@ package com.win.module.wms.dal.mysql.supplierApbalanceMain;
import java.util.List;
import com.win.module.wms.dal.dataobject.supplierApbalanceDetail.SupplierApbalanceDetailDO;
import org.apache.ibatis.annotations.Mapper;
import com.win.framework.common.pojo.CustomConditions;
@ -30,6 +31,7 @@ public interface SupplierApbalanceMainMapper extends BaseMapperX<SupplierApbalan
.eqIfPresent(SupplierApbalanceMainDO::getTtName3, reqVO.getTtName3()).likeIfPresent(SupplierApbalanceMainDO::getTtSupplierName, reqVO.getTtSupplierName())
.betweenIfPresent(SupplierApbalanceMainDO::getTtGenerateTime, reqVO.getTtGenerateTime()).eqIfPresent(SupplierApbalanceMainDO::getTtAccountAp, reqVO.getTtAccountAp())
.eqIfPresent(SupplierApbalanceMainDO::getTtAccountOthap, reqVO.getTtAccountOthap()).eqIfPresent(SupplierApbalanceMainDO::getTtAccountPrepay, reqVO.getTtAccountPrepay())
.eqIfPresent(SupplierApbalanceMainDO::getTtEffDateFirst, reqVO.getTtEffDateFirst())
.eqIfPresent(SupplierApbalanceMainDO::getTtCreditTerm, reqVO.getTtCreditTerm()).betweenIfPresent(SupplierApbalanceMainDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(SupplierApbalanceMainDO::getDepartmentCode, reqVO.getDepartmentCode()).eqIfPresent(SupplierApbalanceMainDO::getRemark, reqVO.getRemark())
.eqIfPresent(SupplierApbalanceMainDO::getSiteId, reqVO.getSiteId()).eqIfPresent(SupplierApbalanceMainDO::getAvailable, reqVO.getAvailable())
@ -53,7 +55,8 @@ public interface SupplierApbalanceMainMapper extends BaseMapperX<SupplierApbalan
.eqIfPresent(SupplierApbalanceMainDO::getTtName1, reqVO.getTtName1()).eqIfPresent(SupplierApbalanceMainDO::getTtName2, reqVO.getTtName2())
.eqIfPresent(SupplierApbalanceMainDO::getTtName3, reqVO.getTtName3()).likeIfPresent(SupplierApbalanceMainDO::getTtSupplierName, reqVO.getTtSupplierName())
.betweenIfPresent(SupplierApbalanceMainDO::getTtGenerateTime, reqVO.getTtGenerateTime()).eqIfPresent(SupplierApbalanceMainDO::getTtAccountAp, reqVO.getTtAccountAp())
.eqIfPresent(SupplierApbalanceMainDO::getTtAccountOthap, reqVO.getTtAccountOthap()).eqIfPresent(SupplierApbalanceMainDO::getTtAccountPrepay, reqVO.getTtAccountPrepay())
.eqIfPresent(SupplierApbalanceMainDO::getTtEffDateFirst, reqVO.getTtEffDateFirst())
.eqIfPresent(SupplierApbalanceMainDO::getTtAccountOthap, reqVO.getTtAccountOthap()).eqIfPresent(SupplierApbalanceMainDO::getTtAccountPrepay, reqVO.getTtAccountPrepay())
.eqIfPresent(SupplierApbalanceMainDO::getTtCreditTerm, reqVO.getTtCreditTerm()).betweenIfPresent(SupplierApbalanceMainDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(SupplierApbalanceMainDO::getDepartmentCode, reqVO.getDepartmentCode()).eqIfPresent(SupplierApbalanceMainDO::getRemark, reqVO.getRemark())
.eqIfPresent(SupplierApbalanceMainDO::getSiteId, reqVO.getSiteId()).eqIfPresent(SupplierApbalanceMainDO::getAvailable, reqVO.getAvailable())

47
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierApbalanceMain/SupplierApbalanceMainServiceImpl.java
View File

@ -168,31 +168,32 @@ public class SupplierApbalanceMainServiceImpl implements SupplierApbalanceMainSe
private SupplierApbalanceMainDO supplierApbalanceMainDetail(SupplierApbalanceMainDO supplierApbalanceMainDO) {
// 查询明细
List<SupplierApbalanceDetailDO> detailDOS = supplierApbalanceDetailMapper.selectList("master_id", supplierApbalanceMainDO.getId());
BigDecimal ttAccountAp = new BigDecimal(0);
BigDecimal ttAccountOthap = new BigDecimal(0);
BigDecimal ttAccountPrepay = new BigDecimal(0);
if (!CollectionUtil.isEmpty(detailDOS)) {
for (SupplierApbalanceDetailDO loop1 : detailDOS) {
if ("AP".equals(loop1.getTtGltype())) {
BigDecimal ttBcbal = loop1.getTtBcbal();
ttAccountAp = ttAccountAp.add(ttBcbal);
} else if ("OTHAP".equals(loop1.getTtGltype())) {
BigDecimal ttBcbal = loop1.getTtBcbal();
ttAccountOthap = ttAccountOthap.add(ttBcbal);
} else if ("PREPAY".equals(loop1.getTtGltype())) {
BigDecimal ttBcbal = loop1.getTtBcbal();
ttAccountPrepay = ttAccountPrepay.add(ttBcbal);
}
}
} else {
// throw exception(SUPPLIER_APBALANCE_MAIN_NOT_EXISTS);
}
// List<SupplierApbalanceDetailDO> detailDOS = supplierApbalanceDetailMapper.selectList("master_id", supplierApbalanceMainDO.getId());
// BigDecimal ttAccountAp = new BigDecimal(0);
// BigDecimal ttAccountOthap = new BigDecimal(0);
// BigDecimal ttAccountPrepay = new BigDecimal(0);
// if (!CollectionUtil.isEmpty(detailDOS)) {
// for (SupplierApbalanceDetailDO loop1 : detailDOS) {
// if ("AP".equals(loop1.getTtGltype())) {
// BigDecimal ttBcbal = loop1.getTtBcbal();
// ttAccountAp = ttAccountAp.add(ttBcbal);
// } else if ("OTHAP".equals(loop1.getTtGltype())) {
// BigDecimal ttBcbal = loop1.getTtBcbal();
// ttAccountOthap = ttAccountOthap.add(ttBcbal);
// } else if ("PREPAY".equals(loop1.getTtGltype())) {
// BigDecimal ttBcbal = loop1.getTtBcbal();
// ttAccountPrepay = ttAccountPrepay.add(ttBcbal);
// }
// }
// } else {
// // throw exception(SUPPLIER_APBALANCE_MAIN_NOT_EXISTS);
// }
BigDecimal zero = new BigDecimal(0.00);
SupplierDO supplierDO = supplierMapper.selectOne("code", supplierApbalanceMainDO.getTtSupplier());
supplierApbalanceMainDO.setTtSupplierName(supplierDO == null ? "" : supplierDO.getName());
supplierApbalanceMainDO.setTtAccountAp(ttAccountAp.abs().setScale(2, RoundingMode.HALF_UP));
supplierApbalanceMainDO.setTtAccountOthap(ttAccountOthap.abs().setScale(2, RoundingMode.HALF_UP));
supplierApbalanceMainDO.setTtAccountPrepay(ttAccountPrepay.abs().setScale(2, RoundingMode.HALF_UP));
supplierApbalanceMainDO.setTtAccountAp(supplierApbalanceMainDO.getTtAccountAp() == null ? zero : supplierApbalanceMainDO.getTtAccountAp().setScale(2, RoundingMode.HALF_UP));
supplierApbalanceMainDO.setTtAccountOthap(supplierApbalanceMainDO.getTtAccountOthap() == null ? zero: supplierApbalanceMainDO.getTtAccountOthap().setScale(2, RoundingMode.HALF_UP));
supplierApbalanceMainDO.setTtAccountPrepay(supplierApbalanceMainDO.getTtAccountPrepay() == null ? zero: supplierApbalanceMainDO.getTtAccountPrepay().setScale(2, RoundingMode.HALF_UP));
Long id = SecurityFrameworkUtils.getLoginUser().getId();
AdminUserDO adminUserDO = userMapper.selectById(id);
TenantDO tenantDO = tenantMapper.selectOne("id", adminUserDO.getTenantId());

Write Preview
Loading…
Cancel
Save