From f803f95be0924cef2830f1a9f8110e2546bd2e2b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 21 Jul 2025 15:18:52 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/service/IEmisTmsSiteBatchService.java | 3 ++-
 .../erp/emis/service/impl/EmisSettleBillServiceImpl.java  | 1 +
 .../emis/service/impl/EmisTmsSiteBatchServiceImpl.java    | 3 ++-
 .../src/main/resources/mapper/EmisTmsSiteBatchMapper.xml  | 8 +++++++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java
index e21d319e2..7f1e8ab85 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java
@@ -9,6 +9,7 @@
  */
 package com.xdadan.erp.emis.service;
 
+import java.util.Date;
 import java.util.List;
 
 import com.xdadan.erp.common.core.audit.IDataAuditService;
@@ -38,7 +39,7 @@ public interface IEmisTmsSiteBatchService extends IDataAuditService
      * @param carNo
      * @return
      */
-    public  List<EmisTmsSiteBatch> selectTmsSiteBatchBySupplerAndCarNo(String supplierCode,String carNo);
+    public  List<EmisTmsSiteBatch> selectTmsSiteBatchBySupplerAndCarNo(String supplierCode, String carNo, Date etd);
 
     /**
      * 查询一级网点TMS组批次列表
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 0a13a363a..c92c9c917 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
@@ -954,6 +954,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
 
                 // 更新账单收款状态 收款金额
                 log.debug("reCalcSettleBillPayStatus===>收款金额:{},应收:{}",totalMoney,oldBill.getRecMoney());
+
                 if( totalAllPayMoney.compareTo(BigDecimal.ZERO) == 0 ){
                     newBill.setPaymentStatus("0");
                     emisSettleBillMapper.updateEmisSettleBill(newBill);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
index 13a4720a4..acc1ee1d8 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
@@ -86,11 +86,12 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
     }
 
     @Override
-    public  List<EmisTmsSiteBatch> selectTmsSiteBatchBySupplerAndCarNo(String supplierCode,String carNo)
+    public  List<EmisTmsSiteBatch> selectTmsSiteBatchBySupplerAndCarNo(String supplierCode,String carNo, Date etd)
     {
         EmisTmsSiteBatch emisTmsSiteBatch = new EmisTmsSiteBatch();
         emisTmsSiteBatch.setSupplierCode(supplierCode);
         emisTmsSiteBatch.setCarNo(carNo);
+        emisTmsSiteBatch.setEtd(etd);
 
         return emisTmsSiteBatchMapper.selectTmsSiteBatchBySupplerAndCarNo(emisTmsSiteBatch);
     }
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
index a8a5131aa..e21677031 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
@@ -352,7 +352,13 @@
     <select id="selectTmsSiteBatchBySupplerAndCarNo" parameterType="EmisTmsSiteBatch" resultMap="EmisTmsSiteBatchResult">
         select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, total_settlement_weight, bl_profit, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site, bl_entering
         from emis_tms_site_batch a
-        where a.del_flag='0' and a.supplier_code = #{supplierCode} and a.car_no = #{carNo} limit 1
+        where a.del_flag='0'
+            and a.supplier_code = #{supplierCode}
+            and a.car_no = #{carNo}
+            <if test="etd != null and etd != ''">
+                and DATE_FORMAT(a.etd,'%Y%m%d')= DATE_FORMAT(#{etd},'%Y%m%d')
+            </if>
+            limit 3
     </select>
 
     <select id="selectTmsSiteBatchByBatchNo" parameterType="String" resultMap="EmisTmsSiteBatchResult">