From bed570773cf80139e080a5bef15645dfa2d904cc Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 14 Jun 2024 08:31:11 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/web/emis/EmisTmsScanRecordController.java   | 3 ++-
 .../src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
index d848f9f8c..23d50ccd0 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
@@ -147,11 +147,12 @@ public class EmisTmsScanRecordController extends EmisBaseController
 
     @GetMapping("/getNextStationList")
     @JacksonFilter(include= {"startSite","destSite","startSiteName","destSiteName"},value= EmisTmsTransPlanDtl.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
-    public TableDataInfo getNextStationList(String searchValue)
+    public TableDataInfo getNextStationList(String searchValue,String transType)
     {
         startPage();
         EmisTmsTransPlanDtl queryObj = new EmisTmsTransPlanDtl();
         queryObj.setStartSite(getLoginUser().getUser().getOwnerSiteCode());
+        queryObj.setTransType(transType);
         queryObj.getParams().put("searchValue",searchValue);
         List<EmisTmsTransPlanDtl> list = emisTmsTransPlanDtlService.selectPreOrNextSiteList(queryObj);
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
index f9217e2d7..c3924114f 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
@@ -58,7 +58,7 @@
             <if test="stepName != null  and stepName != ''"> and step_name like concat('%', #{stepName}, '%')</if>
             <if test="startSite != null  and startSite != ''"> and FIND_IN_SET( #{startSite}, start_site ) </if>
             <if test="destSite != null  and destSite != ''"> and FIND_IN_SET( #{destSite}, dest_site )</if>
-            <if test="transType != null  and transType != ''"> and trans_type=#{transType}</if>
+            <if test="transType != null  and transType != ''"> and FIND_IN_SET(trans_type,#{transType} )</if>
             <if test="estCostDay != null "> and est_cost_day like concat('%', #{estCostDay}, '%')</if>
             <if test="orderNum != null "> and order_num = #{orderNum}</if>
             <if test="status != null  and status != ''"> and status=#{status}</if>