From 71963e4e04fa1de6e693314b0f833cf036117218 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 23 Apr 2024 04:33:35 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/web/emis/EmisCommonController.java | 10 +++++-----
 .../com/xdadan/erp/emis/mapper/EmisWaybillMapper.java |  2 ++
 .../xdadan/erp/emis/service/IEmisWaybillService.java  | 11 +++++++++++
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java |  5 +++++
 .../src/main/resources/mapper/EmisWaybillMapper.xml   |  7 +++++++
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index fe3e6f5ce..f68e9f03d 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -69,26 +69,26 @@ public class EmisCommonController extends BaseController
      * 获取电子运单信息
      */
     @PostMapping(value = "/getWaybillDetail")
-    public AjaxResult getWaybillDetail(@RequestParam("billCode")String billCode,@RequestParam("custOrderId")String custOrderId )
+    public AjaxResult getWaybillDetail(@RequestParam("billCode")String billCode,@RequestParam("orderSn")String orderSn )
     {
         try {
 //            String waybillNo = emisElectronicPagService.realMatchWaybill();
 
             EmisWaybill emisWaybill=null;
 
-            if(StringUtils.isEmpty(billCode) && StringUtils.isEmpty(custOrderId) ){
+            if(StringUtils.isEmpty(billCode) && StringUtils.isEmpty(orderSn) ){
                 return AjaxResult.error("参数错误");
             }
 
             if(!StringUtils.isEmpty(billCode) ){
-                emisWaybill = emisWaybillService.selectEmisWaybillByBillCode(billCode);
+                emisWaybill = emisWaybillService.selectEmisWaybillByBillCode(orderSn);
                 if(emisWaybill==null){
                     return AjaxResult.error("未找到该运单");
                 }
             }
 
-            if(!StringUtils.isEmpty(custOrderId) ) {
-                emisWaybill = emisWaybillService.selectEmisWaybillByBillCode(custOrderId);
+            if(!StringUtils.isEmpty(orderSn) ) {
+                emisWaybill = emisWaybillService.selectEmisWaybillByOrderSn(orderSn);
                 if(emisWaybill==null){
                     return AjaxResult.error("未找到该运单");
                 }
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 6250b43e7..8732424ff 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
@@ -24,6 +24,8 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
 
     public EmisWaybill selectEmisWaybillByBillCode(String billCode);
 
+    public EmisWaybill selectEmisWaybillByOrderSn(String orderSn);
+
     /**
      * 主键查询
      * @param  id
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 7a44e13ff..f4e9ef7be 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
@@ -28,6 +28,17 @@ public interface IEmisWaybillService
    */
    public EmisWaybill selectEmisWaybillByBillCode(String billCode);
 
+
+     /**
+      * 根据订单号查询
+      * @param orderSn
+      * @return
+      */
+     public EmisWaybill selectEmisWaybillByOrderSn(String orderSn);
+
+
+
+
   /**
    * 根据客户单号查询
    * @param 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 01450bfba..030e198af 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
@@ -47,6 +47,11 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
         return emisWaybillMapper.selectEmisWaybillByBillCode(billCode);
     }
 
+    @Override
+    public EmisWaybill selectEmisWaybillByOrderSn(String orderSn)
+    {
+        return emisWaybillMapper.selectEmisWaybillByOrderSn(orderSn);
+    }
 
     /**
      * 查询运单列表
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 4fa584423..a25ab701c 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -324,6 +324,13 @@
         where a.bill_code = #{billCode}
     </select>
 
+    <select id="selectEmisWaybillByOrderSn" parameterType="string" resultMap="EmisWaybillResult">
+        select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, waybill_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_customer_name, third_customer_code, third_customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, receive_pcd, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, send_pcd, payment_type, calc_fee_type, cust_no, trans_line_type, product_type, time_type, meter_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_bill_text, bl_over_weight, over_weight_number, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site_code, insure_date, bl_print, print_man_code, print_site, print_date, print_count, bl_disp_fd, transfer_code, transfer_billcode, disp_fd_date, disp_fd_reason, current_site_code, next_site_code, last_site_code, register_site_code, register_date, register_man_code, take_piece_employee_code, send_site_code, send_date, dispatch_man_code, dispatch_date, dispatch_site_code, produce_bill_date, produce_bill_site_code, produce_bill_man_code, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site_code, destination_center_code, market_man_code, payee, salesmen, operate_employee_code, bl_is_question, problem_cause, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site
+        from emis_waybill a
+        where a.order_sn = #{orderSn}
+    </select>
+
+
     <insert id="insertEmisWaybill" parameterType="EmisWaybill">
         insert into emis_waybill
         <trim prefix="(" suffix=")" suffixOverrides=",">