재고이력수정

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

@@ -235,34 +235,58 @@
 
     <select id="selectStockHistGridList" resultType="com.oqpo.api.entity.stockmng.StckMgntDtlHistEntity">
         /* StockMngMapper.selectStockHistGridList */
-        SELECT A.stck_mgnt_dtl_no,
-            A.inout_cd, FN_CODE_NM('INOUT_CD', A.inout_cd) AS inout_nm, A.inout_qty,
-            A.relation_no AS relation_no,    /* 관련번호 */
-            A.chg_dvsn, FN_CODE_NM('CHG_DVSN', A.chg_dvsn) AS chg_dvsn_nm, DATE_FORMAT(A.sys_reg_dttm,'%Y.%m.%d') AS sys_reg_dttm
-        FROM stck_mgnt_dtl_hist A
-        WHERE A.brand_id = #{sBrandId}
-        AND A.whs_id = #{sWhsId}
-        AND A.location = #{sLocation}
-        AND A.item_id = #{sItemId}
-        <if test="sInoutCd != null and sInoutCd != ''">
-            AND A.inout_cd = #{sInoutCd}
-        </if>
-        <if test="fromDt != null and fromDt != '' and toDt != null and toDt != '' ">
-            AND A.sys_reg_dttm BETWEEN STR_TO_DATE(CONCAT(#{fromDt},'000000'),'%Y%m%d%H%i%S') AND STR_TO_DATE(CONCAT(#{toDt},'235959'),'%Y%m%d%H%i%S')
-        </if>
+        select  histock.stck_mgnt_dtl_no,
+                histock.inout_cd, FN_CODE_NM('INOUT_CD', histock.inout_cd) AS inout_nm, histock.inout_qty,
+                histock.relation_no AS relation_no,    /* 관련번호 */
+                histock.chg_dvsn, FN_CODE_NM('CHG_DVSN', histock.chg_dvsn) AS chg_dvsn_nm, DATE_FORMAT(histock.sys_reg_dttm,'%Y.%m.%d') AS sys_reg_dttm
+        from  (
+                SELECT A.stck_mgnt_dtl_no,
+                    A.inout_cd, FN_CODE_NM('INOUT_CD', A.inout_cd) AS inout_nm, A.inout_qty,
+                    A.relation_no AS relation_no,    /* 관련번호 */
+                    A.chg_dvsn, FN_CODE_NM('CHG_DVSN', A.chg_dvsn) AS chg_dvsn_nm, DATE_FORMAT(A.sys_reg_dttm,'%Y.%m.%d') AS sys_reg_dttm
+                FROM stck_mgnt_dtl_hist A
+                WHERE A.brand_id = #{sBrandId}
+                AND A.whs_id = #{sWhsId}
+                AND A.location = #{sLocation}
+                AND A.item_id = #{sItemId}
+                <if test="sInoutCd != null and sInoutCd != ''">
+                    AND A.inout_cd = #{sInoutCd}
+                </if>
+                <if test="fromDt != null and fromDt != '' and toDt != null and toDt != '' ">
+                    AND A.sys_reg_dttm BETWEEN STR_TO_DATE(CONCAT(#{fromDt},'000000'),'%Y%m%d%H%i%S') AND STR_TO_DATE(CONCAT(#{toDt},'235959'),'%Y%m%d%H%i%S')
+                </if>
+                union all
+                SELECT DATE_FORMAT(a.SYS_CHG_DTTM, '%Y%m%d%H%i%S%f') AS stck_mgnt_dtl_no
+                , 'OUT' AS inout_cd, FN_CODE_NM('INOUT_CD', 'OUT') AS inout_nm
+                , a.SALE_QTY AS inout_qty, CONCAT(a.OQ_BRAND_ID, '_', a.OQ_MENU_CD) AS relation_no
+                , 'SOUT' AS chg_dvsn, FN_CODE_NM('CHG_DVSN', 'SOUT') AS chg_dvsn_nm
+                , DATE_FORMAT(a.sys_reg_dttm,'%Y.%m.%d') AS sys_reg_dttm
+                FROM stck_sale_mgnt_dtl_hist a
+                WHERE 1 = 1
+                AND a.BRAND_ID = #{sBrandId}
+                AND a.WHS_ID = #{sWhsId}
+                AND a.LOCATION = #{sLocation}
+                AND a.ITEM_ID = #{sItemId}
+                <if test="sInoutCd != null and sInoutCd != ''">
+                    AND a.inout_cd = #{sInoutCd}
+                </if>
+                <if test="fromDt != null and fromDt != '' and toDt != null and toDt != '' ">
+                AND a.BASE_YM BETWEEN STR_TO_DATE(CONCAT(#{fromDt},'000000'),'%Y%m%d%H%i%S') AND STR_TO_DATE(CONCAT(#{toDt},'235959'),'%Y%m%d%H%i%S')
+                </if>
+             ) histock
         <choose>
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
                     <if test="gridRequest.sord == 'asc'.toString()">
-                        ORDER BY A.stck_mgnt_dtl_no ASC
+                        ORDER BY histock.stck_mgnt_dtl_no ASC
                     </if>
                     <if test="gridRequest.sord == 'desc'.toString()">
-                        ORDER BY A.stck_mgnt_dtl_no DESC
+                        ORDER BY histock.stck_mgnt_dtl_no DESC
                     </if>
                 </if>
             </when>
             <otherwise>
-                ORDER BY A.stck_mgnt_dtl_no ASC
+                ORDER BY histock.stck_mgnt_dtl_no ASC
             </otherwise>
         </choose>
         <if test="gridRequest.pagingYn == true">