From 0b6f9aa1ed959fbf38921cdf6ec6850f5a4359b7 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 9 Jul 2025 09:32:29 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=E5=AE=9A=E6=97=B6=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1=E4=BB=8E=E6=9C=AA?=
 =?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1=E8=BF=90=E5=8D=95=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98=20commit?=
 =?UTF-8?q?ter:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EmisTmsSiteBatchMissServiceImpl.java |  4 +++-
 .../src/main/resources/mapper/EmisWaybillMapper.xml   | 11 ++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java
index 91c265534..2b57e8555 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java
@@ -190,7 +190,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements
                 try {
                     List<EmisWaybill> waybills = future.get();
                     allWaybills.addAll(waybills);
-                    totalProcessed += waybills.size();
+//                    totalProcessed += waybills.size();
                 } catch (Exception e) {
                     log.error("Error getting waybill results", e);
                 }
@@ -225,6 +225,8 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements
                     .filter(wb -> !Objects.equals(wb.getProblemType(), 170))
                     .collect(Collectors.toList());
 
+            totalProcessed = allWaybills.size();
+
             // 按1000条数据分组处理
             List<List<EmisWaybill>> batches = new ArrayList<>();
             for (int i = 0; i < allWaybills.size(); i += pageSize) {
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 6126a94a9..316927d1f 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -3812,15 +3812,16 @@
     </insert>
 
     <select id="selectWaybillListBySiteBatchStatus" resultMap="EmisWaybillResult">
-        select a.id, a.bill_code,a.trans_line_type, a.product_type,a.start_site_code,a.send_site_code,a.problem_type
+        select a.id, a.bill_code,a.trans_line_type,
+        a.product_type,a.start_site_code,a.send_site_code,a.problem_type,a.virtual_remark
         from emis_waybill a
-                 left join emis_waybill_batch_status b on a.bill_code = b.bill_code
-        where  a.del_flag = '0'
-          and (b.site_batch_status is null or b.site_batch_status != '1')
+        left join emis_waybill_batch_status b on a.bill_code = b.bill_code
+        where a.del_flag = '0'
+        and (b.site_batch_status is null or b.site_batch_status != '1')
         <if test="lineCode != null and lineCode != ''">
             and a.trans_line_type = #{lineCode}
         </if>
-          and a.send_date <![CDATA[ > ]]> '2025-01-01 00:00:00'
+        and a.send_date <![CDATA[ > ]]> '2025-01-01 00:00:00'
         and a.send_date <![CDATA[ <= ]]> DATE_SUB(CURDATE(), INTERVAL 7 DAY)
         and (a.problem_type is null or a.problem_type != 151)
         and a.order_status not in ('0','2')