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 b41dc42b7..2f859a6b1 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 @@ -11,6 +11,7 @@ package com.xdadan.erp.web.emis; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -77,7 +78,7 @@ public class EmisSettleSubBillController extends EmisBaseController setPrivParams(emisSettleSubBill); - if(!org.apache.commons.lang3.StringUtils.isEmpty(emisSettleSubBill.getBillCode())){ + if(!StringUtils.isEmpty(emisSettleSubBill.getBillCode())){ emisSettleSubBill.setBillCode(WaybillHelper.formatQueryValue(emisSettleSubBill.getBillCode())); String[] billCodeSortList = emisSettleSubBill.getBillCode().split(","); if(billCodeSortList.length>1){ @@ -89,6 +90,18 @@ public class EmisSettleSubBillController extends EmisBaseController return getDataTable(list); } + @GetMapping("/listHasOpenInvoiceMap") + public TableDataInfo listHasOpenInvoiceMap(EmisSettleSubBill emisSettleSubBill) + { + List list=null; + if(!StringUtils.isEmpty(emisSettleSubBill.getSettleBillNo())){ + list = emisSettleSubBillService.selectHasOpenInvoiceMapList(WaybillHelper.formatQueryValue(emisSettleSubBill.getBillCode())); + }else{ + list = new ArrayList<>(); + } + return getDataTable(list); + } + /** * 查询统计信息 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRelMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRelMapper.java index 8ff56af74..e4ade880e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRelMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRelMapper.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.EmisSettleInvoiceRel; /** @@ -32,6 +34,8 @@ public interface EmisSettleInvoiceRelMapper extends BaseMapper selectHasOpenListBySettleBillNo(String settleBillNo); + public List selectHasOpenInvoiceMapList(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 fa055ea6c..73c3b9680 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 @@ -39,6 +39,8 @@ public interface IEmisSettleSubBillService public List selectEmisSettleSubBillList(EmisSettleSubBill emisSettleSubBill); + public List selectHasOpenInvoiceMapList(String settleBillNo); + /** * 查询统计信息 * @param emisSettleSubBill 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 ebbce553b..6b90a1bc3 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 @@ -14,6 +14,7 @@ import java.util.List; import java.util.Map; import com.xdadan.erp.emis.domain.EmisWaybill; +import com.xdadan.erp.emis.mapper.EmisSettleInvoiceRelMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xdadan.erp.emis.domain.EmisSettleSubBill; @@ -32,6 +33,10 @@ public class EmisSettleSubBillServiceImpl implements IEmisSettleSubBillService @Autowired private EmisSettleSubBillMapper emisSettleSubBillMapper; + + @Autowired + private EmisSettleInvoiceRelMapper emisSettleInvoiceRelMapper; + /** * 查询结算子账单 * @@ -57,6 +62,13 @@ public class EmisSettleSubBillServiceImpl implements IEmisSettleSubBillService return emisSettleSubBillMapper.selectEmisSettleSubBillList(emisSettleSubBill); } + @Override + public List selectHasOpenInvoiceMapList(String settleBillNo) + { + return emisSettleInvoiceRelMapper.selectHasOpenInvoiceMapList(settleBillNo); + } + + /** * 获取查询统计信息 * diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml index 556376fd9..a0f73752d 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml @@ -83,6 +83,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) + + insert into emis_settle_invoice_rel