From dc54546cae9350752237b37652c2d057255b441f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 10 Nov 2024 18:27:03 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisWaybillCargoController.java  | 13 ++++
 .../erp/emis/domain/EmisWaybillCargo.java     |  5 ++
 .../emis/mapper/EmisWaybillCargoMapper.java   |  8 +++
 .../service/IEmisWaybillCargoService.java     |  8 +++
 .../impl/EmisWaybillCargoServiceImpl.java     | 13 ++++
 .../mapper/EmisWaybillCargoMapper.xml         | 61 +++++++++++++++++++
 6 files changed, 108 insertions(+)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillCargoController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillCargoController.java
index eb8168119..dc5cdc75a 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillCargoController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillCargoController.java
@@ -60,6 +60,19 @@ public class EmisWaybillCargoController extends EmisBaseController
         return getDataTable(list);
     }
 
+
+    /**
+     * 快递单证资料
+     */
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybillCargo:list')")
+    @GetMapping("/listClear")
+    public TableDataInfo listClear(EmisWaybillCargo emisWaybillCargo)
+    {
+        startPage();
+        List<EmisWaybillCargo> list = emisWaybillCargoService.selectClearWaybillCargoList(emisWaybillCargo);
+        return getDataTable(list);
+    }
+
     /**
      * 导出运单货物列表
      */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
index 4ce54d07f..db2bd656d 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
@@ -92,4 +92,9 @@ public class EmisWaybillCargo extends BaseEntity
     /* 排序 */
     private Integer orderNum;
 
+    // 运单信息
+    private String billCode;
+    private String orderSn;
+
+
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillCargoMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillCargoMapper.java
index 95c1cc39a..a8b7c09a8 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillCargoMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillCargoMapper.java
@@ -36,6 +36,14 @@ public interface EmisWaybillCargoMapper extends BaseMapper<EmisWaybillCargo>
      */
     public List<EmisWaybillCargo> selectEmisWaybillCargoList(EmisWaybillCargo emisWaybillCargo);
 
+
+    /**
+     * 获取清关货物资料
+     * @param emisWaybillCargo
+     * @return
+     */
+    public List<EmisWaybillCargo> selectClearWaybillCargoList(EmisWaybillCargo emisWaybillCargo);
+
     /**
      * 新增 
      * 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillCargoService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillCargoService.java
index f6c2cb14a..9c0a38c9b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillCargoService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillCargoService.java
@@ -35,6 +35,14 @@ public interface IEmisWaybillCargoService
      */
     public List<EmisWaybillCargo> selectEmisWaybillCargoList(EmisWaybillCargo emisWaybillCargo);
 
+
+    /**
+     *
+     * @param emisWaybillCargo
+     * @return
+     */
+    public List<EmisWaybillCargo> selectClearWaybillCargoList(EmisWaybillCargo emisWaybillCargo);
+
     /**
      * 新增运单货物
      * 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillCargoServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillCargoServiceImpl.java
index 4515c3ce4..96182ad9d 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillCargoServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillCargoServiceImpl.java
@@ -53,6 +53,19 @@ public class EmisWaybillCargoServiceImpl implements IEmisWaybillCargoService
         return emisWaybillCargoMapper.selectEmisWaybillCargoList(emisWaybillCargo);
     }
 
+
+    /**
+     * 快递单证货物资料
+     * @param emisWaybillCargo 运单货物
+     * @return 运单货物
+     */
+    @Override
+    public List<EmisWaybillCargo> selectClearWaybillCargoList(EmisWaybillCargo emisWaybillCargo)
+    {
+        return emisWaybillCargoMapper.selectClearWaybillCargoList(emisWaybillCargo);
+    }
+
+
     /**
      * 新增运单货物
      * 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
index 0a0ca82ea..425bed4c5 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
@@ -34,12 +34,73 @@
         <result property="volume"    column="volume"    />
         <result property="barcode"    column="barcode"    />
         <result property="orderNum"    column="order_num"    />
+
+
+        <result property="billCode"    column="bill_code"    />
+        <result property="orderSn"    column="order_sn"    />
+
+
+
     </resultMap>
 
     <sql id="selectEmisWaybillCargoVo">
         select id, waybill_id, goods_code, goods_name, cargo_qty, abnormal_qty, unit, weight, price, currency, nation_area, tax_no, hscode, brand, material, purpose, ingredients, manufacturer, supplier, function, goods_model, gross_weight, net_weight, length, width, height, volume, barcode, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill_cargo
     </sql>
 
+
+    <select id="selectClearWaybillCargoList" parameterType="EmisWaybillCargo" resultMap="EmisWaybillCargoResult">
+        select b.id, b.waybill_id, b.goods_code, b.goods_name, b.cargo_qty, b.abnormal_qty,
+        b.unit, b.weight, b.price, b.currency, b.nation_area, b.tax_no, b.hscode, b.brand, b.material,
+        b.purpose, b.ingredients, b.manufacturer, b.supplier, b.function, b.goods_model, b.gross_weight,
+        b.net_weight, b.length, b.width, b.height, b.volume, b.barcode, b.order_num,
+        b.del_flag, b.create_by, b.create_time, b.update_by,
+        b.update_time, b.remark,a.bill_code,a.order_sn
+        from emis_waybill a,emis_waybill_cargo b
+        <where>
+            a.del_flag='0' and b.del_flag='0' and a.waybill_id=b.id and a.order_type='0'
+            <if test="orderSn != null  and orderSn != ''"> and ( FIND_IN_SET(b.`order_sn`,#{orderSn}) or b.order_sn like concat('%', #{orderSn}, '%') ) </if>
+            <if test="billCode != null  and billCode != ''">
+                and ( FIND_IN_SET(b.`bill_code`,#{billCode}) or b.bill_code like concat('%', #{billCode}, '%') )
+            </if>
+            <if test="salesmen == null and params.privSiteCode != null and params.privSiteCode != '88888'">
+                and (
+                a.send_site_code in (
+                SELECT t1.site_code FROM (
+                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                #{params.privSiteCode} ) pd
+                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                UNION
+                SELECT #{params.privSiteCode} FROM dual
+                )
+                or
+                a.dispatch_site_code in (
+                SELECT t1.site_code FROM (
+                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                #{params.privSiteCode} ) pd
+                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                UNION
+                SELECT #{params.privSiteCode} FROM dual
+                )
+                <if test="params.isQueryPrintOrder != null and params.isQueryPrintOrder == 1">
+                    or EXISTS (select 1 from emis_tms_scan_record  etsr where a.bill_code=etsr.main_bill_code and etsr.scan_site_code=#{params.privSiteCode})
+                </if>
+
+                <if test="custNo != null and custNo != ''">
+                    or EXISTS (
+                    select 1 from emis_customer_user ecu where a.cust_no=ecu.monthly_pay_code and ecu.owner_site=#{params.privSiteCode}
+                    )
+                </if>
+
+                or a.salesmen=#{params.privEmpName}
+                or a.payee=#{params.privEmpName}
+                or a.operate_employee_code=#{params.privEmpCode}
+                or a.take_piece_employee_code=#{params.privEmpCode}
+                )
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
     <select id="selectEmisWaybillCargoList" parameterType="EmisWaybillCargo" resultMap="EmisWaybillCargoResult">
         <include refid="selectEmisWaybillCargoVo"/>
         <where>