From 60ebf5215e80a780ac523299307a6e117957e18b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 14 May 2025 03:47:53 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisTmsSiteBatchController.java  |  30 +++++
 .../emis/mapper/EmisTmsSiteBatchMapper.java   |   2 +
 .../service/IEmisTmsSiteBatchService.java     |   7 ++
 .../mapper/EmisTmsSiteBatchMapper.xml         | 119 ++++++++++++++++++
 4 files changed, 158 insertions(+)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
index d847c0e5a..e43ab2f39 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
@@ -79,6 +79,36 @@ public class EmisTmsSiteBatchController extends EmisBaseController
         return getDataTable(list);
     }
 
+    /**
+     * 批次明细
+     * @param emisTmsSiteBatch
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisTmsSiteBatch:list')")
+    @GetMapping("/listBatchDtl")
+    public TableDataInfo listBatchDtl(EmisTmsSiteBatch emisTmsSiteBatch)
+    {
+
+        startPage();
+
+        // 设置通用权限查询参数
+        setPrivParams(emisTmsSiteBatch);
+
+        if(!StringUtils.isEmpty(emisTmsSiteBatch.getBatchNo())){
+            emisTmsSiteBatch.setBatchNo(WaybillHelper.formatQueryValue(emisTmsSiteBatch.getBatchNo()));
+        }
+
+        if(emisTmsSiteBatch.getParams().get("billCode")!=null){
+            String billCodeStr=emisTmsSiteBatch.getParams().get("billCode").toString();
+            billCodeStr=WaybillHelper.formatQueryValue(billCodeStr);
+            emisTmsSiteBatch.getParams().put("billCode",billCodeStr);
+        }
+
+
+        List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectEmisTmsSiteBatchList(emisTmsSiteBatch);
+        return getDataTable(list);
+    }
+
     /**
      * 导出一级网点TMS组批次列表
      */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java
index 4c630e524..f7091b972 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java
@@ -42,6 +42,8 @@ public interface EmisTmsSiteBatchMapper extends BaseMapper<EmisTmsSiteBatch>
      */
     public List<EmisTmsSiteBatch> selectEmisTmsSiteBatchList(EmisTmsSiteBatch emisTmsSiteBatch);
 
+    public List<EmisTmsSiteBatch> selectEmisTmsSiteBatchDtlList(EmisTmsSiteBatch emisTmsSiteBatch);
+
     /**
      * 获取待处理提成批次列表
      * @param emisTmsSiteBatch
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java
index aefb1dc74..178db8f0d 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java
@@ -35,6 +35,13 @@ public interface IEmisTmsSiteBatchService
      */
     public List<EmisTmsSiteBatch> selectEmisTmsSiteBatchList(EmisTmsSiteBatch emisTmsSiteBatch);
 
+    /**
+     * 批次明细
+     * @param emisTmsSiteBatch
+     * @return
+     */
+    public List<EmisTmsSiteBatch> selectEmisTmsSiteBatchDtlList(EmisTmsSiteBatch emisTmsSiteBatch);
+
     /**
      * 新增一级网点TMS组批次
      * 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
index 92047440a..be7b3383c 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
@@ -45,6 +45,49 @@
 
         <association property="startSiteName"    column="start_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
         <association property="nextSiteName"    column="next_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+    </resultMap>
+
+    <resultMap type="EmisTmsSiteBatch" id="EmisTmsSiteBatchDtlResult" extends="EmisTmsSiteBatchResult">
+        <result property="id"    column="id"    />
+        <result property="batchNo"    column="batch_no"    />
+        <result property="batchName"    column="batch_name"    />
+        <result property="batchDate"    column="batch_date"    />
+        <result property="supplierCode"    column="supplier_code"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="transLineType"    column="trans_line_type"    />
+        <result property="productType"    column="product_type"    />
+        <result property="batchType"    column="batch_type"    />
+        <result property="transType"    column="trans_type"    />
+        <result property="startSiteCode"    column="start_site_code"    />
+        <result property="sendCountry"    column="send_country"    />
+        <result property="nextSiteCode"    column="next_site_code"    />
+        <result property="airBilllNo"    column="air_billl_no"    />
+        <result property="etd"    column="etd"    />
+        <result property="eta"    column="eta"    />
+        <result property="carNo"    column="car_no"    />
+        <result property="shipNo"    column="ship_no"    />
+        <result property="clearanceResStatus"    column="clearance_res_status"    />
+        <result property="declareResStatus"    column="declare_res_status"    />
+        <result property="destCountry"    column="dest_country"    />
+        <result property="destCountryName"    column="dest_country_name"    />
+        <result property="transWeight"    column="trans_weight"    />
+        <result property="packNum"    column="pack_num"    />
+        <result property="totalParcelQty"    column="total_parcel_qty"    />
+        <result property="totalWaybillQty"    column="total_waybill_qty"    />
+        <result property="totalVolume"    column="total_volume"    />
+        <result property="totalWeight"    column="total_weight"    />
+        <result property="opMan"    column="op_man"    />
+        <result property="blEntering"    column="bl_entering"    />
+
+        <!--   扩展     -->
+        <association property="productTypeName"    column="product_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProdNameByCode"/>
+        <association property="transLineTypeName"    column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
+
+        <association property="sendCountryName"    column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectFromCountryNameByLineCode"/>
+        <association property="destCountryName"    column="dest_country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
+
+        <association property="startSiteName"    column="start_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="nextSiteName"    column="next_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
 
         <!-- 批次明细列表 -->
         <collection property="batchDtlList" ofType="EmisTmsSiteBatchDtl" select="com.xdadan.erp.emis.mapper.EmisTmsSiteBatchDtlMapper.selectEmisTmsSiteBatchDtlByBatchNo" column="batch_no">
@@ -139,6 +182,82 @@
         order by create_time desc
     </select>
 
+    <select id="selectEmisTmsSiteBatchDtlList" parameterType="EmisTmsSiteBatch" resultMap="EmisTmsSiteBatchDtlResult">
+        <include refid="selectEmisTmsSiteBatchVo"/>
+        <where>
+            del_flag='0'
+            <if test="id != null "> and id = #{id}</if>
+            <if test="batchNo != null  and batchNo != ''"> and ( FIND_IN_SET(`batch_no`,#{batchNo}) or batch_no like concat('%', #{batchNo}, '%') )</if>
+            <if test="batchName != null  and batchName != ''"> and ( batch_name like concat('%', #{batchName}, '%') )</if>
+            <if test="batchDate != null "> and batch_date = #{batchDate}</if>
+            <if test="transLineType != null  and transLineType != ''"> and trans_line_type=#{transLineType}</if>
+            <if test="productType != null  and productType != ''"> and product_type=#{productType}</if>
+            <if test="batchType != null  and batchType != ''"> and batch_type=#{batchType}</if>
+            <if test="transType != null  and transType != ''"> and trans_type=#{transType}</if>
+            <if test="startSiteCode != null  and startSiteCode != ''"> and start_site_code=#{startSiteCode}</if>
+            <if test="sendCountry != null  and sendCountry != ''"> and send_country=#{sendCountry}</if>
+            <if test="nextSiteCode != null  and nextSiteCode != ''"> and next_site_code=#{nextSiteCode}</if>
+            <if test="airBilllNo != null  and airBilllNo != ''"> and air_billl_no=#{airBilllNo}</if>
+            <if test="supplierCode != null  and supplierCode != ''"> and supplier_code=#{supplierCode}</if>
+            <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
+            <if test="etd != null "> and etd = #{etd}</if>
+            <if test="eta != null "> and eta = #{eta}</if>
+            <if test="packNum != null "> and pack_num = #{packNum}</if>
+            <if test="carNo != null  and carNo != ''"> and car_no like concat('%', #{carNo}, '%')</if>
+            <if test="shipNo != null  and shipNo != ''"> and ship_no=#{shipNo}</if>
+            <if test="clearanceResStatus != null  and clearanceResStatus != ''"> and clearance_res_status= #{clearanceResStatus}</if>
+            <if test="declareResStatus != null  and declareResStatus != ''"> and declare_res_status=#{declareResStatus}</if>
+            <if test="destCountry != null  and destCountry != ''"> and dest_country=#{destCountry}</if>
+            <if test="destCountryName != null  and destCountryName != ''"> and dest_country_name like concat('%', #{destCountryName}, '%')</if>
+            <if test="totalParcelQty != null "> and total_parcel_qty = #{totalParcelQty}</if>
+            <if test="totalWaybillQty != null "> and total_waybill_qty = #{totalWaybillQty}</if>
+            <if test="totalVolume != null "> and total_volume = #{totalVolume}</if>
+            <if test="totalWeight != null "> and total_weight = #{totalWeight}</if>
+            <if test="opMan != null  and opMan != ''"> and op_man like concat('%', #{opMan}, '%')</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
+            <if test="tenantId != null  and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
+            <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
+            <if test="createBy != null  and createBy != ''"> and create_by=#{createBy}</if>
+            <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by=#{updateBy}</if>
+            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+            <if test="createSite != null  and createSite != ''"> and create_site=#{createSite}</if>
+            <if test="updateSite != null  and updateSite != ''"> and update_site=#{updateSite}</if>
+            <if test="blEntering != null  and blEntering != ''"> and bl_entering=#{blEntering}</if>
+
+            <if test="searchValue != null  and searchValue != '' ">
+                and  ( batch_no like concat('%', #{searchValue},'%') or batch_name like concat('%', #{searchValue},'%') or car_no like concat('%', #{searchValue},'%')  )
+            </if>
+
+            <if test="params.billCode != null and params.billCode != ''">
+                and  batch_no in (select batch_no from emis_tms_site_batch_dtl where del_flag='0' and FIND_IN_SET(`bill_code`,#{params.billCode}) )
+            </if>
+
+            <if test="params.beginCreateTime != null and params.beginCreateTime != ''">
+                and create_time <![CDATA[ >= ]]>  #{params.beginCreateTime}
+            </if>
+            <if test="params.endCreateTime != null and params.endCreateTime != ''">
+                and create_time <![CDATA[ <= ]]>  #{params.endCreateTime}
+            </if>
+
+            <if test="params.beginEtd != null and params.beginEtd != ''">
+                and etd <![CDATA[ >= ]]>  #{params.beginEtd}
+            </if>
+            <if test="params.endEtd != null and params.endEtd != ''">
+                and etd <![CDATA[ <= ]]>  #{params.endEtd}
+            </if>
+
+            <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
+                and (
+                start_site_code=#{params.privSiteCode}
+                or create_site=#{params.privSiteCode}
+                )
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+
     <!--  查询待提成运单  -->
     <select id="selectWaitDoProfitList" parameterType="EmisTmsSiteBatch" resultMap="EmisTmsSiteBatchResult">
         SELECT