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 1/2] =?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')

From 82b33097f2381e5b3b610ab9826d5132059f61aa Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 9 Jul 2025 15:58:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=20=E6=9F=A5=E8=AF=A2=E7=BB=84?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=AE=8C=E6=88=90=E6=B7=BB=E5=8A=A0=E5=8E=BB?=
 =?UTF-8?q?=E9=87=8D=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xdadan/erp/emis/domain/EmisWaybill.java  |  2 ++
 .../service/impl/EmisTmsSiteBatchMissServiceImpl.java |  1 +
 .../resources/mapper/EmisTmsSiteBatchMissMapper.xml   |  2 +-
 .../src/main/resources/mapper/EmisWaybillMapper.xml   | 11 ++++++-----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index a53a9e45f..7cee9f0a8 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -56,6 +56,8 @@ public class EmisWaybill extends BaseEntity
     private String billCodeSub;
     /* 订单状态  字典 */
     private String orderStatus;
+    /* 组批次状态 */
+    private String siteBatchStatus;
     /* 运单状态 字典 */
     private String waybillStatus;
     /* 订单类型 0-预报订单 1-正式订单 */
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 2b57e8555..a0b36c258 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
@@ -223,6 +223,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements
 
             allWaybills = allWaybills.stream()
                     .filter(wb -> !Objects.equals(wb.getProblemType(), 170))
+                    .filter(wb -> !Objects.equals(wb.getSiteBatchStatus(), "1"))
                     .collect(Collectors.toList());
 
             totalProcessed = allWaybills.size();
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
index 9ed1ec085..4055f7c67 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <when test="missCount == -4">
                 <!-- 当missCount=-4时，查询emis_waybill_batch_status表 -->
                 select
-                    null as id, w.bill_code, '已组批次成功' as miss_reason, 
+                    distinct w.bill_code, null as id,  '已组批次成功' as miss_reason,
                     null as create_by, null as create_time, null as update_by, null as update_time, 
                     null as remark, '0' as del_flag,
                     w.trans_line_type as line_code, w.product_type, w.start_site_code, w.next_site_code, 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 316927d1f..27ff552a9 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -48,6 +48,7 @@
         <result property="calcFeeType"    column="calc_fee_type"    />
         <result property="custNo"    column="cust_no"    />
         <result property="custName"    column="cust_name"    />
+        <result property="siteBatchStatus"    column="site_batch_status"    />
         <result property="transLineType"    column="trans_line_type"    />
         <result property="productType"    column="product_type"    />
         <result property="timeType"    column="time_type"    />
@@ -3734,7 +3735,7 @@
     </delete>
 
     <delete id="deleteEmisWaybillByIds" parameterType="String">
-        update emis_waybill set del_flag='1
+        update emis_waybill set del_flag='1'
         <if test="updateBy != null and updateBy != ''">,update_by = #{updateBy}</if>
         <if test="updateSite != null and updateSite != ''">,update_site = #{updateSite}</if>
         where id in
@@ -3813,16 +3814,16 @@
 
     <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,a.virtual_remark
+        a.product_type,a.start_site_code,a.send_site_code,a.problem_type,a.virtual_remark,b.site_batch_status
         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')
+--         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[ <= ]]> DATE_SUB(CURDATE(), INTERVAL 7 DAY)
+        and DATE_FORMAT(a.send_date, '%Y-%m-%d') <![CDATA[ >= ]]> '2025-01-01'
+        and DATE_FORMAT(a.send_date, '%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 7 DAY), '%Y-%m-%d')
         and (a.problem_type is null or a.problem_type != 151)
         and a.order_status not in ('0','2')
         order by a.create_time desc