Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop

This commit is contained in:
曹鹏飞 2025-09-04 20:10:39 +08:00
commit 78b5698129
1 changed files with 2 additions and 3 deletions

View File

@ -3,11 +3,10 @@
<mapper namespace="com.nflg.wms.repository.mapper.WmsInventoryMapper"> <mapper namespace="com.nflg.wms.repository.mapper.WmsInventoryMapper">
<select id="search" resultType="com.nflg.wms.common.pojo.vo.InventoryVO"> <select id="search" resultType="com.nflg.wms.common.pojo.vo.InventoryVO">
SELECT i.*,get_binnos(s.id) AS "bin_nos" SELECT i."id",i.material_no,i.factory_no,i.warehouse_no,i.num,i.create_by,i.create_time,i.batch_number
FROM wms_inventory i FROM wms_inventory i
LEFT JOIN dictionary_item di ON di."value"=i.factory_no LEFT JOIN dictionary_item di ON di."value"=i.factory_no
LEFT JOIN wms_warehouse wh ON wh.factory_id=di."id" LEFT JOIN wms_warehouse wh ON wh.factory_id=di."id" and i.warehouse_no=wh.no
LEFT JOIN wms_storage s ON i.material_no=s.material_no and wh."id"=s.warehouse_id
<where> <where>
<if test="request.materialNo != null and request.materialNo!=''"> <if test="request.materialNo != null and request.materialNo!=''">
AND i.material_no=#{request.materialNo} AND i.material_no=#{request.materialNo}