Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-api

src/main/resources/mybatis/sqlmaps/inoutmng/ShmtOdr.xml

@@ -810,7 +810,6 @@
         <if test="sItemNm != null and sItemNm != ''">
            and (whs.item_id like concat('%', #{sItemNm}, '%') or whs.item_nm like concat('%', #{sItemNm}, '%'))
         </if>
-
         <choose>
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
@@ -821,6 +820,9 @@
                         order by pch_req_unq_no desc
                     </if>
                 </if>
+                <if test="gridRequest.sidx != 'VIEW_NUM'.toString()">
+                    order by pch_req_unq_no desc
+                </if>
             </when>
             <otherwise>
                 order by pch_req_unq_no desc