From 3aecbf098dfbca214a4b0191024b4218df0cdf2b Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 21 Sep 2024 17:16:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java     | 5 +++--
 .../mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml       | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
index b6ffca9..67d8731 100644
--- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
@@ -1446,7 +1446,8 @@ public class CtqyyClient extends CommonHttpClient {
             );
             wrapper.like(StrUtil.isNotEmpty(udiwmsThrOrderRequest.getFromCorpName()), VYpzsPlanInfo::getSCQYMC, udiwmsThrOrderRequest.getFromCorpName());
 
-            Page<VYpzsPlanInfo> page = vYpzsPlanInfoMapper.selectGroupedWithPagination(new Page<VYpzsPlanInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), udiwmsThrOrderRequest);
+            Page<VYpzsPlanInfo> page = vYpzsPlanInfoMapper.selectGroupedWithPagination(
+                    new Page<VYpzsPlanInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), udiwmsThrOrderRequest);
 
             List<VYpzsPlanInfo> planInfos = page.getRecords();
             List<IoCollectOrder> ioCollectOrders = new ArrayList<>();
@@ -1510,7 +1511,7 @@ public class CtqyyClient extends CommonHttpClient {
             wrapper.le(StrUtil.isNotEmpty(endTime), VYpzsIoInfo::getKEEP_BOOK_TIME, endTime);
             wrapper.and(StrUtil.isNotEmpty(udiwmsThrOrderRequest.getCorpName()), t -> t.like(VYpzsIoInfo::getCONSIGNEE_NAME, udiwmsThrOrderRequest.getCorpName()).or().eq(VYpzsIoInfo::getCONSIGNOR_NAME, udiwmsThrOrderRequest.getCorpName()));
 
-            wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsIoInfo::getPHYSIC_CODE, udiwmsThrOrderRequest.getBillNo());
+            wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsIoInfo::getRECEIPT_NUMBER, udiwmsThrOrderRequest.getBillNo());
             wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBusType()), VYpzsIoInfo::getIO_SORT, udiwmsThrOrderRequest.getBusType());
 
             wrapper.like(StrUtil.isNotEmpty(udiwmsThrOrderRequest.getFromCorpName()), VYpzsIoInfo::getCONSIGNEE_NAME, udiwmsThrOrderRequest.getFromCorpName());
diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml
index b5cf2d5..9983571 100644
--- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml
+++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml
@@ -53,7 +53,7 @@
                  or CONSIGNEE_NAME LIKE '%' || #{udiwmsThrOrderRequest.corpName} || '%')
             </if>
             <if test="udiwmsThrOrderRequest.billNo != null and udiwmsThrOrderRequest.billNo != ''">
-                and PHYSIC_CODE LIKE '%' || #{udiwmsThrOrderRequest.billNo} || '%'
+                and RECEIPT_NUMBER = #{udiwmsThrOrderRequest.billNo}
             </if>
             <if test="udiwmsThrOrderRequest.fromCorpName != null and udiwmsThrOrderRequest.fromCorpName != ''">
                 and CONSIGNEE_NAME LIKE '%' || #{udiwmsThrOrderRequest.fromCorpName} || '%'
@@ -65,10 +65,11 @@
                 and IO_SORT = #{udiwmsThrOrderRequest.busType}
             </if>
             <if test="udiwmsThrOrderRequest.keyWords != null and udiwmsThrOrderRequest.keyWords != ''">
-                and (KEEP_BOOK_TIME LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%'
-                 or CONSIGNOR_NAME LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%'
+                and (
+                    CONSIGNOR_NAME LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%'
                  or CONSIGNEE_NAME LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%'
                  or PHYSIC_CODE LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%'
+                 or RECEIPT_NUMBER = #{udiwmsThrOrderRequest.keyWords})
                  or IO_SORT = #{udiwmsThrOrderRequest.keyWords})
             </if>
         </where>