rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/NoScanning

This commit is contained in:
曹鹏飞 2026-06-12 19:42:05 +08:00
parent 386cd40700 a9f5a68836
commit f3b2f36fbd
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackingVO.java
View File

@ -74,4 +74,9 @@ public class PackingVO {
* 最后扫描人名称 * 最后扫描人名称
*/ */
private String lastScanByName; private String lastScanByName;
/**
* 送货单号列表
*/
private String deliveryNos;
} }

6
nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml
View File

@ -27,7 +27,11 @@
</select> </select>
<select id="search" resultType="com.nflg.wms.common.pojo.vo.PackingVO"> <select id="search" resultType="com.nflg.wms.common.pojo.vo.PackingVO">
select a.*,b.supplier_code,b.supplier_name from wms_package a select a.*,b.supplier_code,b.supplier_name,
(
SELECT string_agg(DISTINCT delivery_no,',') FROM wms_package_item WHERE package_id=a."id"
) as "deliveryNos"
from wms_package a
left join user_supplier b on a.supplier_id=b.user_id left join user_supplier b on a.supplier_id=b.user_id
<where> <where>
<if test="request.packingCode !=null and request.packingCode !=''"> <if test="request.packingCode !=null and request.packingCode !=''">