md

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<Map> list=null;
+        if(!StringUtils.isEmpty(emisSettleSubBill.getSettleBillNo())){
+            list = emisSettleSubBillService.selectHasPayeMapList(WaybillHelper.formatQueryValue(emisSettleSubBill.getSettleBillNo()));
+        }else{
+            list = new ArrayList<>();
+        }
+        return getDataTable(list);
+    }
+
     /**
      * 查询统计信息
      */

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<EmisSettlePayRel> payRelList;
+
 }

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<EmisSettlePayRel>
      */
     public EmisSettlePayRel selectEmisSettlePayRelById(Long id);
 
+    public List<Map> selectHasPayMapList(String settleBillNo);
+
+
     /**
      * 查询列表
      * 

emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java

@@ -41,6 +41,9 @@ public interface IEmisSettleSubBillService
 
     public List<Map> selectHasOpenInvoiceMapList(String settleBillNo);
 
+    public List<Map> selectHasPayeMapList(String settleBillNo);
+
+
     /**
      * 查询统计信息
      * @param emisSettleSubBill

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.*;
-import com.xdadan.erp.emis.domain.EmisSettleSubBill;
-import com.xdadan.erp.emis.domain.EmisWaybill;
 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<EmisSettlePayRel> listRel=emisSettlePayRecord.getPayRelList();
+        if(!CollectionUtils.isEmpty(listRel)){
+            for (EmisSettlePayRel payRel:listRel
+            ) {
+                payRel.setId(null);
+                payRel.setPayId(payId);
+                emisSettlePayRelMapper.insertEmisSettlePayRel(payRel);
+            }
+        }
+
         // 处理成功
         emisSettlePayRecord.setPayStatus("2");
         // 插入数据

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<Map> selectHasPayeMapList(String settleBillNo)
+    {
+        return emisSettlePayRelMapper.selectHasPayMapList(settleBillNo);
+    }
+
     /**
      * 获取查询统计信息
      *

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
     </select>
 
+    <select id="selectHasPayeMapList" parameterType="String" resultType="map">
+        select bill_no as billNo, sum(pay_money) sumMoney
+        from emis_settle_pay_rel a
+        where  del_flag='0'
+             AND apply_seq_no IN (
+                    SELECT  x1.apply_seq_no FROM
+                        emis_settle_invoice_record x1,
+                        emis_settle_bill x2
+                        WHERE
+                        x1.del_flag = '0' and x1.bl_audit!='2'
+                        AND x2.del_flag = '0'
+                        AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
+                        AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo})
+            )
+        group by bill_no
+    </select>
+
     <select id="checkUnique" parameterType="EmisSettlePayRel"  resultType="int">
 		select count(1) from  emis_settle_pay_rel
 		where del_flag='0'