정렬 수정

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

@@ -237,10 +237,34 @@
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'colCmdUnqNo'.toString()">
                     <if test="gridRequest.sord == 'asc'.toString()">
-                        order by base.col_cmd_unq_no asc , ptcl.col_cmd_dtl_no asc
+                        order by base.col_cmd_unq_no asc
                     </if>
                     <if test="gridRequest.sord == 'desc'.toString()">
-                        order by base.col_cmd_unq_no desc , ptcl.col_cmd_dtl_no asc
+                        order by base.col_cmd_unq_no desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'colCmdDtlNo'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by ptcl.col_cmd_dtl_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by ptcl.col_cmd_dtl_no desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'rtnPodrUnqNo'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by ptcl.rtn_podr_unq_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by ptcl.rtn_podr_unq_no desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'rtnPodrDtlNo'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by ptcl.rtn_podr_dtl_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by  ptcl.rtn_podr_dtl_no desc
                     </if>
                 </if>
             </when>
@@ -607,6 +631,30 @@
                         order by mgnt.col_pick_unq_no desc
                     </if>
                 </if>
+                <if test="gridRequest.sidx == 'rtnPodrUnqNo'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by dtl.rtn_podr_unq_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by dtl.rtn_podr_unq_no desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'rtnPodrDtlNo'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by dtl.rtn_podr_dtl_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by dtl.rtn_podr_dtl_no desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'itemNm'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by dtl.item_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by dtl.item_nm desc
+                    </if>
+                </if>
             </when>
             <otherwise>
                 order by dtl.rtn_podr_unq_no desc, dtl.rtn_podr_dtl_no asc, dtl.item_nm asc
@@ -738,6 +786,30 @@
                         order by mgnt.col_pick_unq_no desc
                     </if>
                 </if>
+                <if test="gridRequest.sidx == 'rtnPodrUnqNo'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by dtl.rtn_podr_unq_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by dtl.rtn_podr_unq_no desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'rtnPodrDtlNo'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by dtl.rtn_podr_dtl_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by dtl.rtn_podr_dtl_no desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'itemNm'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by dtl.item_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by dtl.item_nm desc
+                    </if>
+                </if>
             </when>
             <otherwise>
                 order by dtl.rtn_podr_unq_no desc , dtl.rtn_podr_dtl_no asc, dtl.item_nm asc

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

@@ -45,6 +45,22 @@
                         order by base.pch_podr_unq_no desc
                     </if>
                 </if>
+                <if test="gridRequest.sidx == 'pchPodrDtlNo'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by ptcl.pch_podr_dtl_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by ptcl.pch_podr_dtl_no desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'itemNm'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by ptcl.item_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by ptcl.item_nm desc
+                    </if>
+                </if>
             </when>
             <otherwise>
                 order by base.pch_podr_unq_no desc, ptcl.pch_podr_dtl_no  asc, ptcl.item_nm asc
@@ -593,7 +609,7 @@
         </if>
         <choose>
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
-                <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
+                <if test="gridRequest.sidx == 'dlvSttmtUnqNo'.toString()">
                     <if test="gridRequest.sord == 'asc'.toString()">
                         order by info.dlv_sttmt_unq_no asc
                     </if>
@@ -844,6 +860,30 @@
                         order by whs.pch_podr_unq_no desc
                     </if>
                 </if>
+                <if test="gridRequest.sidx == 'pchPodrDtlNo'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by whs.pch_podr_dtl_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by whs.pch_podr_dtl_no desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'dlvSttmtUnqNo'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by whs.dlv_sttmt_unq_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by whs.dlv_sttmt_unq_no desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'dlvSttmtDtlNo'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by  whs.dlv_sttmt_dtl_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by  whs.dlv_sttmt_dtl_no desc
+                    </if>
+                </if>
             </when>
             <otherwise>
                 order by whs.pch_podr_unq_no desc, whs.pch_podr_dtl_no asc, whs.dlv_sttmt_unq_no desc, whs.dlv_sttmt_dtl_no asc

src/main/resources/mybatis/sqlmaps/loanmng/DsptMng.xml

@@ -49,6 +49,14 @@
                         ORDER BY store_nm DESC
                     </if>
                 </if>
+                <if test="gridRequest.sidx == 'dpstNm'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        ORDER BY A.dpst_nm ASC
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        ORDER BY A.dpst_nm DESC
+                    </if>
+                </if>
 
             </when>
             <otherwise>

src/main/resources/mybatis/sqlmaps/loanmng/LoanState.xml

@@ -46,6 +46,14 @@
                         ORDER BY store_nm DESC
                     </if>
                 </if>
+                <if test="gridRequest.sidx == 'loanMgntUnqNo'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        ORDER BY A.loan_mgnt_unq_no ASC
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        ORDER BY A.loan_mgnt_unq_no DESC
+                    </if>
+                </if>
             </when>
             <otherwise>
                 ORDER BY store_nm asc, A.loan_mgnt_unq_no desc

src/main/resources/mybatis/sqlmaps/oper/Ntice.xml

@@ -107,10 +107,18 @@
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'nticeTitl'.toString()">
                     <if test="gridRequest.sord == 'asc'.toString()">
-                        order by A.add_dt asc, A.ntice_titl asc
+                        order by A.ntice_titl asc
                     </if>
                     <if test="gridRequest.sord == 'desc'.toString()">
-                        order by A.add_dt desc, A.ntice_titl asc
+                        order by A.ntice_titl desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'addDt'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by A.add_dt asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by A.add_dt desc
                     </if>
                 </if>
             </when>

src/main/resources/mybatis/sqlmaps/pomng/PchReq.xml

@@ -513,10 +513,26 @@
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'pchReqUnqNo'.toString()">
                     <if test="gridRequest.sord == 'asc'.toString()">
-                        order by pch_req_unq_no asc , whs_nm asc, ptcl.item_nm asc
+                        order by pch_req_unq_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by pch_req_unq_no desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'whsNm'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by whs_nm asc
                     </if>
                     <if test="gridRequest.sord == 'desc'.toString()">
-                        order by pch_req_unq_no desc , whs_nm asc, ptcl.item_nm asc
+                        order by whs_nm desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'itemNm'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by ptcl.item_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by ptcl.item_nm desc
                     </if>
                 </if>
             </when>

src/main/resources/mybatis/sqlmaps/stinfo/Store.xml

@@ -81,10 +81,18 @@
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'storeNm'.toString()">
                     <if test="gridRequest.sord == 'asc'.toString()">
-                        order by store_nm asc, brand_nm asc
+                        order by store_nm asc
                     </if>
                     <if test="gridRequest.sord == 'desc'.toString()">
-                        order by store_nm desc, brand_nm asc
+                        order by store_nm desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'brandNm'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by brand_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by brand_nm desc
                     </if>
                 </if>
             </when>

src/main/resources/mybatis/sqlmaps/stinfo/Supply.xml

@@ -62,10 +62,18 @@
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'spplyNm'.toString()">
                     <if test="gridRequest.sord == 'asc'.toString()">
-                        order by spply_nm asc, brand_nm asc
+                        order by spply_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by spply_nm desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'brandNm'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by brand_nm asc
                     </if>
                     <if test="gridRequest.sord == 'desc'.toString()">
-                        order by spply_nm desc, brand_nm asc
+                        order by brand_nm desc
                     </if>
                 </if>
             </when>

src/main/resources/mybatis/sqlmaps/stinfo/brand.xml

@@ -117,10 +117,18 @@
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'brandNm'.toString()">
                     <if test="gridRequest.sord == 'asc'.toString()">
-                        order by affl.affl_shop_nm asc, brand.brand_nm asc
+                        order by  brand.brand_nm asc
                     </if>
                     <if test="gridRequest.sord == 'desc'.toString()">
-                        order by affl.affl_shop_nm desc, brand.brand_nm desc
+                        order by  brand.brand_nm desc
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'afflShopNm'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by affl.affl_shop_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by affl.affl_shop_nm desc
                     </if>
                 </if>
             </when>
@@ -449,7 +457,22 @@
                 where  brd.store_st_cd = 'ST01'
                 group by brd.store_id, brd.store_nm	, brd.loan_dvsn
             ) ordering
-        order by ordering.store_nm, ordering.loan_dvsn
+
+        <choose>
+            <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
+                <if test="gridRequest.sidx == 'storeNm'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by ordering.store_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by ordering.store_nm desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by ordering.store_nm, ordering.loan_dvsn
+            </otherwise>
+        </choose>
         <if test="gridRequest.pagingYn == true">
             limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
         </if>

src/main/resources/mybatis/sqlmaps/stockmng/StockMng.xml

@@ -68,6 +68,22 @@
                 </if>
         <choose>
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
+                <if test="gridRequest.sidx == 'whsId'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        ORDER BY c.whs_id ASC
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        ORDER BY c.whs_id DESC
+                    </if>
+                </if>
+                <if test="gridRequest.sidx == 'locationNm'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        ORDER BY e.location_nm ASC
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        ORDER BY e.location_nm DESC
+                    </if>
+                </if>
                 <if test="gridRequest.sidx == 'itemNm'.toString()">
                     <if test="gridRequest.sord == 'asc'.toString()">
                         ORDER BY c.item_nm ASC

src/main/resources/mybatis/sqlmaps/stockmng/WhsMng.xml

@@ -34,6 +34,14 @@
                         ORDER BY store_nm DESC
                     </if>
                 </if>
+                <if test="gridRequest.sidx == 'whsNm'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        ORDER BY A.whs_nm ASC
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        ORDER BY A.whs_nm DESC
+                    </if>
+                </if>
             </when>
             <otherwise>
                 ORDER BY store_nm asc, A.whs_nm ASC
@@ -91,7 +99,21 @@
         FROM whs_mgnt_base_loc A
         WHERE A.brand_id = #{brandId}
         AND A.whs_id = #{whsId}
-        ORDER BY A.location_nm ASC
+        <choose>
+            <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
+                <if test="gridRequest.sidx == 'location'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        ORDER BY A.location_nm ASC
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        ORDER BY A.location_nm DESC
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                ORDER BY A.location_nm ASC
+            </otherwise>
+        </choose>
         <if test="gridRequest.pagingYn == true">
             limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
         </if>