From 04bd49b254e01045b593a17bdadcb66a9ac4ca4a Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 10 Jun 2025 14:43:42 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E5=AF=B9=E6=8E=A5=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=8E=A5=E5=8F=A3=E8=AE=A2=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xdadan/erp/emis/mapper/EmisWaybillMapper.java |  8 ++++++++
 .../xdadan/erp/emis/service/IEmisWaybillService.java  |  9 +++++++++
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java | 11 +++++++++--
 .../src/main/resources/mapper/EmisWaybillMapper.xml   | 11 ++++++++++-
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
index d899cf8a6..406885b55 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
@@ -288,4 +288,12 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
      * @return 运单列表
      */
     List<EmisWaybill> selectWaybillListBySiteBatchStatus(@Param("offset") int offset, @Param("pageSize") int pageSize);
+
+    /**
+     * 根据客户单号查运单
+     *
+     * @param custOrderId
+     * @return
+     */
+    EmisWaybill selectEmisWaybillByCustOrderId(String custOrderId);
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
index f015eebf3..7e95ea237 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
@@ -48,6 +48,15 @@ public interface IEmisWaybillService extends IDataAuditService
      public EmisWaybill selectEmisWaybillByOrderSn(String orderSn);
 
 
+ /**
+  * 根据客户订单号查询
+  *
+  * @param custOrderId
+  * @return
+  */
+ public EmisWaybill selectEmisWaybillByCustOrderId(String custOrderId);
+
+
 
     /**
      * 查询运单列表列表
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 718d20453..e741cca8f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -169,6 +169,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         return emisWaybillMapper.selectEmisWaybillByOrderSn(orderSn);
     }
 
+    @Override
+    public EmisWaybill selectEmisWaybillByCustOrderId(String custOrderId)
+    {
+        return emisWaybillMapper.selectEmisWaybillByCustOrderId(custOrderId);
+    }
+
 
     /**
      * 查询运单列表列表
@@ -4708,7 +4714,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                     }
 
                     // 2.2 检查订单是否已存在
-                    EmisWaybill existWaybill = selectEmisWaybillByOrderSn(orderNo);
+                    EmisWaybill existWaybill = this.selectEmisWaybillByCustOrderId(orderNo);
                     if (existWaybill != null) {
                         resultList.add(buildFailResult(orderNo, "订单号已存在"));
                         continue;
@@ -4765,7 +4771,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                     EmisWaybill waybill = new EmisWaybill();
                     resetWaybillData(waybill);
                     waybill.setBillCode(waybillNo);
-                    waybill.setOrderSn(orderNo);
+                    waybill.setOrderSn(WaybillHelper.genOrderSn());
+                    waybill.setCustOrderId(orderNo);
                     waybill.setTransLineType(transLineType);
                     waybill.setProductType(productType);
                     // 清关方式 1:快递清关,2:自提清关,3:一般贸易清关
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 3c4ebe458..75171053b 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -507,7 +507,16 @@
         </where>
     </select>
 
-<!--    多个运单查询-->
+    <!--    根据客户订单号查询 -->
+    <select id="selectEmisWaybillByCustOrderId" parameterType="String" resultMap="EmisWaybillResult">
+        <include refid="selectEmisWaybillDetailVo"/>
+        <where>
+            cust_order_id = #{custOrderId}
+        </where>
+    </select>
+
+
+    <!--    多个运单查询-->
     <select id="selectEmisWaybillByMutiBillCode" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
         <include refid="selectEmisWaybillVo"/>
         where a.del_flag='0'