diff --git a/src/main/resources/mapper/notify/NewIssureMapper.xml b/src/main/resources/mapper/notify/NewIssureMapper.xml index c47802b..64eeca6 100644 --- a/src/main/resources/mapper/notify/NewIssureMapper.xml +++ b/src/main/resources/mapper/notify/NewIssureMapper.xml @@ -69,6 +69,9 @@ AND a.site = #{query.site} + + AND a.push_wcs_flag = #{query.pushWcsFlag} + and a.status!='UNISSUE' order by a.notify_no desc diff --git a/src/main/resources/mapper/warehouse/LabelQueryMapper.xml b/src/main/resources/mapper/warehouse/LabelQueryMapper.xml index 57057f5..ece4795 100644 --- a/src/main/resources/mapper/warehouse/LabelQueryMapper.xml +++ b/src/main/resources/mapper/warehouse/LabelQueryMapper.xml @@ -30,7 +30,7 @@ w.WareHouseName as warehouseName, l.LocationName as locationName, h.height,h.wdr,h.eng_chg_level as engChgLevel,h.expired_date as expiredDate, - h.last_count_date as lastCountDate + h.last_count_date as lastCountDate,h.source_type as sourceType FROM handling_unit h WITH (NOLOCK) LEFT JOIN warehouse w WITH (NOLOCK) ON h.warehouse_id = w.WareHouseID AND h.site = w.Site LEFT JOIN location l WITH (NOLOCK) ON h.location_id = l.LocationID AND h.site = l.Site @@ -56,6 +56,9 @@ AND h.part_desc LIKE CONCAT('%', #{params.partDesc}, '%') + + AND h.source_type = #{params.sourceType} + ORDER BY h.created_date DESC