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} || '%'
)
-
- AND (dckcbm = #{ckbm} OR drkcbm = #{ckbm})
+
+ AND (drkcbm = #{drkcbm})
+
+
+ AND (dckcbm = #{dckcbm})
ORDER BY CJSJ DESC ) temp )
@@ -39,8 +42,11 @@
OR drkcmc LIKE '%' || #{fuzzy} || '%'
)
-
- AND (dckcbm = #{ckbm} OR drkcbm = #{ckbm})
+
+ AND (drkcbm = #{drkcbm})
+
+
+ AND (dckcbm = #{dckcbm})
ORDER BY CJSJ DESC ) temp WHERE ) WHERE
#{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}
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 @@
- ORDER BY TJSJ DESC
+ ORDER BY WLBM DESC
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 result = easOutInBillDetailMapper.selectPage(new Page<>(params.getPage(), params.getSize()), new QueryWrapper()
.lambda()
- .eq(ObjectUtil.isNotEmpty(params), EasOutInBillDetail::getDjid, params.getDjid())
+ .eq(ObjectUtil.isNotEmpty(params), EasOutInBillDetail::getDjid, params.getDjid()).orderByAsc(EasOutInBillDetail::getWlbm)
);
List easOutInBillDetailList = result.getRecords();
List inventoryInfoList = queryInventoryInfoList(easOutInBillDetailList);