root/nl_sanqi_wms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: 优化上线期间提出的需求；

Browse Source
This commit is contained in:
gongbaoxiong
2024-06-12 10:07:06 +08:00
parent c1881b0cae
commit 2ed72b0432
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml
View File

@@ -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>

2
nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/ReceiptBillMapper.xml
View File

@@ -46,6 +46,6 @@
<!-- OR bz LIKE CONCAT('%', #{fuzzy}, '%')-->
<!-- )-->
<!-- </if>-->
ORDER BY TJSJ DESC
ORDER BY WLBM DESC
</select>
</mapper>

2
nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillDetailServiceImpl.java
View File

@@ -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);