From 2ed72b04320de4433e94128db644a4f2c3878f21 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Wed, 12 Jun 2024 10:07:06 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E4=BC=98=E5=8C=96=E4=B8=8A=E7=BA=BF?=
 =?UTF-8?q?=E6=9C=9F=E9=97=B4=E6=8F=90=E5=87=BA=E7=9A=84=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eas/dao/xml/AllocationBillMapper.xml         | 16 +++++++++++-----
 .../database/eas/dao/xml/ReceiptBillMapper.xml   |  2 +-
 .../impl/EasOutInBillDetailServiceImpl.java      |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml
index cf42018..cad7025 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml
@@ -19,8 +19,11 @@
             OR drkcmc LIKE '%' || #{fuzzy} || '%'
             )
         </if>
-        <if test="ckbm != null and ckbm != ''">
-            AND (dckcbm = #{ckbm} OR drkcbm = #{ckbm})
+        <if test="drkcbm != null and drkcbm != ''">
+            AND (drkcbm = #{drkcbm})
+        </if>
+        <if test="dckcbm != null and dckcbm != ''">
+            AND (dckcbm = #{dckcbm})
         </if>
         ORDER BY CJSJ DESC ) temp )
     </select>
@@ -39,8 +42,11 @@
                   OR drkcmc LIKE '%' || #{fuzzy} || '%'
                 )
         </if>
-        <if test="ckbm != null and ckbm != ''">
-            AND (dckcbm = #{ckbm} OR drkcbm = #{ckbm})
+        <if test="drkcbm != null and drkcbm != ''">
+            AND (drkcbm = #{drkcbm})
+        </if>
+        <if test="dckcbm != null and dckcbm != ''">
+            AND (dckcbm = #{dckcbm})
         </if>
         ORDER BY CJSJ DESC ) temp WHERE <![CDATA[ ROWNUM <= #{size} * #{page} ]]>) WHERE
         <![CDATA[ row_num > #{size} * (#{page} - 1) ]]>
@@ -51,7 +57,7 @@
         SELECT * FROM (
                           SELECT V.*, ROW_NUMBER() OVER (ORDER BY V.YWRQ DESC) AS RNUM
                           FROM EAS_NOBLE.V_UC_STOCKTRANSFERBILL V
-                          WHERE V.DJID = #{djid}
+                          WHERE V.DJID = #{djid} ORDER BY V.WLBM ASC
                       )
         WHERE RNUM BETWEEN (#{page} - 1) * #{size} + 1 AND #{page} * #{size}
     </select>
diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/ReceiptBillMapper.xml b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/ReceiptBillMapper.xml
index 154c61e..5aed79c 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/ReceiptBillMapper.xml
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/ReceiptBillMapper.xml
@@ -46,6 +46,6 @@
         <!--            OR bz LIKE CONCAT('%', #{fuzzy}, '%')-->
         <!--            )-->
         <!--        </if>-->
-        ORDER BY TJSJ DESC
+        ORDER BY WLBM DESC
     </select>
 </mapper>
diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillDetailServiceImpl.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillDetailServiceImpl.java
index e5a16a2..f996f86 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillDetailServiceImpl.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillDetailServiceImpl.java
@@ -62,7 +62,7 @@ public class EasOutInBillDetailServiceImpl extends ServiceImpl<EasOutInBillDetai
         params.setSize(500);
         Page<EasOutInBillDetail> result = easOutInBillDetailMapper.selectPage(new Page<>(params.getPage(), params.getSize()), new QueryWrapper<EasOutInBillDetail>()
                 .lambda()
-                .eq(ObjectUtil.isNotEmpty(params), EasOutInBillDetail::getDjid, params.getDjid())
+                .eq(ObjectUtil.isNotEmpty(params), EasOutInBillDetail::getDjid, params.getDjid()).orderByAsc(EasOutInBillDetail::getWlbm)
         );
         List<EasOutInBillDetail> easOutInBillDetailList = result.getRecords();
         List<InventoryInfo> inventoryInfoList = queryInventoryInfoList(easOutInBillDetailList);