From d9565a15fbae0705b31d85877bdea4447fca4397 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 13 Nov 2024 09:37:45 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java | 3 +++
 .../xdadan/erp/emis/service/IEmisSettleSubBillService.java  | 5 +++++
 .../erp/emis/service/impl/EmisSettleBillServiceImpl.java    | 6 ++++++
 .../emis/service/impl/EmisSettlePayRecordServiceImpl.java   | 1 +
 .../erp/emis/service/impl/EmisSettleSubBillServiceImpl.java | 6 ++++++
 .../src/main/resources/mapper/EmisSettleSubBillMapper.xml   | 6 ++++++
 6 files changed, 27 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java
index a956950b6..6baf8f208 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java
@@ -122,6 +122,9 @@ public interface EmisSettleSubBillMapper extends BaseMapper<EmisSettleSubBill>
     public int confirmNoBillBySite(EmisSettleSubBill emisSettleSubBill);
     public int setBillErrorBySite(EmisSettleSubBill emisSettleSubBill);
 
+
+    public int updatePayedStatus(EmisSettleSubBill emisSettleSubBill);
+
     /**
      * 删除
      * 
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 ee91511c7..eaec7ea9c 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
@@ -100,4 +100,9 @@ public interface IEmisSettleSubBillService extends IDataAuditService
      * @return 结果
      */
     public int deleteEmisSettleSubBillById(Long id);
+
+
+    // 更新付款状态
+    public int updatePayedStatus(EmisSettleSubBill emisSettleSubBill);
+
 }
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 70c65e913..6c6dc1c19 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
@@ -626,6 +626,12 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
                         emisWaybill.setPaymentStatus("2");
                     }
                     emisWaybillMapper.updatePayedStatus(emisWaybill);
+
+
+                    EmisSettleSubBill updEmisSettleSubBill=new EmisSettleSubBill();
+                    updEmisSettleSubBill.setPaymentStatus(emisWaybill.getPaymentStatus());
+                    updEmisSettleSubBill.setBillCode(subBill.getBillCode());
+                    emisSettleSubBillMapper.updatePayedStatus(updEmisSettleSubBill);
                 }
             }
         }
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 83418d923..18e875f47 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
@@ -22,6 +22,7 @@ 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.service.IEmisSettleBillService;
+import com.xdadan.erp.emis.service.IEmisSettleSubBillService;
 import com.xdadan.erp.emis.utils.WaybillHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
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 683b91777..9ed7bed61 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
@@ -153,6 +153,12 @@ public class EmisSettleSubBillServiceImpl implements IEmisSettleSubBillService
         return emisSettleSubBillMapper.updateEmisSettleSubBill(emisSettleSubBill);
     }
 
+    @Override
+    public int updatePayedStatus(EmisSettleSubBill emisSettleSubBill)
+    {
+        return emisSettleSubBillMapper.updatePayedStatus(emisSettleSubBill);
+    }
+
     /**
      * 批量删除结算子账单
      * 
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index e601fd5b7..935a572b3 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -957,6 +957,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id} and del_flag='0'
     </update>
 
+    <update id="updatePayedStatus" parameterType="EmisSettleSubBill">
+        update emis_settle_sub_bill
+        set payment_status=#{paymentStatus}
+        where bill_code=#{billCode}
+    </update>
+
     <delete id="deleteEmisSettleSubBillByBillCode" parameterType="String">
         update emis_settle_sub_bill set del_flag='1' where bill_code = #{billCode} and del_flag='0'
     </delete>