From 9f62465537a88283815798834c7f3dcb32e39985 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 2 Sep 2024 13:57:51 +0800 Subject: [PATCH] md --- .../web/emis/EmisSettleSubBillController.java | 12 ++++++++++ .../erp/emis/domain/EmisSettlePayRecord.java | 4 ++++ .../emis/mapper/EmisSettlePayRelMapper.java | 5 ++++ .../service/IEmisSettleSubBillService.java | 3 +++ .../impl/EmisSettlePayRecordServiceImpl.java | 24 +++++++++++++++---- .../impl/EmisSettleSubBillServiceImpl.java | 11 +++++++++ .../mapper/EmisSettlePayRelMapper.xml | 17 +++++++++++++ 7 files changed, 72 insertions(+), 4 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java index d8c171775..fe1de8f03 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java @@ -102,6 +102,18 @@ public class EmisSettleSubBillController extends EmisBaseController return getDataTable(list); } + @GetMapping("/listHasPayMap") + public TableDataInfo listHasPayMap(EmisSettleSubBill emisSettleSubBill) + { + List list=null; + if(!StringUtils.isEmpty(emisSettleSubBill.getSettleBillNo())){ + list = emisSettleSubBillService.selectHasPayeMapList(WaybillHelper.formatQueryValue(emisSettleSubBill.getSettleBillNo())); + }else{ + list = new ArrayList<>(); + } + return getDataTable(list); + } + /** * 查询统计信息 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayRecord.java index c6687360b..042628ad8 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayRecord.java @@ -19,6 +19,8 @@ import com.xdadan.erp.common.core.domain.TreeEntity; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + import lombok.Data; @@ -117,4 +119,6 @@ public class EmisSettlePayRecord extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date tradeDate; + List payRelList; + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRelMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRelMapper.java index eef895531..aab0f0fa3 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRelMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRelMapper.java @@ -11,6 +11,8 @@ package com.xdadan.erp.emis.mapper; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.xdadan.erp.emis.domain.EmisSettlePayRel; /** @@ -28,6 +30,9 @@ public interface EmisSettlePayRelMapper extends BaseMapper */ public EmisSettlePayRel selectEmisSettlePayRelById(Long id); + public List selectHasPayMapList(String settleBillNo); + + /** * 查询列表 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java index 73c3b9680..6c0011c85 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java @@ -41,6 +41,9 @@ public interface IEmisSettleSubBillService public List selectHasOpenInvoiceMapList(String settleBillNo); + public List selectHasPayeMapList(String settleBillNo); + + /** * 查询统计信息 * @param emisSettleSubBill diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java index 8e629cf4b..782403dc3 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java @@ -13,20 +13,19 @@ package com.xdadan.erp.emis.service.impl; import java.math.BigDecimal; import java.util.List; -import com.xdadan.erp.emis.domain.EmisSettleBill; -import com.xdadan.erp.emis.domain.EmisSettleSubBill; -import com.xdadan.erp.emis.domain.EmisWaybill; +import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.mapper.EmisSettleBillMapper; +import com.xdadan.erp.emis.mapper.EmisSettlePayRelMapper; import com.xdadan.erp.emis.mapper.EmisSettleSubBillMapper; import com.xdadan.erp.emis.service.EmisBaseService; import com.xdadan.erp.emis.utils.WaybillHelper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.xdadan.erp.emis.domain.EmisSettlePayRecord; import com.xdadan.erp.emis.mapper.EmisSettlePayRecordMapper; import com.xdadan.erp.emis.service.IEmisSettlePayRecordService; @@ -43,6 +42,10 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I @Autowired private EmisSettlePayRecordMapper emisSettlePayRecordMapper; + + @Autowired + private EmisSettlePayRelMapper emisSettlePayRelMapper; + @Autowired private EmisSettleBillMapper emisSettleBillMapper; @@ -121,6 +124,19 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I String payId= WaybillHelper.genPayId(); emisSettlePayRecord.setPayId(payId); + + + // 记录收款运单号 + List listRel=emisSettlePayRecord.getPayRelList(); + if(!CollectionUtils.isEmpty(listRel)){ + for (EmisSettlePayRel payRel:listRel + ) { + payRel.setId(null); + payRel.setPayId(payId); + emisSettlePayRelMapper.insertEmisSettlePayRel(payRel); + } + } + // 处理成功 emisSettlePayRecord.setPayStatus("2"); // 插入数据 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java index 6b90a1bc3..ff23e1a4d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java @@ -15,6 +15,7 @@ import java.util.Map; import com.xdadan.erp.emis.domain.EmisWaybill; import com.xdadan.erp.emis.mapper.EmisSettleInvoiceRelMapper; +import com.xdadan.erp.emis.mapper.EmisSettlePayRelMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xdadan.erp.emis.domain.EmisSettleSubBill; @@ -37,6 +38,10 @@ public class EmisSettleSubBillServiceImpl implements IEmisSettleSubBillService @Autowired private EmisSettleInvoiceRelMapper emisSettleInvoiceRelMapper; + @Autowired + private EmisSettlePayRelMapper emisSettlePayRelMapper; + + /** * 查询结算子账单 * @@ -69,6 +74,12 @@ public class EmisSettleSubBillServiceImpl implements IEmisSettleSubBillService } + @Override + public List selectHasPayeMapList(String settleBillNo) + { + return emisSettlePayRelMapper.selectHasPayMapList(settleBillNo); + } + /** * 获取查询统计信息 * diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml index ac0270051..b7f2bb251 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml @@ -34,6 +34,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc + +