diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRelController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRelController.java index a07250e47..4ba73b29b 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRelController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRelController.java @@ -13,6 +13,8 @@ package com.xdadan.erp.web.emis; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.xdadan.erp.emis.domain.EmisSettlePayRel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; @@ -60,6 +62,14 @@ public class EmisSettleInvoiceRelController extends BaseController return getDataTable(list); } + @GetMapping("/listHasOpenListBySettleBillNo") + public TableDataInfo listHasOpenListBySettleBillNo(String settleBillNo) + { + startPage(); + List list = emisSettleInvoiceRelService.selectHasOpenListBySettleBillNo(settleBillNo); + return getDataTable(list); + } + /** * 检查是否重复 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleInvoiceRelService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleInvoiceRelService.java index 41fb1102a..fc4909f23 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleInvoiceRelService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleInvoiceRelService.java @@ -36,6 +36,8 @@ public interface IEmisSettleInvoiceRelService public List selectEmisSettleInvoiceRelList(EmisSettleInvoiceRel emisSettleInvoiceRel); + public List selectHasOpenListBySettleBillNo(String settleBillNo); + /** * 检查是否重复 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index 42336b78a..b5d4101a4 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -21,6 +21,7 @@ import com.xdadan.erp.common.core.domain.AjaxResult; import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.common.utils.StringUtils; import com.xdadan.erp.emis.domain.EmisCustomerUser; +import com.xdadan.erp.emis.domain.EmisSettleInvoiceRel; import com.xdadan.erp.emis.domain.EmisSettleSubBill; import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; import com.xdadan.erp.emis.domain.exception.EmisBizError; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRelServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRelServiceImpl.java index f720d1b22..f3932a855 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRelServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRelServiceImpl.java @@ -54,6 +54,16 @@ public class EmisSettleInvoiceRelServiceImpl implements IEmisSettleInvoiceRelSer return emisSettleInvoiceRelMapper.selectEmisSettleInvoiceRelList(emisSettleInvoiceRel); } + /** + * 获取已开票的单号金额 + * @param settleBillNo + * @return + */ + public List selectHasOpenListBySettleBillNo(String settleBillNo) + { + return emisSettleInvoiceRelMapper.selectHasOpenListBySettleBillNo(settleBillNo); + } + /** * 检查是否重复 * diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml index 168e74035..aa2ea9d25 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml @@ -40,6 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and update_time = #{updateTime} and create_site like concat('%', #{createSite}, '%') and update_site like concat('%', #{updateSite}, '%') + + order by create_time desc