Merge remote-tracking branch 'origin/devlop-phyz-spring3.5' into devlop-phy...

zhou zhou

8 分钟以前 830bb157b5e46a6c041d5f0c0a883a22e37cb0f7

 rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml

@@ -11,6 +11,7 @@
                    li.loc_id,
                    li.loc_code,
                    l.barcode,
                    l.channel,
                    li.matnr_id,
                    li.matnr_code,
                    li.maktx,
@@ -21,7 +22,11 @@
                FROM
                    man_loc_item li
                        INNER JOIN man_loc l ON l.id = li.loc_id
                    WHERE l.use_status = #{type}
                    WHERE li.deleted = 0
                      AND l.use_status = #{type}
                    <if test="channel != null">
                        AND l.channel = #{channel}
                    </if>
                GROUP BY
                    loc_id,
                    matnr_id,