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

Merge remote-tracking branch 'origin/master-hlq20260617ggb' into develop

This commit is contained in:
10001392 2026-06-17 19:02:19 +08:00
parent 79010e82f8 e10ab1dabd
commit 3487148b21
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
View File

@ -23,15 +23,28 @@
</select>
<select id="getListByOrderId" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemVO">
SELECT ROW_NUMBER() OVER (ORDER BY oti.id) AS "index",m.image,m.drawing_no,oti.*,ot."no" as "tray_no",ot."state",
sp."no" as "package_no",sp."name" as "package_desc"
SELECT ROW_NUMBER() OVER (ORDER BY oti.id) AS "index",
m.image,
m.drawing_no,
oti.*,
ot."no" as "tray_no",
ot."state",
sp."no" as "package_no",
sp."name" as "package_desc"
FROM wms_structural_package_order o
INNER JOIN wms_structural_package_order_tray_item oti ON o."id"=oti.order_id
LEFT JOIN wms_structural_package_order_tray ot ON oti.tray_id=ot."id"
LEFT JOIN wms_structural_package sp ON o.package_id=sp."id"
LEFT JOIN wms_material m ON oti.material_no=m."no" and oti."version"=m."version"
where o.id=#{orderId}
order by oti.id
LEFT JOIN wms_material m ON m."id" = (
SELECT m2."id"
FROM wms_material m2
WHERE m2."no" = oti.material_no
AND m2."version" = oti."version"
ORDER BY m2."id" DESC
LIMIT 1
)
WHERE o.id=#{orderId}
ORDER BY oti.id
</select>
<select id="getListVOByIds" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemVO">