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

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

@@ -57,6 +57,7 @@ public class WhsMngService extends CommonService {
                         .whsStNm(m.getWhsStNm())
                         .storeId(m.getStoreId())
                         .storeNm(m.getStoreNm())
+                        .baseYn(m.getBaseYn())
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
@@ -87,6 +88,7 @@ public class WhsMngService extends CommonService {
                         .stckDvsnNm(m.getStckDvsnNm())
                         .locStCd(m.getLocStCd())
                         .locStNm(m.getLocStNm())
+                        .locBaseYn(m.getLocBaseYn())
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
@@ -113,10 +115,10 @@ public class WhsMngService extends CommonService {
             entity.setWhsDvsn(StringUtil.isEmpty(entity.getStoreId()) ? WhsDvsn.BRAND.getCd() : WhsDvsn.STORE.getCd());
 
             //브랜드만 체크 작업 진행함
-            if ("".equals(saveWhsInfoRequest.getStoreId())) {
+            if (StringUtil.isEmpty(saveWhsInfoRequest.getStoreId())) {
                 // 기본 창고 존재 여부 확인
                 String baseWhsId = whsMngMapper.selectBaseWhsId(entity.getBrandId());
-                if ("Y".toString().equals(entity.getBaseYn())) {
+                if ("Y".equals(entity.getBaseYn())) {
                     if (!"N".equals(baseWhsId)) {
                         // 기존에 기본이 있고 신규창고가 Y로 오면
                         // 기존거는 N 및 Location도 N처리함
@@ -177,6 +179,23 @@ public class WhsMngService extends CommonService {
             entity.setWhsDvsn(StringUtil.isEmpty(entity.getStoreId()) ? WhsDvsn.BRAND.getCd() : WhsDvsn.STORE.getCd());
             entity.setBaseYn(saveWhsInfoRequest.getBaseYn());
 
+            //브랜드만 체크 작업 진행함
+            if (StringUtil.isEmpty(saveWhsInfoRequest.getStoreId())) {
+                // 기본 창고 존재 여부 확인
+                String baseWhsId = whsMngMapper.selectBaseWhsId(entity.getBrandId());
+                if ("Y".equals(entity.getBaseYn())) {
+                    if (!"N".equals(baseWhsId)) {
+                        // 기존에 기본이 있고 신규창고가 Y로 오면
+                        // 기존거는 N 및 Location도 N처리함
+                        whsMngMapper.updateClearBaseWhs(entity.getBrandId());
+                        whsMngMapper.updateClearBaseWhsLoc(entity.getBrandId(), baseWhsId);
+                    }
+                } else {
+                    if ("N".equals(baseWhsId)) {
+                        entity.setBaseYn("Y");
+                    }
+                }
+            }
             whsMngMapper.updateWhsMgntBaseInfo(userId, entity);
 
             // 창고로케이션정보

src/main/java/com/oqpo/api/web/dto/response/stockmng/LocInfoListResponse.java

@@ -27,4 +27,7 @@ public class LocInfoListResponse {
     @ApiModelProperty(value = "창고상태명")
     private String locStNm;
 
+    @ApiModelProperty(value = "로케이션 기본여부")
+    private String locBaseYn;
+
 }

src/main/java/com/oqpo/api/web/dto/response/stockmng/WhsMngInfoResponse.java

@@ -51,6 +51,9 @@ public class WhsMngInfoResponse {
     @ApiModelProperty(value = "시스템변경아이디")
     private String sysChgId;
 
+    @ApiModelProperty(value = "창고기본여부")
+    private String baseYn;
+
     public static WhsMngInfoResponse toDTO(WhsMgntBaseInfoEntity entity) {
         if (entity == null) return null;
         return WhsMngInfoResponse.builder()
@@ -73,6 +76,7 @@ public class WhsMngInfoResponse {
                 .sysRegId(entity.getSysRegId())
                 .sysChgDttm(entity.getSysChgDttm())
                 .sysChgId(entity.getSysChgId())
+                .baseYn(entity.getBaseYn())
                 .build();
     }
 

src/main/java/com/oqpo/api/web/dto/response/stockmng/WhsMngListResponse.java

@@ -41,5 +41,7 @@ public class WhsMngListResponse {
     @ApiModelProperty(value = "담당자전화번호")
     private String mgrTelNo;
 
+    @ApiModelProperty(value = "창고기본여부")
+    private String baseYn;
 
 }

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

@@ -8,7 +8,8 @@
         SELECT A.brand_id, FN_BRAND_NM(A.brand_id) AS brand_nm,
             A.whs_id, A.whs_nm, A.whs_dvsn, FN_CODE_NM('WHS_DVSN', A.whs_dvsn) AS whs_dvsn_nm,
             A.mgr_nm, FN_GET_TELNO(A.mgr_tel_no) AS mgr_tel_no, A.whs_st_cd, FN_CODE_NM('WHS_ST_CD', A.whs_st_cd) AS whs_st_nm,
-            A.store_id, FN_STORE_NM(A.brand_id, A.store_id) AS store_nm
+            A.store_id, FN_STORE_NM(A.brand_id, A.store_id) AS store_nm,
+            A.base_yn
         FROM whs_mgnt_base_info A
         WHERE A.brand_id = #{sBrandId}
         <if test="sStoreId != null and sStoreId != ''">
@@ -69,6 +70,7 @@
             A.mgr_nm, FN_GET_TELNO(A.mgr_tel_no) AS mgr_tel_no, A.zip_no,
             A.addr1, A.addr2, A.whs_st_cd, FN_CODE_NM('WHS_ST_CD', A.whs_st_cd) AS whs_st_nm,
             A.store_id, FN_STORE_NM(A.brand_id, A.store_id) AS store_nm,
+            A.base_yn,
             DATE_FORMAT(A.sys_reg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_reg_dttm, A.sys_reg_id, DATE_FORMAT(A.sys_chg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_chg_dttm, A.sys_chg_id
         FROM whs_mgnt_base_info A
         WHERE A.brand_id = #{brandId}
@@ -84,7 +86,8 @@
         /* WhsMngMapper.selectWhsLocGridList */
         SELECT A.brand_id, A.whs_id, A.location, A.location_nm,
             A.stck_dvsn, FN_CODE_NM('STCK_DVSN', A.stck_dvsn) AS stck_dvsn_nm,
-            A.loc_st_cd, FN_CODE_NM('LOC_ST_CD', A.loc_st_cd) AS loc_st_nm
+            A.loc_st_cd, FN_CODE_NM('LOC_ST_CD', A.loc_st_cd) AS loc_st_nm,
+            A.loc_base_yn
         FROM whs_mgnt_base_loc A
         WHERE A.brand_id = #{brandId}
         AND A.whs_id = #{whsId}
@@ -170,7 +173,7 @@
             location_nm = #{entity.locationNm},
             stck_dvsn = #{entity.stckDvsn},
             loc_st_cd = #{entity.locStCd},
-            loc_base_yn = #{entity.baseYn},
+            loc_base_yn = #{entity.locBaseYn},
             sys_chg_dttm = NOW(),
             sys_chg_id = #{entity.sysChgId}
         WHERE brand_id = #{entity.brandId}
@@ -287,11 +290,11 @@
 
     <select id="selectBaseWhsId" resultType="String">
         /* WhsMngMapper.selectBaseWhsId */
-        SELECT nvl(whs_id,'N') as whs_id
+        SELECT NVL(whs_id,'N') as whs_id
         FROM whs_mgnt_base_info A
         WHERE A.brand_id = #{brandId}
-        AND   A.base_yn = 'Y'
-        AND   A.store_id is null or A.store_id <![CDATA[ <> ]]> ''
+        AND A.base_yn = 'Y'
+        AND (A.store_id IS NULL OR A.store_id = '')
         limit 1
     </select>
 
@@ -305,17 +308,17 @@
     </select>
 
     <update id="updateClearBaseWhs">
-        update whs_mgnt_base_info
-        set    base_yn = 'N'
-        where  brand_id = #{brandId}
-        AND    store_id is null or store_id <![CDATA[ <> ]]> ''
+        UPDATE whs_mgnt_base_info SET
+            base_yn = 'N'
+        WHERE brand_id = #{brandId}
+        AND (store_id IS NULL OR store_id = '')
     </update>
 
     <update id="updateClearBaseWhsLoc">
-        update whs_mgnt_base_loc
-        set    loc_base_yn = 'N'
-        where  brand_id = #{brandId}
-        and    whs_id = #{whsId}
+        UPDATE whs_mgnt_base_loc SET
+            loc_base_yn = 'N'
+        WHERE brand_id = #{brandId}
+        AND whs_id = #{whsId}
     </update>
 
 </mapper>