From 28a9eec86a7d693a074765ab5c12669c4fc4fe80 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 29 Jul 2024 05:12:01 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisSettleBillController.java    | 30 +++++++++++++++----
 .../resources/mapper/EmisWaybillMapper.xml    |  4 +--
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
index b9ae3acd5..bd2b50636 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
@@ -16,14 +16,12 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.io.resource.ResourceUtil;
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.support.ExcelTypeEnum;
@@ -41,8 +39,10 @@ import com.xdadan.erp.emis.domain.vo.scan.ScanResult;
 import com.xdadan.erp.emis.service.EmisBaseService;
 import com.xdadan.erp.emis.service.billexport.ExcelUtils;
 import com.xdadan.erp.emis.service.billexport.MapObjectUtil;
+import com.xdadan.erp.emis.utils.WaybillHelper;
 import org.apache.commons.io.Charsets;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -61,7 +61,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.EmisSettleBill;
@@ -92,6 +91,27 @@ public class EmisSettleBillController extends BaseController
     public TableDataInfo list(EmisSettleBill emisSettleBill)
     {
         startPage();
+
+        String billCodeStr = MapUtil.getStr(emisSettleBill.getParams(),"billCode");
+        if(!StringUtils.isEmpty(billCodeStr)){
+            emisSettleBill.getParams().put("billCode",WaybillHelper.formatQueryValue(billCodeStr));
+            String[] billCodeSortList = billCodeStr.split(",");
+            if(billCodeSortList.length>1){
+                emisSettleBill.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList));
+            }
+        }
+
+
+        if(!StringUtils.isEmpty(emisSettleBill.getSettleBillNo())){
+            emisSettleBill.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettleBill.getSettleBillNo()));
+            String[] settleBillNoSortList = emisSettleBill.getSettleBillNo().split(",");
+            if(settleBillNoSortList.length>1){
+                emisSettleBill.getParams().put("settleBillNoSortList",Arrays.asList(settleBillNoSortList));
+            }
+        }
+
+
+
         List<EmisSettleBill> list = emisSettleBillService.selectEmisSettleBillList(emisSettleBill);
         return getDataTable(list);
     }
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index d568d5002..0a71127dc 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -491,7 +491,7 @@
     <select id="selectOrderList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
         <include refid="selectEmisWaybillVo"/>
         <where>
-            a.del_flag='0'
+            a.del_flag='0' and a.order_type='0'
             <if test="id != null "> and a.id = #{id}</if>
             <if test="orderSn != null  and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
             <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
@@ -500,7 +500,7 @@
             <if test="billCodeSub != null  and billCodeSub != ''"> and bill_code_sub like concat('%', #{billCodeSub}, '%')</if>
             <if test="orderStatus != null  and orderStatus != ''"> and order_status=#{orderStatus}</if>
             <if test="waybillStatus != null  and waybillStatus != ''"> and waybill_status=#{waybillStatus}</if>
-            <if test="orderType != null  and orderType != ''"> and order_type like concat('%', #{orderType}, '%')</if>
+            <if test="orderType != null  and orderType != ''"> and order_type=#{orderType}</if>
             <if test="orderDate != null "> and order_date = #{orderDate}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="customerCode != null  and customerCode != ''"> and customer_code=#{customerCode}</if>