Merge remote-tracking branch 'origin/master'

src/main/resources/mapper/notify/NewIssureMapper.xml

@@ -69,6 +69,9 @@
             <if test="query.site != null and query.site != ''">
                 AND a.site = #{query.site}
             </if>
+            <if test="query.pushWcsFlag != null and query.pushWcsFlag != ''">
+                AND a.push_wcs_flag = #{query.pushWcsFlag}
+            </if>
             and a.status!='UNISSUE'
         </where>
         order by a.notify_no desc

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 @@
             <if test="params.partDesc != null and params.partDesc != ''">
                 AND h.part_desc LIKE CONCAT('%', #{params.partDesc}, '%')
             </if>
+            <if test="params.sourceType != null and params.sourceType != ''">
+                AND h.source_type = #{params.sourceType}
+            </if>
         </where>
         ORDER BY h.created_date DESC
     </select>