재고기준정보관리 수정

src/main/java/com/oqpo/api/entity/stockmng/StckMgntBaseInfoEntity.java

@@ -14,6 +14,9 @@ import java.util.List;
 @ToString
 public class StckMgntBaseInfoEntity implements Serializable {
 
+    @ApiModelProperty(value = "작업구분")
+    private String viewCd;
+
     @ApiModelProperty(value = "브랜드아이디")
     private String brandId;
     @ApiModelProperty(value = "창고아이디")

src/main/java/com/oqpo/api/service/stockmng/StockMngService.java

@@ -65,7 +65,7 @@ public class StockMngService extends CommonService {
                 sItemClass1, sItemClass2, sItemClass3, sItemClass4, sItemId, sItemNm, gridRequest);
         List<Object> gridRows = entities.stream()
                 .map(m -> StockMngListResponse.builder()
-                        .viewCd("R")
+                        .viewCd(m.getViewCd() == null ? "R" : m.getViewCd())
                         .brandId(m.getBrandId() == null ? "" : m.getBrandId())
                         .brandNm(m.getBrandNm() == null ? "" : m.getBrandNm())
                         .storeId(m.getStoreId() == null ? "" : m.getStoreId())

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

@@ -5,76 +5,80 @@
 
     <select id="selectStockMngGridList" resultType="com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity">
         /* StockMngMapper.selectStockMngGridList */
-        SELECT A.brand_id, FN_BRAND_NM(A.brand_id) AS brand_nm,
-            C.store_id, FN_STORE_NM(A.brand_id, C.store_id) AS store_nm,
-            A.whs_id, C.whs_nm, A.location, D.location_nm, A.item_id, E.item_nm, E.unit, A.stck_qty,
-            A.PRP_STCK_QTY as prp_stck_qty, 
-            A.SFT_STCK_RT as sft_stck_rt, 
-            CASE WHEN A.PRP_STCK_QTY > 0 THEN A.STCK_QTY / A.PRP_STCK_QTY * 100 ELSE 0 END AS cur_stck_rt
-            /* , A.cur_stck_rt */
-        FROM stck_mgnt_base_info A
-        INNER JOIN whs_mgnt_base_info C ON A.brand_id = C.brand_id AND A.whs_id = C.whs_id
-        INNER JOIN whs_mgnt_base_loc D ON A.brand_id = D.brand_id AND A.whs_id = D.whs_id AND A.location = D.location
-        INNER JOIN item_base_info E ON A.item_id = E.item_id
-        <if test="sItemClass1 != null and sItemClass1 != ''">
-        INNER JOIN item_class_ptcl B ON A.item_id = B.item_id
-            AND B.item_class1 = #{sItemClass1}
-            <if test="sItemClass2 != null and sItemClass2 != ''">
-            AND B.item_class2 = #{sItemClass2}
-                <if test="sItemClass3 != null and sItemClass3 != ''">
-                AND B.item_class3 = #{sItemClass3}
-                    <if test="sItemClass4 != null and sItemClass4 != ''">
-                    AND B.item_class4 = #{sItemClass4}
+
+        select c.brand_id, c.item_id, c.item_nm, c.unit , c.stck_qty, c.prp_stck_qty, c.sft_stck_rt
+                ,c.cur_stck_rt, d.whs_nm, e.location_nm
+                ,c.whs_id, c.location, FN_BRAND_NM(c.brand_id) AS brand_nm
+                ,d.store_id, FN_STORE_NM(c.brand_id, d.store_id) AS store_nm, c.view_cd
+        from   (
+                select a.brand_id, a.item_id, a.item_nm, a.unit , nvl(b.stck_qty,0) as stck_qty, nvl(b.PRP_STCK_QTY,0) as prp_stck_qty, nvl(b.sft_stck_rt,0) as sft_stck_rt
+                        ,CASE WHEN b.PRP_STCK_QTY > 0 THEN b.stck_qty / b.PRP_STCK_QTY * 100 ELSE 0 END AS cur_stck_rt /* , A.cur_stck_rt */
+                        ,#{sWhsId} as whs_id, #{sLocation} as location, case when b.item_id is null then 'C' else 'R' end  as view_cd
+                from   item_base_info a
+                left outer join stck_mgnt_base_info b on a.item_id = b.item_id
+                       and b.brand_id = #{sBrandId}
+                        <if test="sWhsId != null and sWhsId != ''">
+                       and b.whs_id = #{sWhsId}
+                        </if>
+                        <if test="sLocation != null and sLocation != ''">
+                       AND b.location =  #{sLocation}
+                        </if>
+
+                where a.brand_id = #{sBrandId}
+                <if test="sItemStCd != null and sItemStCd != ''">
+                    AND a.item_st_cd = #{sItemStCd}
+                </if>
+                <if test="sItemType != null and sItemType != ''">
+                    AND a.item_type = #{sItemType}
+                </if>
+                <if test='"P".equals(sItemGubun)'>
+                    AND a.pch_item_yn = 'Y'
+                </if>
+                <if test='"S".equals(sItemGubun)'>
+                    AND a.sale_item_yn = 'Y'
+                </if>
+                <if test="sItemId != null and sItemId != ''">
+                    AND a.item_id = #{sItemId}
+                </if>
+                <if test="sItemNm != null and sItemNm != ''">
+                    AND a.item_nm LIKE CONCAT('%',#{sItemNm},'%')
+                </if>
+                ) c
+                INNER JOIN whs_mgnt_base_info d ON c.brand_id = d.brand_id AND c.whs_id = d.whs_id
+                            <if test="sStoreId != null and sStoreId != ''">
+                                AND d.store_id = #{sStoreId}
+                                AND d.whs_dvsn = 'W02'
+                            </if>
+                            <if test="sStoreId == null or sStoreId == ''">
+                                AND d.whs_dvsn = 'W01'
+                            </if>
+                INNER JOIN whs_mgnt_base_loc e ON c.brand_id = e.brand_id AND c.whs_id = e.whs_id AND c.location = e.location
+                <if test="sItemClass1 != null and sItemClass1 != ''">
+                    INNER JOIN item_class_ptcl g ON c.item_id = g.item_id
+                    AND g.item_class1 = #{sItemClass1}
+                    <if test="sItemClass2 != null and sItemClass2 != ''">
+                        AND g.item_class2 = #{sItemClass2}
+                        <if test="sItemClass3 != null and sItemClass3 != ''">
+                            AND g.item_class3 = #{sItemClass3}
+                            <if test="sItemClass4 != null and sItemClass4 != ''">
+                                AND g.item_class4 = #{sItemClass4}
+                            </if>
+                        </if>
                     </if>
                 </if>
-            </if>
-        </if>
-        WHERE A.del_yn = 'N'
-        AND A.brand_id = #{sBrandId}
-        <if test="sStoreId != null and sStoreId != ''">
-            AND C.store_id = #{sStoreId}
-            AND C.whs_dvsn = 'W02'
-        </if>
-        <if test="sStoreId == null or sStoreId == ''">
-            AND C.whs_dvsn = 'W01'
-        </if>
-        <if test="sWhsId != null and sWhsId != ''">
-        AND A.whs_id = #{sWhsId}
-        </if>
-        <if test="sLocation != null and sLocation != ''">
-        AND A.location = #{sLocation}
-        </if>
-        <if test="sItemStCd != null and sItemStCd != ''">
-        AND E.item_st_cd = #{sItemStCd}
-        </if>
-        <if test="sItemType != null and sItemType != ''">
-        AND E.item_type = #{sItemType}
-        </if>
-        <if test='"P".equals(sItemGubun)'>
-        AND E.pch_item_yn = 'Y'
-        </if>
-        <if test='"S".equals(sItemGubun)'>
-        AND E.sale_item_yn = 'Y'
-        </if>
-        <if test="sItemId != null and sItemId != ''">
-        AND A.item_id = #{sItemId}
-        </if>
-        <if test="sItemNm != null and sItemNm != ''">
-        AND E.item_nm LIKE CONCAT('%',#{sItemNm},'%')
-        </if>
         <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.item_id ASC
+                        ORDER BY c.item_id ASC
                     </if>
                     <if test="gridRequest.sord == 'desc'.toString()">
-                        ORDER BY A.item_id DESC
+                        ORDER BY c.item_id DESC
                     </if>
                 </if>
             </when>
             <otherwise>
-                ORDER BY A.item_id ASC
+                ORDER BY c.item_id ASC
             </otherwise>
         </choose>
         <if test="gridRequest.pagingYn == true">
@@ -85,55 +89,61 @@
     <select id="selectStockMngGridCnt" resultType="int">
         /* StockMngMapper.selectStockMngGridCnt */
         SELECT COUNT(*)
-        FROM stck_mgnt_base_info A
-        INNER JOIN whs_mgnt_base_info C ON A.brand_id = C.brand_id AND A.whs_id = C.whs_id
-        INNER JOIN whs_mgnt_base_loc D ON A.brand_id = D.brand_id AND A.whs_id = D.whs_id AND A.location = D.location
-        INNER JOIN item_base_info E ON A.item_id = E.item_id
-        <if test="sItemClass1 != null and sItemClass1 != ''">
-            INNER JOIN item_class_ptcl B ON A.item_id = B.item_id
-            AND B.item_class1 = #{sItemClass1}
-            <if test="sItemClass2 != null and sItemClass2 != ''">
-                AND B.item_class2 = #{sItemClass2}
-                <if test="sItemClass3 != null and sItemClass3 != ''">
-                    AND B.item_class3 = #{sItemClass3}
-                    <if test="sItemClass4 != null and sItemClass4 != ''">
-                        AND B.item_class4 = #{sItemClass4}
-                    </if>
-                </if>
-            </if>
-        </if>
-        WHERE A.del_yn = 'N'
-        AND A.brand_id = #{sBrandId}
-        <if test="sStoreId != null and sStoreId != ''">
-            AND C.store_id = #{sStoreId}
-            AND C.whs_dvsn = 'W02'
-        </if>
-        <if test="sStoreId == null or sStoreId == ''">
-            AND C.whs_dvsn = 'W01'
-        </if>
+        from   (
+        select a.brand_id, a.item_id, a.item_nm, a.unit , nvl(b.stck_qty,0) as stck_qty, nvl(b.PRP_STCK_QTY,0) as prp_stck_qty, nvl(b.sft_stck_rt,0) as sft_stck_rt
+        ,CASE WHEN b.PRP_STCK_QTY > 0 THEN b.stck_qty / b.PRP_STCK_QTY * 100 ELSE 0 END AS cur_stck_rt /* , A.cur_stck_rt */
+        ,#{sWhsId} as whs_id, #{sLocation} as location
+        from   item_base_info a
+        left outer join stck_mgnt_base_info b on a.item_id = b.item_id
+        and b.brand_id = #{sBrandId}
         <if test="sWhsId != null and sWhsId != ''">
-            AND A.whs_id = #{sWhsId}
+            and b.whs_id = #{sWhsId}
         </if>
         <if test="sLocation != null and sLocation != ''">
-            AND A.location = #{sLocation}
+            AND b.location =  #{sLocation}
         </if>
+
+        where a.brand_id = #{sBrandId}
         <if test="sItemStCd != null and sItemStCd != ''">
-            AND E.item_st_cd = #{sItemStCd}
+            AND a.item_st_cd = #{sItemStCd}
         </if>
         <if test="sItemType != null and sItemType != ''">
-            AND E.item_type = #{sItemType}
+            AND a.item_type = #{sItemType}
         </if>
         <if test='"P".equals(sItemGubun)'>
-            AND E.pch_item_yn = 'Y'
+            AND a.pch_item_yn = 'Y'
         </if>
         <if test='"S".equals(sItemGubun)'>
-            AND E.sale_item_yn = 'Y'
+            AND a.sale_item_yn = 'Y'
         </if>
         <if test="sItemId != null and sItemId != ''">
-            AND A.item_id = #{sItemId}
+            AND a.item_id = #{sItemId}
         </if>
         <if test="sItemNm != null and sItemNm != ''">
-            AND E.item_nm LIKE CONCAT('%',#{sItemNm},'%')
+            AND a.item_nm LIKE CONCAT('%',#{sItemNm},'%')
+        </if>
+        ) c
+        INNER JOIN whs_mgnt_base_info d ON c.brand_id = d.brand_id AND c.whs_id = d.whs_id
+        <if test="sStoreId != null and sStoreId != ''">
+            AND d.store_id = #{sStoreId}
+            AND d.whs_dvsn = 'W02'
+        </if>
+        <if test="sStoreId == null or sStoreId == ''">
+            AND d.whs_dvsn = 'W01'
+        </if>
+        INNER JOIN whs_mgnt_base_loc e ON c.brand_id = e.brand_id AND c.whs_id = e.whs_id AND c.location = e.location
+        <if test="sItemClass1 != null and sItemClass1 != ''">
+            INNER JOIN item_class_ptcl g ON c.item_id = g.item_id
+            AND g.item_class1 = #{sItemClass1}
+            <if test="sItemClass2 != null and sItemClass2 != ''">
+                AND g.item_class2 = #{sItemClass2}
+                <if test="sItemClass3 != null and sItemClass3 != ''">
+                    AND g.item_class3 = #{sItemClass3}
+                    <if test="sItemClass4 != null and sItemClass4 != ''">
+                        AND g.item_class4 = #{sItemClass4}
+                    </if>
+                </if>
+            </if>
         </if>
     </select>