From 38b317a07d45d2d0af4380ef539220d6a277c4ff Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 9 Jan 2025 15:07:30 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisTmsSiteBatchController.java | 16 +++++++++++++++-
 .../resources/mapper/EmisTmsSiteBatchMapper.xml  |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

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 9460304ac..d847c0e5a 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
@@ -11,8 +11,12 @@
 
 package com.xdadan.erp.web.emis;
 
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.xdadan.erp.emis.utils.WaybillHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,7 +33,6 @@ import com.xdadan.erp.common.core.controller.BaseController;
 import com.xdadan.erp.common.core.domain.AjaxResult;
 import com.xdadan.erp.common.core.page.TableDataInfo;
 import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
 import com.xdadan.erp.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisTmsSiteBatch;
@@ -61,6 +64,17 @@ public class EmisTmsSiteBatchController extends EmisBaseController
         // 设置通用权限查询参数
         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);
     }
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
index 5beaacc19..b8ffab35c 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
@@ -98,7 +98,7 @@
             </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 bill_code=#{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 != ''">