From 30c0a798dc403548a5bf532c8ad8483777458793 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 12 Aug 2025 11:32:59 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F=20-=20=E8=BF=90?=
 =?UTF-8?q?=E8=BE=93=E7=AE=A1=E7=90=86=20-=20=E8=B4=A7=E7=89=A9=E7=BB=84?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=BC=96=E8=BE=91=E7=9B=B8=E5=90=8C=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E7=A7=BB=E9=99=A4=E5=90=8E=E5=8F=88=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA0bug=E4=BF=AE=E5=A4=8D=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/mapper/EmisTmsSiteBatchDtlMapper.java   | 10 ++++++++++
 .../impl/EmisTmsSiteBatchDtlServiceImpl.java     | 16 +++++++++++++++-
 .../mapper/EmisTmsSiteBatchDtlMapper.xml         | 10 ++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchDtlMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchDtlMapper.java
index 7c69d9f7c..ad23d1eef 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchDtlMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchDtlMapper.java
@@ -112,4 +112,14 @@ public interface EmisTmsSiteBatchDtlMapper extends BaseMapper<EmisTmsSiteBatchDt
      * @param billCode 运单号
      */
     void updatetWaybillBatchStatus(@Param("list") List<String> batchNos, @Param("billCode") String billCode);
+
+    /**
+     * 根据批次号和运单号查询批次明细
+     *
+     * @param batchNo  批次号
+     * @param billCode 运单号
+     * @return 批次明细
+     */
+    EmisTmsSiteBatchDtl selectEmisTmsSiteBatchDtlByBatchNoAndBillCode(@Param("batchNo") String batchNo,
+            @Param("billCode") String billCode);
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
index 57dbfe8ef..c10be6ab0 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
@@ -132,6 +132,7 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
         }
 
         String billCode = emisTmsSiteBatchDtl.getBillCode();
+        String batchNo = emisTmsSiteBatchDtl.getBatchNo();
         String startSiteCode = (String) emisTmsSiteBatchDtl.getParams().get("startSiteCode");
         String nextSiteCode = (String) emisTmsSiteBatchDtl.getParams().get("nextSiteCode");
         String supplierCode = (String) emisTmsSiteBatchDtl.getParams().get("supplierCode");
@@ -140,6 +141,9 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
         if (StringUtils.isBlank(billCode)) {
             throw new EmisBizError(EmisBizErrorType.FAIL, "运单号不能为空");
         }
+        if (StringUtils.isBlank(batchNo)) {
+            throw new EmisBizError(EmisBizErrorType.FAIL, "批次号不能为空");
+        }
         if (StringUtils.isBlank(startSiteCode)) {
             throw new EmisBizError(EmisBizErrorType.FAIL, "起始网点编码不能为空");
         }
@@ -157,11 +161,21 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
         EmisTmsSiteBatchDtl result = new EmisTmsSiteBatchDtl();
         result.setWaybillDetail(emisWaybill);
 
+        // 根据批次号、运单号查询emis_tms_site_batch_dtl，如果存在，直接返回数据
+        EmisTmsSiteBatchDtl existingBatchDtl = emisTmsSiteBatchDtlMapper
+                .selectEmisTmsSiteBatchDtlByBatchNoAndBillCode(batchNo, billCode);
+        if (existingBatchDtl != null) {
+            result.setBatchParcelQty(existingBatchDtl.getBatchParcelQty());
+            result.setBatchWeight(existingBatchDtl.getBatchWeight());
+            result.setBatchVolume(existingBatchDtl.getBatchVolume());
+            return result;
+        }
+
         // 查询运输计划规则
         EmisTransPlanRule emisTransPlanRule = new EmisTransPlanRule();
         emisTransPlanRule.setStartSiteCode(startSiteCode);
         emisTransPlanRule.setNextSiteCode(nextSiteCode);
-//        emisTransPlanRule.setSupplierCode(supplierCode);
+        // emisTransPlanRule.setSupplierCode(supplierCode);
         emisTransPlanRule.setLineCode(emisWaybill.getTransLineType());
         emisTransPlanRule.setProductType(emisWaybill.getProductType());
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
index ee0aa1474..8284aa5e9 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
@@ -256,4 +256,14 @@
         and bill_code = #{billCode}
         and del_flag = '0'
     </update>
+
+    <!-- 根据批次号和运单号查询批次明细 -->
+    <select id="selectEmisTmsSiteBatchDtlByBatchNoAndBillCode" resultMap="BaseEmisTmsSiteBatchDtlResult">
+        select id, bill_code, batch_no, scan_date, scan_status, group_status, scan_man, scan_site, batch_volume, batch_parcel_qty, batch_weight, waybill_batch_status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        from emis_tms_site_batch_dtl
+        where batch_no = #{batchNo}
+        and bill_code = #{billCode}
+        and del_flag = '0'
+        limit 1
+    </select>
 </mapper>
\ No newline at end of file