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

Merge remote-tracking branch 'origin/rakor' into dev_zhangke

This commit is contained in:
zhangke 2025-09-25 11:29:28 +08:00
parent c1e82f45ed c3799fe052
commit 8cf7298135
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.nflg.wms.repository.mapper.WmsStructuralPackageOrderMapper">
<select id="search" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO">
SELECT o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
SELECT o.*,m."no"||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",sp.drawing_no as "packageDrawingNo"
FROM wms_structural_package_order o
LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
@ -24,7 +24,7 @@
and o.external_order_no=#{request.externalOrderNo}
</if>
<if test="request.workbenchCode!=null and request.workbenchCode!=''">
and wb."no" ilike concat('%', #{request.workbenchCode}, '%')
and m."no"||wb."no" ilike concat('%', #{request.workbenchCode}, '%')
</if>
<if test="request.startDate!=null">
and o.create_time>= #{request.startDate}