매장단가 관리 및 모바일 로그인 및 세션, 공급사 수주내역

src/main/java/com/oqpo/api/config/WebMvcConfig.java

@@ -44,6 +44,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
                         .excludePathPatterns("/api/member/find-pw")
                         .excludePathPatterns("/api/verinfo/info-lastver")
                         .excludePathPatterns("/api/session/bsnsbrand")
+                        .excludePathPatterns("/api/member/brand-list-app")
                         .excludePathPatterns("/api/file/download/**");
             }
 

src/main/java/com/oqpo/api/entity/stinfo/StoreItemUnitEntity.java

@@ -13,7 +13,7 @@ import java.util.List;
 @ToString
 public class StoreItemUnitEntity implements Serializable {
     private static final long serialVersionUID = -3590936033715917450L;
-
+    private String viewCd;
     private String storeUnitUnqNo ;
     private String itemId ;
     private String itemNm ;

src/main/java/com/oqpo/api/mapper/MemberMapper.java

@@ -4,6 +4,8 @@ import com.oqpo.api.entity.oper.MemberEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface MemberMapper {
     MemberEntity selectMemberById(@Param("userId") String userId);
@@ -12,4 +14,6 @@ public interface MemberMapper {
 
     int selectMemberFindPwCnt(@Param("userId") String userId, @Param("email") String email, @Param("telNo") String telNo);
 
+    List<MemberEntity> selectMemberBrandList(@Param("bsnsRegNo") String bsnsRegNo);
+
 }

src/main/java/com/oqpo/api/mapper/inoutmng/ShmtOdrMapper.java

@@ -32,4 +32,6 @@ public interface ShmtOdrMapper {
     DeliInfoMgntEntity selectInvInfo(@Param("brandId") String brandId, @Param("dlvSttmtUnqNo") String dlvSttmtUnqNo )throws Exception;
     List<DeliDtlMgntEntity> selectInvDtlList(@Param("brandId") String brandId, @Param("dlvSttmtUnqNo") String dlvSttmtUnqNo)throws Exception;
 
+
+
 }

src/main/java/com/oqpo/api/mapper/pomng/PchOrdMapper.java

@@ -36,6 +36,9 @@ public interface PchOrdMapper {
     int updateChangeStPodrDtl(@Param("userId") String userId, List<PchOdrDtlPtclEntity> gridUpdateData) throws Exception;
     int updateChgMultiPodrStCd(@Param("userId") String userId, List<PchOdrBaseInfoEntity> gridUpdateData) throws Exception;
 
+    // 공급사 수주현황
+    List<PchOdrBaseInfoEntity> selectSpplyPoGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId,@Param("sPchOdrStCd") String sPchOdrStCd, @Param("sItemNm") String sItemNm, GridRequest gridRequest )throws Exception;
+    int selectSpplyPoGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId,@Param("sPchOdrStCd") String sPchOdrStCd, @Param("sItemNm") String sItemNm )throws Exception;
 
 
 

src/main/java/com/oqpo/api/mapper/stinfo/ItemMapper.java

@@ -17,8 +17,8 @@ public interface ItemMapper {
     List<ItemEntity> selectPopItemGridList(@Param("sBrandId") String sBrandId, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, @Param("sItemNm") String sItemNm, GridRequest gridRequest)throws Exception;
     int selectPopItemGridCnt(@Param("sBrandId") String sBrandId, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, @Param("sItemNm") String sItemNm)throws Exception;
 
-    List<ItemEntity> selectItemGridList(@Param("sBrandId") String sBrandId, @Param("sItemStCd") String sItemStCd, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, @Param("sItemType") String sItemType, @Param("sItemGubun") String sItemGubun, @Param("sClass1") String sClass1, @Param("sClass2") String sClass2, @Param("sClass3") String sClass3, @Param("sClass4") String sClass4, @Param("sItemNm") String sItemNm, GridRequest gridRequest)throws Exception;
-    int selectItemGridCnt(@Param("sBrandId") String sBrandId, @Param("sItemStCd") String sItemStCd, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, @Param("sItemType") String sItemType, @Param("sItemGubun") String sItemGubun, @Param("sClass1") String sClass1, @Param("sClass2") String sClass2, @Param("sClass3") String sClass3, @Param("sClass4") String sClass4, @Param("sItemNm") String sItemNm)throws Exception;
+    List<ItemEntity> selectItemGridList(@Param("sBrandId") String sBrandId, @Param("sSpplyId") String sSpplyId, @Param("sItemStCd") String sItemStCd, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, @Param("sItemType") String sItemType, @Param("sItemGubun") String sItemGubun, @Param("sClass1") String sClass1, @Param("sClass2") String sClass2, @Param("sClass3") String sClass3, @Param("sClass4") String sClass4, @Param("sItemNm") String sItemNm, GridRequest gridRequest)throws Exception;
+    int selectItemGridCnt(@Param("sBrandId") String sBrandId, @Param("sSpplyId") String sSpplyId, @Param("sItemStCd") String sItemStCd, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, @Param("sItemType") String sItemType, @Param("sItemGubun") String sItemGubun, @Param("sClass1") String sClass1, @Param("sClass2") String sClass2, @Param("sClass3") String sClass3, @Param("sClass4") String sClass4, @Param("sItemNm") String sItemNm)throws Exception;
 
     ItemEntity selectItemInfo(@Param("brandId") String brandId, @Param("itemId") String itemId)throws Exception;
 

src/main/java/com/oqpo/api/mapper/stinfo/StoreItemUnitMapper.java

@@ -11,12 +11,19 @@ import java.util.List;
 @Mapper
 public interface StoreItemUnitMapper {
 
-    List<StoreItemUnitEntity> selectStoreItemUnitGridList(@Param("sBrandId") String sBrandId, @Param("sStoreNm") String sStoreNm , GridRequest gridRequest)throws Exception;
-    int selectStoreItemUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreNm") String sStoreNm )throws Exception;
+    List<StoreItemUnitEntity> selectStoreItemUnitGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId , GridRequest gridRequest)throws Exception;
+    int selectStoreItemUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId )throws Exception;
+/*
+    List<StoreItemUnitEntity> selectSstoreItemUnitGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId , GridRequest gridRequest)throws Exception;
+    int selectSstoreItemUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId )throws Exception;
+*/
 
     List<StoreItemUnitEntity> selectStoreItemUnitInfo(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contSttDt") String contSttDt, @Param("contEndDt") String contEndDt)throws Exception;
 
     String selectStoreItemUnitContDateInfo(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contSttDt") String contSttDt,  @Param("contEndDt") String contEndDt)throws Exception;
+    String selectStoreItemUnitExistYn(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contSttDt") String contSttDt,  @Param("contEndDt") String contEndDt)throws Exception;
+
+
     int updateStoreItemUnitContEnd(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contEndDt") String contEndDt,  @Param("contSttDt") String contSttDt) throws Exception;
 
     int insertMergStoreItemUnitInfo(@Param("userId") String userId, @Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contSttDt") String contSttDt, @Param("contEndDt") String contEndDt, List<StoreItemUnitEntity> gridUpdateData) throws Exception;

src/main/java/com/oqpo/api/service/SessionService.java

@@ -73,9 +73,9 @@ public class SessionService extends CommonService {
             memberEntity.setSpplyNm(groupInfo.getSpplyNm());
 
             // 사용자정보 가져오기
-            if ("60".equals(memberEntity.getAuthTpCd())) {
+            //if ("60".equals(memberEntity.getAuthTpCd())) {
                 // 공급사로 - 공급사 테이블에서 공급사아이디와 공급사명 가져오기
-            }
+            //}
 
 
         } catch (Exception e) {
@@ -98,10 +98,20 @@ public class SessionService extends CommonService {
             memberEntity.setSystemAdminYn(jwtTokenProvider.getSystemAdminYn(connKey));
             memberEntity.setAuthTpCd(jwtTokenProvider.getAuthTpCd(connKey));
             memberEntity.setAuthTpNm(jwtTokenProvider.getAuthTpNm(connKey));
-            memberEntity.setAfflShopId(jwtTokenProvider.getAfflShopId(connKey));
-            memberEntity.setBrandId(jwtTokenProvider.getBrandId(connKey));
-            memberEntity.setAuthTpNm(jwtTokenProvider.getAuthTpNm(connKey));
 
+            MemberEntity groupInfo =  memberMapper.selectMemberById(memberEntity.getUserId());
+            memberEntity.setAfflShopId(groupInfo.getAfflShopId());
+            memberEntity.setAfflShopNm(groupInfo.getAfflShopNm());
+            memberEntity.setBrandId(groupInfo.getBrandId());
+            memberEntity.setBrandNm(groupInfo.getBrandNm());
+            memberEntity.setStoreId(groupInfo.getStoreId());
+            memberEntity.setStoreNm(groupInfo.getStoreNm());
+            memberEntity.setSpplyId(groupInfo.getSpplyId());
+            memberEntity.setSpplyNm(groupInfo.getSpplyNm());
+
+            if ("".equals(groupInfo.getBrandId())) {
+                memberEntity.setBrandId(jwtTokenProvider.getBrandId(connKey));
+            }
 
         } catch (Exception e) {
             e.getStackTrace();

src/main/java/com/oqpo/api/service/SigninService.java

@@ -9,9 +9,12 @@ import com.oqpo.api.mapper.MemberMapper;
 import com.oqpo.api.mapper.oper.UserMngMapper;
 import com.oqpo.api.service.oper.UserMngService;
 import com.oqpo.api.util.StringUtil;
+import com.oqpo.api.web.dto.response.oper.ntice.NticeTargetResponse;
 import com.oqpo.api.web.dto.response.oper.usermng.UserInfoResponse;
+import com.oqpo.api.web.dto.response.pomng.pchReq.PchReqRejectTargetResponse;
 import com.oqpo.api.web.dto.response.session.FindIdResponse;
 import com.oqpo.api.web.dto.response.session.FindPwResponse;
+import com.oqpo.api.web.dto.response.session.LogInBrandListResponse;
 import com.oqpo.api.web.dto.response.token.JwtResponse;
 import com.oqpo.api.web.dto.response.token.TokenResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +37,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -84,6 +88,38 @@ public class SigninService implements UserDetailsService {
         return JwtResponse.toDTO(connKey);
     }
 
+
+    public JwtResponse signinApp(String brandId, String userId, String password) throws Exception {
+        MemberEntity memberEntity = null;
+        String connKey = "";
+        try {
+            UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(userId, password);
+            Authentication authentication = authenticationManager.authenticate(token);
+            SecurityContextHolder.getContext().setAuthentication(authentication);
+            memberEntity = (MemberEntity) authentication.getPrincipal();
+            System.out.println("==getUserNm=====================> " + memberEntity.getUserNm());
+            connKey = jwtTokenProvider.createToken (
+                    memberEntity.getUserId(),
+                    memberEntity.getUserNm(),
+                    memberEntity.getSystemAdminYn(),
+                    memberEntity.getAuthTpCd(),
+                    true,
+                    memberEntity.getAfflShopId(),
+                    brandId,
+                    memberEntity.getAuthTpNm());
+            log.debug("connKey==>>>{}", connKey);
+
+            //로그인 이력 남기기
+            userMngService.updateLoginDt(memberEntity.getUserId());
+
+        } catch (Exception e) {
+            e.getStackTrace();
+            throw new GlobalException(SystemMessageCode.SIGNIN_FAIL);
+        }
+        return JwtResponse.toDTO(connKey);
+    }
+
+
     public void logout(HttpServletRequest request, HttpServletResponse response) throws Exception {
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
         if (auth != null) {
@@ -141,7 +177,10 @@ public class SigninService implements UserDetailsService {
         return FindPwResponse.toDTO(entity);
     }
 
+    //selectMemberBrandList
+    public LogInBrandListResponse selectMemberBrandList(String bsnsRegNo) throws Exception {
 
-
+        return LogInBrandListResponse.toDTO(memberMapper.selectMemberBrandList(bsnsRegNo));
+    }
 
 }

src/main/java/com/oqpo/api/service/inoutmng/ShmtOdrService.java

@@ -17,7 +17,6 @@ import com.oqpo.api.enums.ChgDvsn;
 import com.oqpo.api.enums.InOutCd;
 import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.exception.GlobalException;
-import com.oqpo.api.mapper.CommonMapper;
 import com.oqpo.api.mapper.FileMapper;
 import com.oqpo.api.mapper.inoutmng.ShmtOdrMapper;
 import com.oqpo.api.mapper.pomng.PchOrdMapper;
@@ -33,9 +32,8 @@ import com.oqpo.api.web.dto.response.GridResponse;
 import com.oqpo.api.web.dto.response.inoutmng.InvInfoResponse;
 import com.oqpo.api.web.dto.response.inoutmng.ShmtOdrSearchListResponse;
 import com.oqpo.api.web.dto.response.inoutmng.ShmtOutSearchListResponse;
-import com.oqpo.api.web.dto.response.pomng.pchReq.PchReqInfoResponse;
+import com.oqpo.api.web.dto.response.pomng.pchOrd.SpplyPoOdrSearchListResponse;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.catalina.StoreManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -70,6 +68,7 @@ public class ShmtOdrService extends CommonService {
 
     @Autowired
     private FileMapper fileMapper;
+
     /*
       출하 대상 그리드 리스트 조회
      */
@@ -80,7 +79,7 @@ public class ShmtOdrService extends CommonService {
         fromDt = fromDt == null ? null : fromDt.replace(".", "");
         toDt = toDt == null ? null : toDt.replace(".", "");
 
-        int gridRecords = shmtOdrMapper.selectShmtTargetOdrGridCnt( sBrandId, fromDt, toDt, sShmtWhsId, sWhsId, sItemNm );
+        int gridRecords = shmtOdrMapper.selectShmtTargetOdrGridCnt(sBrandId, fromDt, toDt, sShmtWhsId, sWhsId, sItemNm);
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
         List<PchOdrBaseInfoEntity> entities = shmtOdrMapper.selectShmtTargetOdrGridList(sBrandId, fromDt, toDt, sShmtWhsId, sWhsId, sItemNm, gridRequest);
         List<Object> gridRows = entities.stream()
@@ -89,8 +88,8 @@ public class ShmtOdrService extends CommonService {
                         .brandId(m.getBrandId() == null ? "" : m.getBrandId())
                         .brandNm(m.getBrandNm() == null ? "" : m.getBrandNm())
                         .pchPodrUnqNo(m.getPchPodrUnqNo() == null ? "" : m.getPchPodrUnqNo())
-                        .pchPodrDtlNo(m.getPchOdrDtlInfo() == null ? "" : m.getPchOdrDtlInfo().getPchPodrDtlNo() == null ? "" :  m.getPchOdrDtlInfo().getPchPodrDtlNo() )
-                        .itemId(m.getPchOdrDtlInfo() == null ? "" : m.getPchOdrDtlInfo().getItemId() == null  ? "" : m.getPchOdrDtlInfo().getItemId())
+                        .pchPodrDtlNo(m.getPchOdrDtlInfo() == null ? "" : m.getPchOdrDtlInfo().getPchPodrDtlNo() == null ? "" : m.getPchOdrDtlInfo().getPchPodrDtlNo())
+                        .itemId(m.getPchOdrDtlInfo() == null ? "" : m.getPchOdrDtlInfo().getItemId() == null ? "" : m.getPchOdrDtlInfo().getItemId())
                         .itemNm(m.getPchOdrDtlInfo() == null ? "" : m.getPchOdrDtlInfo().getItemNm() == null ? "" : m.getPchOdrDtlInfo().getItemNm())
                         .whsId(m.getWhsId() == null ? "" : m.getWhsId())
                         .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm() + " - " + m.getLocationNm())
@@ -99,7 +98,7 @@ public class ShmtOdrService extends CommonService {
                         .podrQty(m.getPchOdrDtlInfo() == null ? 0 : m.getPchOdrDtlInfo().getPodrQty() == null ? 0 : m.getPchOdrDtlInfo().getPodrQty())
                         .shmtQty(m.getPchOdrDtlInfo() == null ? 0 : m.getPchOdrDtlInfo().getShmtQty() == null ? 0 : m.getPchOdrDtlInfo().getShmtQty())
                         .stckQty(m.getPchOdrDtlInfo() == null ? 0 : m.getPchOdrDtlInfo().getStckQty() == null ? 0 : m.getPchOdrDtlInfo().getStckQty())
-                        .expryYn(m.getPchOdrDtlInfo() == null ? "" : m.getPchOdrDtlInfo().getExpryYn() == null ? "" :  m.getPchOdrDtlInfo().getExpryYn() )
+                        .expryYn(m.getPchOdrDtlInfo() == null ? "" : m.getPchOdrDtlInfo().getExpryYn() == null ? "" : m.getPchOdrDtlInfo().getExpryYn())
                         .expryPeriod(m.getPchOdrDtlInfo() == null ? 0 : m.getPchOdrDtlInfo().getExpryPeriod() == null ? 0 : m.getPchOdrDtlInfo().getExpryPeriod())
                         .expryDate(m.getPchOdrDtlInfo() == null ? "" : m.getPchOdrDtlInfo().getExpryDate() == null ? "" : m.getPchOdrDtlInfo().getExpryDate())
                         .podrAmt(m.getPchOdrDtlInfo() == null ? 0 : m.getPchOdrDtlInfo().getPodrAmt() == null ? 0 : m.getPchOdrDtlInfo().getPodrAmt())
@@ -118,44 +117,43 @@ public class ShmtOdrService extends CommonService {
     @Transactional
     public void instShmtOdr(String userId, InstShmtOdrRequest instShmtOdrRequest) throws Exception {
         try {
-                // 출하창고 + 납품장소 동일여부 체크
-                // 출하창고의 재고 와 출하수량 비교처리
-                // 발주수량은 출하수량보다 크거나 같아야함
-                // 유통기한 품목에 대해서는 유통기한일자 기입 필수
-
-                // 출하 헤더 생성
-                // 출하 상세 생성
-                // 납품서 헤더 생성
-                // 납품서 상세 생성성
+            // 출하창고 + 납품장소 동일여부 체크
+            // 출하창고의 재고 와 출하수량 비교처리
+            // 발주수량은 출하수량보다 크거나 같아야함
+            // 유통기한 품목에 대해서는 유통기한일자 기입 필수
+
+            // 출하 헤더 생성
+            // 출하 상세 생성
+            // 납품서 헤더 생성
+            // 납품서 상세 생성성
             List<PchOdrDtlPtclEntity> gridInsertData = instShmtOdrRequest.toCodeEntities(instShmtOdrRequest.getGridInsertData());
-            List<PchOdrBaseInfoEntity> jobList = shmtOdrMapper.selectShmtJobDataList(instShmtOdrRequest.getBrandId(), gridInsertData) ;
+            List<PchOdrBaseInfoEntity> jobList = shmtOdrMapper.selectShmtJobDataList(instShmtOdrRequest.getBrandId(), gridInsertData);
             List<StckMgntBaseInfoEntity> stockList = new ArrayList<StckMgntBaseInfoEntity>();
             String whsId = "";
             String location = "";
             String shmtWhsId = "";
             String shmtLocation = "";
-            int itemQty = 0 ;
-            int shmtTotalAmt = 0 ;
+            int itemQty = 0;
+            int shmtTotalAmt = 0;
             String expryDate = "";
-            int shmtQty = 0 ;
+            int shmtQty = 0;
             String shmtReqUnqNo = "";
             String dlvSttmtUnqNo = "";
 
 
             ShmtOdrBaseEntity shmtBaseEntity = new ShmtOdrBaseEntity();
-            List<ShmtOdrDtlEntity> shmtDtlList = new ArrayList<ShmtOdrDtlEntity>() ;
+            List<ShmtOdrDtlEntity> shmtDtlList = new ArrayList<ShmtOdrDtlEntity>();
 
             DeliInfoMgntEntity deliBaseEntity = new DeliInfoMgntEntity();
-            List<DeliDtlMgntEntity> deliDtlList = new ArrayList<DeliDtlMgntEntity>() ;
+            List<DeliDtlMgntEntity> deliDtlList = new ArrayList<DeliDtlMgntEntity>();
 
-            for (int i = 0 ; i < jobList.size() ; i++) {
+            for (int i = 0; i < jobList.size(); i++) {
                 PchOdrBaseInfoEntity entity = jobList.get(i);
 
-                for (int j = 0 ; j < gridInsertData.size() ; j++) {
+                for (int j = 0; j < gridInsertData.size(); j++) {
                     PchOdrDtlPtclEntity reqEntity = gridInsertData.get(j);
 
-                    if (entity.getPchPodrUnqNo().equals(reqEntity.getPchPodrUnqNo())  &&  entity.getPchOdrDtlInfo().getPchPodrDtlNo().equals(reqEntity.getPchPodrDtlNo()))
-                    {
+                    if (entity.getPchPodrUnqNo().equals(reqEntity.getPchPodrUnqNo()) && entity.getPchOdrDtlInfo().getPchPodrDtlNo().equals(reqEntity.getPchPodrDtlNo())) {
                         if (reqEntity.getShmtQty() > entity.getPchOdrDtlInfo().getPodrQty()) {
                             // 발주수량보다 출고수량이 많을수 없습니다.
                             throw new GlobalException(SystemMessageCode.ERR_POSHNONQTY);
@@ -167,16 +165,16 @@ public class ShmtOdrService extends CommonService {
                                 throw new GlobalException(SystemMessageCode.ERR_NONEXPRY);
                             }
                         }
-                        expryDate = reqEntity.getExpryDate().replaceAll("\\.","");
+                        expryDate = reqEntity.getExpryDate().replaceAll("\\.", "");
                         shmtQty = reqEntity.getShmtQty();
 
                         break;
                     }
                 }
 
-                if (shmtWhsId.equals(entity.getShmtWhsId()) && shmtLocation.equals(entity.getShmtLocation()) && whsId.equals(entity.getWhsId()) &&  location.equals(entity.getLocation())) {
+                if (shmtWhsId.equals(entity.getShmtWhsId()) && shmtLocation.equals(entity.getShmtLocation()) && whsId.equals(entity.getWhsId()) && location.equals(entity.getLocation())) {
                     // 추가 작업
-                    itemQty = itemQty + 1 ;
+                    itemQty = itemQty + 1;
                     shmtTotalAmt = shmtTotalAmt + (entity.getPchOdrDtlInfo().getUnitAmt() * shmtQty);
                     shmtBaseEntity.setItemQty(itemQty);
                     shmtBaseEntity.setShmtTotalAmt(shmtTotalAmt);
@@ -184,8 +182,8 @@ public class ShmtOdrService extends CommonService {
 
                     ShmtOdrDtlEntity inaddDtlEntity = new ShmtOdrDtlEntity();
                     inaddDtlEntity.setShmtReqUnqNo(shmtReqUnqNo);
-                    int dtlNo = itemQty * 10 ;
-                    inaddDtlEntity.setShmtReqDtlNo( Integer.toString(dtlNo));
+                    int dtlNo = itemQty * 10;
+                    inaddDtlEntity.setShmtReqDtlNo(Integer.toString(dtlNo));
                     inaddDtlEntity.setItemId(entity.getPchOdrDtlInfo().getItemId());
                     inaddDtlEntity.setItemNm(entity.getPchOdrDtlInfo().getItemNm());
                     inaddDtlEntity.setUnitAmt(entity.getPchOdrDtlInfo().getUnitAmt());
@@ -219,14 +217,14 @@ public class ShmtOdrService extends CommonService {
                     }
                     if ("N".equals(dupYn)) {
                     */
-                        stckEntity.setBrandId(entity.getBrandId());
-                        stckEntity.setWhsId(entity.getShmtWhsId());
-                        stckEntity.setLocation(entity.getShmtLocation());
-                        stckEntity.setItemId(entity.getPchOdrDtlInfo().getItemId());
-                        stckEntity.setStckQty(shmtQty);
-                        stckEntity.setRelationNo(shmtReqUnqNo);
-                        stockList.add(stckEntity);
-                  //  }
+                    stckEntity.setBrandId(entity.getBrandId());
+                    stckEntity.setWhsId(entity.getShmtWhsId());
+                    stckEntity.setLocation(entity.getShmtLocation());
+                    stckEntity.setItemId(entity.getPchOdrDtlInfo().getItemId());
+                    stckEntity.setStckQty(shmtQty);
+                    stckEntity.setRelationNo(shmtReqUnqNo);
+                    stockList.add(stckEntity);
+                    //  }
 
                     //납품서 상세 생성
                     DeliDtlMgntEntity inaddDeliDtlEntity = new DeliDtlMgntEntity();
@@ -252,15 +250,15 @@ public class ShmtOdrService extends CommonService {
                 } else {
                     // 신규로 출하건 생성함  //select fn_get_dealno(16, '') as col_cmd_unq_no
                     if (shmtDtlList.size() > 0) {
-                        shmtOdrMapper.insertShmtOdrBase(userId,shmtBaseEntity );
-                        shmtOdrMapper.insertShmtOdrDtl(userId, shmtDtlList) ;
+                        shmtOdrMapper.insertShmtOdrBase(userId, shmtBaseEntity);
+                        shmtOdrMapper.insertShmtOdrDtl(userId, shmtDtlList);
 
-                        shmtOdrMapper.insertDeliInfoMngt(userId,deliBaseEntity );
-                        shmtOdrMapper.insertDeliDtlPtcl(userId, deliDtlList) ;
-                        itemQty = 0 ;
-                        shmtTotalAmt = 0 ;
+                        shmtOdrMapper.insertDeliInfoMngt(userId, deliBaseEntity);
+                        shmtOdrMapper.insertDeliDtlPtcl(userId, deliDtlList);
+                        itemQty = 0;
+                        shmtTotalAmt = 0;
                     }
-                    itemQty = 1 ;
+                    itemQty = 1;
                     shmtTotalAmt = entity.getPchOdrDtlInfo().getUnitAmt() * shmtQty;
 
                     whsId = entity.getWhsId();
@@ -268,17 +266,17 @@ public class ShmtOdrService extends CommonService {
                     shmtWhsId = entity.getShmtWhsId();
                     shmtLocation = entity.getShmtLocation();
 
-                    shmtReqUnqNo = fnGetDealNo(16,"");  // 출하지시번호
-                    dlvSttmtUnqNo = fnGetDealNo(15,""); // 납품서번호
+                    shmtReqUnqNo = fnGetDealNo(16, "");  // 출하지시번호
+                    dlvSttmtUnqNo = fnGetDealNo(15, ""); // 납품서번호
 
                     // 출하지시
                     shmtBaseEntity = new ShmtOdrBaseEntity();
-                    shmtDtlList = new ArrayList<ShmtOdrDtlEntity>() ;
+                    shmtDtlList = new ArrayList<ShmtOdrDtlEntity>();
                     ShmtOdrDtlEntity inDtlEntity = new ShmtOdrDtlEntity();
 
                     //납품서정보
                     deliBaseEntity = new DeliInfoMgntEntity();
-                    deliDtlList = new ArrayList<DeliDtlMgntEntity>() ;
+                    deliDtlList = new ArrayList<DeliDtlMgntEntity>();
                     DeliDtlMgntEntity deliDtlEntity = new DeliDtlMgntEntity();
 
                     shmtBaseEntity.setShmtReqUnqNo(shmtReqUnqNo);
@@ -292,7 +290,7 @@ public class ShmtOdrService extends CommonService {
                     shmtBaseEntity.setItemQty(itemQty);
                     shmtBaseEntity.setShmtTotalAmt(shmtTotalAmt);
                     shmtBaseEntity.setPodrMgrNm(entity.getPodrMgrNm());
-                    shmtBaseEntity.setDlvReqDt(entity.getDlvReqDt().replaceAll("\\.",""));
+                    shmtBaseEntity.setDlvReqDt(entity.getDlvReqDt().replaceAll("\\.", ""));
                     shmtBaseEntity.setWhsId(entity.getWhsId());
                     shmtBaseEntity.setLocation(entity.getLocation());
 
@@ -303,14 +301,14 @@ public class ShmtOdrService extends CommonService {
                     deliBaseEntity.setStoreId(entity.getStoreId());
                     deliBaseEntity.setDlvAmt(shmtTotalAmt);
                     deliBaseEntity.setDlvMgrNm(instShmtOdrRequest.getDlvMgrNm());
-                    deliBaseEntity.setDlvMgrTelNo(instShmtOdrRequest.getDlvMgrTelNo().replaceAll("-",""));
+                    deliBaseEntity.setDlvMgrTelNo(instShmtOdrRequest.getDlvMgrTelNo().replaceAll("-", ""));
                     deliBaseEntity.setDlvMgrEmal(null);
                     deliBaseEntity.setDlvMgrMblNo(null);
-                    deliBaseEntity.setVndrTelNo(entity.getDeliTelNo().replaceAll("-",""));
+                    deliBaseEntity.setVndrTelNo(entity.getDeliTelNo().replaceAll("-", ""));
                     deliBaseEntity.setDlvStCd("DLV0");
                     deliBaseEntity.setPodrRegDt(entity.getPodrDt());
-                    deliBaseEntity.setDlvReqDt(entity.getDlvReqDt().replaceAll("\\.",""));
-                    deliBaseEntity.setDlvSchDt(instShmtOdrRequest.getDlvSchDt().replaceAll("\\.",""));
+                    deliBaseEntity.setDlvReqDt(entity.getDlvReqDt().replaceAll("\\.", ""));
+                    deliBaseEntity.setDlvSchDt(instShmtOdrRequest.getDlvSchDt().replaceAll("\\.", ""));
                     deliBaseEntity.setDlvCmpltDt(null);
                     deliBaseEntity.setWhsId(entity.getWhsId());
                     deliBaseEntity.setLocation(entity.getLocation());
@@ -369,12 +367,12 @@ public class ShmtOdrService extends CommonService {
                 }
 
                 // 마지막 부분일 경우 
-                if (i == jobList.size()-1) {
+                if (i == jobList.size() - 1) {
                     if (shmtDtlList.size() > 0) {
-                        shmtOdrMapper.insertShmtOdrBase(userId,shmtBaseEntity );
-                        shmtOdrMapper.insertShmtOdrDtl(userId, shmtDtlList) ;
-                        shmtOdrMapper.insertDeliInfoMngt(userId,deliBaseEntity );
-                        shmtOdrMapper.insertDeliDtlPtcl(userId, deliDtlList) ;
+                        shmtOdrMapper.insertShmtOdrBase(userId, shmtBaseEntity);
+                        shmtOdrMapper.insertShmtOdrDtl(userId, shmtDtlList);
+                        shmtOdrMapper.insertDeliInfoMngt(userId, deliBaseEntity);
+                        shmtOdrMapper.insertDeliDtlPtcl(userId, deliDtlList);
                     }
                 }
 
@@ -383,10 +381,10 @@ public class ShmtOdrService extends CommonService {
                 System.out.println("============================" + "end");
 
                 // 재고수량 변동 및 안전비율계산(없애기로함) 처리후 저장함함
-                stockMngMapper.updateMinStockQty(userId,stockList );
+                stockMngMapper.updateMinStockQty(userId, stockList);
                 //재고 이력 테이블에 데이타 생성  insertMultiStckMgntDtlHist
                 List<StckMgntDtlHistEntity> stockHistList = new ArrayList<StckMgntDtlHistEntity>();
-                for ( int m = 0 ; m < stockList.size() ; m++) {
+                for (int m = 0; m < stockList.size(); m++) {
                     StckMgntBaseInfoEntity baseEntity = stockList.get(m);
                     StckMgntDtlHistEntity sourceHist = new StckMgntDtlHistEntity();
                     //String stckMgntDtlNo = fnGetDealNo(32,"");
@@ -395,7 +393,7 @@ public class ShmtOdrService extends CommonService {
 
                     //String stckMgntDtlNo1 =  commonMapper.selectDealNo(33, "");
 
-                    sourceHist.setStckMgntDtlNo(fnGetDealNo(32,"")); // 재고관리상세번호
+                    sourceHist.setStckMgntDtlNo(fnGetDealNo(32, "")); // 재고관리상세번호
                     //System.out.println("seqno =========>" +sourceHist.getStckMgntDtlNo() + "===" + stckMgntDtlNo );
                     sourceHist.setBrandId(baseEntity.getBrandId());
                     sourceHist.setWhsId(baseEntity.getWhsId());
@@ -414,18 +412,18 @@ public class ShmtOdrService extends CommonService {
                 // 1. 발주상세정보 상태 없데이트 한후  pchOrdMapper
 
 
-                for (int poi = 0 ; poi < gridInsertData.size() ; poi++) {
+                for (int poi = 0; poi < gridInsertData.size(); poi++) {
                     gridInsertData.get(poi).setPodrDtlStCd("POD3");
                 }
-                pchOrdMapper.updateChangeStPodrDtl(userId,gridInsertData );
+                pchOrdMapper.updateChangeStPodrDtl(userId, gridInsertData);
 
                 // 발주 헤더 상태 처리  updateChgMultiPodrStCd
                 String pchPodrUnqNo = "";
-                for (int k = 0 ; k < gridInsertData.size() ; k++) {
+                for (int k = 0; k < gridInsertData.size(); k++) {
                     if (!pchPodrUnqNo.equals(gridInsertData.get(k).getPchPodrUnqNo())) {
                         pchPodrUnqNo = gridInsertData.get(k).getPchPodrUnqNo();
                         String pchOdrStCd = pchOrdService.selectOdrDtlStatusList(pchPodrUnqNo);
-                        pchOrdMapper.updateChgPodrStCd(userId, pchOdrStCd, pchPodrUnqNo );
+                        pchOrdMapper.updateChgPodrStCd(userId, pchOdrStCd, pchPodrUnqNo);
                     }
                 }
             }
@@ -442,14 +440,14 @@ public class ShmtOdrService extends CommonService {
     }
 
     /* 출하현황 */
-    public GridResponse selectShmtSearchGridList(String sBrandId, String fromDt, String toDt, String sShmtWhsId, String sShmtReqStCd,  String sWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
+    public GridResponse selectShmtSearchGridList(String sBrandId, String fromDt, String toDt, String sShmtWhsId, String sShmtReqStCd, String sWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
         fromDt = fromDt == null ? null : fromDt.replace(".", "");
         toDt = toDt == null ? null : toDt.replace(".", "");
 
-        int gridRecords = shmtOdrMapper.selectShmtSearchGridCnt( sBrandId, fromDt, toDt, sShmtWhsId, sShmtReqStCd, sWhsId, sItemNm );
+        int gridRecords = shmtOdrMapper.selectShmtSearchGridCnt(sBrandId, fromDt, toDt, sShmtWhsId, sShmtReqStCd, sWhsId, sItemNm);
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
         List<ShmtOdrBaseEntity> entities = shmtOdrMapper.selectShmtSearchGridList(sBrandId, fromDt, toDt, sShmtWhsId, sShmtReqStCd, sWhsId, sItemNm, gridRequest);
         List<Object> gridRows = entities.stream()
@@ -459,21 +457,21 @@ public class ShmtOdrService extends CommonService {
                         .shmtReqDtlNo(m.getShmtOdrDtlInfo() == null ? "" : m.getShmtOdrDtlInfo().getShmtReqDtlNo() == null ? "" : m.getShmtOdrDtlInfo().getShmtReqDtlNo())
                         .brandId(m.getBrandId() == null ? "" : m.getBrandId())
                         .brandNm(m.getBrandNm() == null ? "" : m.getBrandNm())
-                        .pchPodrUnqNo(m.getShmtOdrDtlInfo() == null ? "" : m.getShmtOdrDtlInfo().getPchPodrUnqNo() == null ? "" : m.getShmtOdrDtlInfo().getPchPodrUnqNo() )
-                        .pchPodrDtlNo(m.getShmtOdrDtlInfo() == null ? "" : m.getShmtOdrDtlInfo().getPchPodrDtlNo() == null ? "" : m.getShmtOdrDtlInfo().getPchPodrDtlNo() )
+                        .pchPodrUnqNo(m.getShmtOdrDtlInfo() == null ? "" : m.getShmtOdrDtlInfo().getPchPodrUnqNo() == null ? "" : m.getShmtOdrDtlInfo().getPchPodrUnqNo())
+                        .pchPodrDtlNo(m.getShmtOdrDtlInfo() == null ? "" : m.getShmtOdrDtlInfo().getPchPodrDtlNo() == null ? "" : m.getShmtOdrDtlInfo().getPchPodrDtlNo())
                         .shmtReqStCd(m.getShmtReqStCd() == null ? "" : m.getShmtReqStCd())
                         .shmtReqStNm(m.getShmtReqStNm() == null ? "" : m.getShmtReqStNm())
-                        .itemId(m.getShmtOdrDtlInfo() == null ? "" :m.getShmtOdrDtlInfo().getItemId() == null ? "" : m.getShmtOdrDtlInfo().getItemId())
-                        .itemNm(m.getShmtOdrDtlInfo() == null ? "" :m.getShmtOdrDtlInfo().getItemNm() == null ? "" : m.getShmtOdrDtlInfo().getItemNm())
+                        .itemId(m.getShmtOdrDtlInfo() == null ? "" : m.getShmtOdrDtlInfo().getItemId() == null ? "" : m.getShmtOdrDtlInfo().getItemId())
+                        .itemNm(m.getShmtOdrDtlInfo() == null ? "" : m.getShmtOdrDtlInfo().getItemNm() == null ? "" : m.getShmtOdrDtlInfo().getItemNm())
                         .whsId(m.getWhsId() == null ? "" : m.getWhsId())
                         .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm() + " - " + m.getLocationNm())
                         .location(m.getLocation() == null ? "" : m.getLocation())
-                        .shmtQty(m.getShmtOdrDtlInfo() == null ? 0 : m.getShmtOdrDtlInfo().getShmtQty() == null ? 0 : m.getShmtOdrDtlInfo().getShmtQty() )
-                        .shmtAmt(m.getShmtOdrDtlInfo() == null ? 0 : m.getShmtOdrDtlInfo().getShmtAmt() == null ? 0 : m.getShmtOdrDtlInfo().getShmtAmt() )
-                        .whsQty(m.getWhsProcInfo() == null ? 0 : m.getWhsProcInfo().getWhsQty() == null ? 0 : m.getWhsProcInfo().getWhsQty() )
+                        .shmtQty(m.getShmtOdrDtlInfo() == null ? 0 : m.getShmtOdrDtlInfo().getShmtQty() == null ? 0 : m.getShmtOdrDtlInfo().getShmtQty())
+                        .shmtAmt(m.getShmtOdrDtlInfo() == null ? 0 : m.getShmtOdrDtlInfo().getShmtAmt() == null ? 0 : m.getShmtOdrDtlInfo().getShmtAmt())
+                        .whsQty(m.getWhsProcInfo() == null ? 0 : m.getWhsProcInfo().getWhsQty() == null ? 0 : m.getWhsProcInfo().getWhsQty())
                         .whsAmt(m.getWhsProcInfo() == null ? 0 : m.getWhsProcInfo().getWhsAmt() == null ? 0 : m.getWhsProcInfo().getWhsAmt())
-                        .whsDt(m.getWhsProcInfo() == null ? "" : m.getWhsProcInfo().getWhsDt() == null ? "" : m.getWhsProcInfo().getWhsDt() )
-                        .whsCnfmNm(m.getWhsProcInfo() == null ? "" : m.getWhsProcInfo().getWhsCnfmNm() == null ? "" : m.getWhsProcInfo().getWhsCnfmNm() )
+                        .whsDt(m.getWhsProcInfo() == null ? "" : m.getWhsProcInfo().getWhsDt() == null ? "" : m.getWhsProcInfo().getWhsDt())
+                        .whsCnfmNm(m.getWhsProcInfo() == null ? "" : m.getWhsProcInfo().getWhsCnfmNm() == null ? "" : m.getWhsProcInfo().getWhsCnfmNm())
                         .dlvSttmtUnqNo(m.getDlvSttmtUnqNo() == null ? "" : m.getDlvSttmtUnqNo())
                         .build())
                 .collect(Collectors.toList());
@@ -481,7 +479,7 @@ public class ShmtOdrService extends CommonService {
     }
 
     /* 납품서 정보 */
-    public InvInfoResponse selectInvInfo(String brandId, String  dlvSttmtUnqNo) throws Exception {
+    public InvInfoResponse selectInvInfo(String brandId, String dlvSttmtUnqNo) throws Exception {
 
         DeliInfoMgntEntity entity = shmtOdrMapper.selectInvInfo(brandId, dlvSttmtUnqNo);
         List<DeliDtlMgntEntity> dtlEntity = shmtOdrMapper.selectInvDtlList(brandId, dlvSttmtUnqNo);
@@ -508,8 +506,6 @@ public class ShmtOdrService extends CommonService {
         }
 
 
-
-
         //발주처 정보
         if ("W01".equals(entity.getWhsDvsn())) {
             //납품창고 본사
@@ -529,11 +525,17 @@ public class ShmtOdrService extends CommonService {
         // 브랜드 로고 brand_logo_file_no
         List<FileEntity> logFileList = null;
         if (!"".equals(brandEntity.getBrandLogoFileNo())) {
-            logFileList = fileMapper.selectFileList(brandEntity.getBrandLogoFileNo()) ;
+            logFileList = fileMapper.selectFileList(brandEntity.getBrandLogoFileNo());
         } else {
             logFileList = new ArrayList<FileEntity>();
         }
 
-        return InvInfoResponse.toDTO(entity,dtlEntity,logFileList);
+        return InvInfoResponse.toDTO(entity, dtlEntity, logFileList);
     }
+
+
+
 }
+
+
+

src/main/java/com/oqpo/api/service/pomng/PchOrdService.java

@@ -22,10 +22,7 @@ import com.oqpo.api.web.dto.request.pomng.pchOrd.CancelPchOrdDtlRequest;
 import com.oqpo.api.web.dto.request.pomng.pchOrd.PchReqOrdInitRequest;
 import com.oqpo.api.web.dto.request.pomng.pchOrd.SavePchOrdRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
-import com.oqpo.api.web.dto.response.pomng.pchOrd.PchOdrInfoResponse;
-import com.oqpo.api.web.dto.response.pomng.pchOrd.PchOdrSearchListResponse;
-import com.oqpo.api.web.dto.response.pomng.pchOrd.PchOrdInitInfoResponse;
-import com.oqpo.api.web.dto.response.pomng.pchOrd.PoOrdInitInfoResponse;
+import com.oqpo.api.web.dto.response.pomng.pchOrd.*;
 import com.oqpo.api.web.dto.response.pomng.pchReq.PchReqInfoResponse;
 import com.oqpo.api.web.dto.response.pomng.pchReq.PchReqSearchListResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -511,4 +508,36 @@ public class PchOrdService extends CommonService {
         return pchOdrStCd;
     }
 
+    /*
+     공급사 수주현황 리스트
+    */
+    public GridResponse selectSpplyPoGridList(String sBrandId, String fromDt, String toDt, String sSpplyId, String sWhsId, String sPchOdrStCd, String sItemNm, GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        fromDt = fromDt == null ? null : fromDt.replace(".", "");
+        toDt = toDt == null ? null : toDt.replace(".", "");
+
+        int gridRecords = pchOrdMapper.selectSpplyPoGridCnt(sBrandId, fromDt, toDt, sSpplyId, sWhsId, sPchOdrStCd, sItemNm);
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<PchOdrBaseInfoEntity> entities = pchOrdMapper.selectSpplyPoGridList(sBrandId, fromDt, toDt, sSpplyId, sWhsId, sPchOdrStCd, sItemNm, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> SpplyPoOdrSearchListResponse.builder()
+                        .viewCd("R")
+                        .brandId(m.getBrandId() == null ? "" : m.getBrandId())
+                        .brandNm(m.getBrandNm() == null ? "" : m.getBrandNm())
+                        .pchPodrUnqNo(m.getPchPodrUnqNo() == null ? "" : m.getPchPodrUnqNo())
+                        .pchOdrStCd(m.getPchOdrStCd() == null ? "" : m.getPchOdrStCd())
+                        .pchOdrStNm(m.getPchOdrStNm() == null ? "" : m.getPchOdrStNm())
+                        .podrDt(m.getPodrDt() == null ? "" : m.getPodrDt())
+                        .dlvReqDt(m.getDlvReqDt() == null ? "" : m.getDlvReqDt())
+                        .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm() + "-" + m.getLocationNm())
+                        .podrTotalAmt(m.getPodrTotalAmt() == null ? 0 : m.getPodrTotalAmt())
+                        .podrItemQty(m.getPodrItemQty() == null ? 0 : m.getPodrItemQty())
+                        .podrMgrNm(m.getPodrMgrNm() == null ? "" : m.getPodrMgrNm())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
 }

src/main/java/com/oqpo/api/service/stinfo/ItemService.java

@@ -97,9 +97,41 @@ public class ItemService extends CommonService {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
-        int gridRecords = itemMapper.selectItemGridCnt( sBrandId, sItemStCd, sPodrPssblDvsn, sItemType, sItemGubun, sClass1, sClass2, sClass3, sClass4, sItemNm);
+        int gridRecords = itemMapper.selectItemGridCnt( sBrandId, "", sItemStCd, sPodrPssblDvsn, sItemType, sItemGubun, sClass1, sClass2, sClass3, sClass4, sItemNm);
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<ItemEntity> entities = itemMapper.selectItemGridList( sBrandId, sItemStCd, sPodrPssblDvsn, sItemType, sItemGubun, sClass1, sClass2, sClass3, sClass4, sItemNm, gridRequest);
+        List<ItemEntity> entities = itemMapper.selectItemGridList( sBrandId, "", sItemStCd, sPodrPssblDvsn, sItemType, sItemGubun, sClass1, sClass2, sClass3, sClass4, sItemNm, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> ItemSearchListResponse.builder()
+                        .viewCd("R")
+                        .itemId(m.getItemId())
+                        .itemNm(m.getItemNm() == null ? "" :m.getItemNm()  )
+                        .itemType(m.getItemType() == null ? "" :m.getItemType() )
+                        .itemTypeNm(m.getItemTypeNm() == null ? "" :m.getItemTypeNm() )
+                        .itemClassMgntNo(m.getItemClassInfo() == null ? "" : m.getItemClassInfo().getItemClassMgntNo() == null ? "" : m.getItemClassInfo().getItemClassMgntNo())
+                        .itemClassNm(m.getItemClassMngInfo() == null ? "" : m.getItemClassMngInfo().getItemClassNm() == null ? "" : m.getItemClassMngInfo().getItemClassNm())
+                        .itemStCd(m.getItemStCd() == null ? "" :m.getItemStCd())
+                        .itemStNm(m.getItemStNm() == null ? "" :m.getItemStNm() )
+                        .podrPssblDvsn(m.getPodrPssblDvsn() == null ? "" : m.getPodrPssblDvsn())
+                        .podrPssblDvsnNm(m.getPodrPssblDvsnNm() == null ? "" :m.getPodrPssblDvsnNm())
+                        .unit(m.getUnit() == null ? "" : m.getUnit())
+                        .unitNm(m.getUnitNm() == null ? "" :m.getUnitNm() )
+                        .pchItemYn(m.getPchItemYn() == null ? "" : m.getPchItemYn())
+                        .saleItemYn(m.getSaleItemYn() == null ? "" :m.getSaleItemYn() )
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
+    /*
+      품목 그리드 리스트 조회
+     */
+    public GridResponse selectSpplyItemGridList( String sBrandId, String sSpplyId, String sItemStCd, String sPodrPssblDvsn, String sItemNm,  GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        int gridRecords = itemMapper.selectItemGridCnt( sBrandId,sSpplyId , sItemStCd, sPodrPssblDvsn, "", "", "", "", "", "", sItemNm);
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<ItemEntity> entities = itemMapper.selectItemGridList( sBrandId, sSpplyId, sItemStCd, sPodrPssblDvsn, "", "", "", "", "", "", sItemNm, gridRequest);
         List<Object> gridRows = entities.stream()
                 .map(m -> ItemSearchListResponse.builder()
                         .viewCd("R")

src/main/java/com/oqpo/api/service/stinfo/ItemUnitService.java

@@ -86,6 +86,46 @@ public class ItemUnitService extends CommonService {
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
 
+    /*
+      공급사단가 리스트 조회
+
+     */
+    public GridResponse selectSpplyItemUnitGridList(String sBrandId, String fromDt, String toDt,String sUnitStCd, String sSpplyId, String sItemNm, GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        fromDt = fromDt == null ? null : fromDt.replace(".", "");
+        toDt = toDt == null ? null : toDt.replace(".", "");
+
+        int gridRecords = itemUnitMapper.selectItemUnitGridCnt( sBrandId, fromDt,  toDt, sUnitStCd, sSpplyId, "", "", "", "",sItemNm );
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<ItemUnitEntity> entities = itemUnitMapper.selectItemUnitGridList(sBrandId, fromDt,  toDt, sUnitStCd, sSpplyId, "", "", "", "",sItemNm, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> ItemUnitSearchResponse.builder()
+                        .viewCd("R")
+                        .brandUnitUnqNo(m.getBrandUnitUnqNo())
+                        .brandId(m.getBrandId())
+                        .itemId(m.getItemId())
+                        .itemNm(m.getItemNm())
+                        .spplyId(m.getSpplyId())
+                        .spplyNm(m.getSpplyNm())
+                        .contSttDt(m.getContSttDt() == null ? "" :m.getContSttDt())
+                        .contEndDt(m.getContEndDt() == null ? "" :m.getContEndDt())
+                        .curr(m.getCurr() == null ? "" :m.getCurr())
+                        .currNm(m.getCurrNm() == null ? "" :m.getCurrNm() )
+                        .unit(m.getUnit() == null ? "" :m.getUnit())
+                        .unitNm(m.getUnitNm() == null ? "" :m.getUnitNm())
+                        .unitAmt(m.getUnitAmt() == null ? 0 :m.getUnitAmt())
+                        .leadTime(m.getLeadTime() == null ? 0 :m.getLeadTime())
+                        .spplyItemId(m.getSpplyItemId() == null ? "" :m.getSpplyItemId())
+                        .unitStCd(m.getUnitStCd() == null ? "" :m.getUnitStCd())
+                        .unitStNm(m.getUnitStNm() == null ? "" :m.getUnitStNm())
+                        .stddQty(m.getStddQty() == null ? 0 :m.getStddQty() )
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
 
 
     /* 공급사 단가 정보 */
@@ -155,13 +195,13 @@ public class ItemUnitService extends CommonService {
     /*
       브랜드 매장 단가 리스트 조회
      */
-    public GridResponse selectStoreItemUnitGridList(String sBrandId, String sStoreNm,  GridRequest gridRequest) throws Exception {
+    public GridResponse selectStoreItemUnitGridList(String sBrandId, String sStoreId,  GridRequest gridRequest) throws Exception {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
-        int gridRecords = storeItemUnitMapper.selectStoreItemUnitGridCnt( sBrandId, sStoreNm );
+        int gridRecords = storeItemUnitMapper.selectStoreItemUnitGridCnt( sBrandId, sStoreId );
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<StoreItemUnitEntity> entities = storeItemUnitMapper.selectStoreItemUnitGridList(sBrandId, sStoreNm, gridRequest);
+        List<StoreItemUnitEntity> entities = storeItemUnitMapper.selectStoreItemUnitGridList(sBrandId, sStoreId, gridRequest);
         List<Object> gridRows = entities.stream()
                 .map(m -> StoreItemUnitSearchResponse.builder()
                         .viewCd("R")
@@ -178,10 +218,40 @@ public class ItemUnitService extends CommonService {
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
 
+    /*
+      매장용 매장 단가 리스트 조회
+     */
+    /*
+    public GridResponse selectSstoreItemUnitGridList(String sBrandId, String sStoreId,  GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        int gridRecords = storeItemUnitMapper.selectSstoreItemUnitGridCnt( sBrandId, sStoreId );
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<StoreItemUnitEntity> entities = storeItemUnitMapper.selectSstoreItemUnitGridList(sBrandId, sStoreId, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> StoreItemUnitSearchResponse.builder()
+                        .viewCd("R")
+                        .brandId(m.getBrandId())
+                        .brandNm(m.getBrandNm())
+                        .storeId(m.getStoreId())
+                        .storeNm(m.getStoreNm())
+                        .contSttDt(m.getContSttDt())
+                        .contEndDt(m.getContEndDt())
+                        .sysRegDttm(m.getSysRegDttm())
+                        .itemCnt(m.getItemCnt())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+    */
 
     /* 매장 단가 정보 */
     public StoreItemUnitInfoResponse selectStoreItemUnitInfo(String brandId, String storeId, String contSttDt, String contEndDt) throws Exception {
 
+        contSttDt = contSttDt == null ? null : contSttDt.replace(".", "");
+        contEndDt = contEndDt == null ? null : contEndDt.replace(".", "");
+
         List<StoreItemUnitEntity> entities = storeItemUnitMapper.selectStoreItemUnitInfo( brandId, storeId, contSttDt, contEndDt);
         return StoreItemUnitInfoResponse.toDTO(entities);
 
@@ -199,15 +269,18 @@ public class ItemUnitService extends CommonService {
             entity.setContSttDt(saveStoreItemUnitInfolRequest.getContSttDt().replaceAll("\\.",""));
             entity.setContEndDt(saveStoreItemUnitInfolRequest.getContEndDt().replaceAll("\\.",""));
 
-            String rcontEndDt =  storeItemUnitMapper.selectStoreItemUnitContDateInfo(entity.getBrandId(), entity.getStoreId(), entity.getContSttDt(), entity.getContEndDt());
-            if (!"".equals(rcontEndDt))
-            {
-                System.out.println("chkDataEnity===getContEndDt==>" + rcontEndDt);
-                storeItemUnitMapper.updateStoreItemUnitContEnd(entity.getBrandId(), entity.getStoreId(), rcontEndDt,  entity.getContSttDt());
+            // 동일 단가계약일자 존재시
+            String rcontEndDt = "";
+            String existYn = storeItemUnitMapper.selectStoreItemUnitExistYn(entity.getBrandId(), entity.getStoreId(), entity.getContSttDt(), entity.getContEndDt());
 
+            if ("N".equals(existYn)) {
+                rcontEndDt =  storeItemUnitMapper.selectStoreItemUnitContDateInfo(entity.getBrandId(), entity.getStoreId(), entity.getContSttDt(), entity.getContEndDt());
+                if (!"".equals(rcontEndDt))
+                {
+                    storeItemUnitMapper.updateStoreItemUnitContEnd(entity.getBrandId(), entity.getStoreId(), rcontEndDt,  entity.getContSttDt());
+                }
             }
 
-
             List<StoreItemUnitEntity> gridUpdateData = saveStoreItemUnitInfolRequest.toCodeEntities(saveStoreItemUnitInfolRequest.getGridUpdateData());
             if (gridUpdateData.size() > 0) {
 

src/main/java/com/oqpo/api/web/controller/SessionController.java

@@ -122,7 +122,7 @@ public class SessionController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "bsnsRegNo", value = "사업자 번호", required = false, dataType = "String", paramType = "query")
     })
-    @ApiOperation(value = "사업자번호 브랜드리스트")
+    @ApiOperation(value = "사업자번호 브랜드리스트 - 사용안함")
     @GetMapping("/bsnsbrand")
     public ResponseEntity<SessionBrandListResponse> getBsnsBrandList(@RequestParam(value = "bsnsRegNo", required = true) String bsnsRegNo) throws Exception {
         return ResponseEntity.ok(sessionService.bsnsBrandList(bsnsRegNo));

src/main/java/com/oqpo/api/web/controller/SigninController.java

@@ -4,13 +4,12 @@ import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.service.SigninService;
 import com.oqpo.api.util.CryptoUtil;
 import com.oqpo.api.web.dto.request.oper.ntice.NticeGridRequest;
-import com.oqpo.api.web.dto.request.sign.FindIdRequest;
-import com.oqpo.api.web.dto.request.sign.FindPwRequest;
-import com.oqpo.api.web.dto.request.sign.SigninRequest;
+import com.oqpo.api.web.dto.request.sign.*;
 import com.oqpo.api.web.dto.response.GridResponse;
 import com.oqpo.api.web.dto.response.oper.ntice.NticeResponse;
 import com.oqpo.api.web.dto.response.session.FindIdResponse;
 import com.oqpo.api.web.dto.response.session.FindPwResponse;
+import com.oqpo.api.web.dto.response.session.LogInBrandListResponse;
 import com.oqpo.api.web.dto.response.token.JwtResponse;
 import com.oqpo.api.web.dto.response.SaveResponse;
 import io.swagger.annotations.ApiImplicitParam;
@@ -63,11 +62,12 @@ public class SigninController {
      */
     @ApiOperation(value = "로그인")
     @PostMapping("/sign-in-app")
-    public ResponseEntity<JwtResponse> signinApp(@RequestBody @Valid SigninRequest signinRequest) throws Exception {
+    public ResponseEntity<JwtResponse> signinApp(@RequestBody @Valid SigninAppRequest signinAppRequest) throws Exception {
         hashed = StringEscapeUtils.unescapeJava(hashed);
-        String userId = CryptoUtil.doDecrypt(signinRequest.getUserId(), hashed);
-        String password = CryptoUtil.doDecrypt(signinRequest.getPassword(), hashed);
-        return ResponseEntity.ok(signinService.signin(userId, password));
+        String brandId = signinAppRequest.getBrandId();
+        String userId = CryptoUtil.doDecrypt(signinAppRequest.getUserId(), hashed);
+        String password = CryptoUtil.doDecrypt(signinAppRequest.getPassword(), hashed);
+        return ResponseEntity.ok(signinService.signinApp(brandId, userId, password));
     }
 
     /**
@@ -130,6 +130,21 @@ public class SigninController {
         return ResponseEntity.ok(signinService.selectMemberFindPw(findPwRequest.getUserId(), findPwRequest.getEmail(), findPwRequest.getTelNo()));
     }
 
+    /**
+     * 설명 : APP 사업자번호 브랜드리스트 가져오기
+     *
+     * @param
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bsnsRegNo", value = "사업자번호", required = true, dataType = "String", paramType = "query")
+    })
+    @ApiOperation(value = "APP 사업자번호 브랜드리스트 가져오기")
+    @GetMapping("/brand-list-app")
+    public ResponseEntity<LogInBrandListResponse> selectBrandApp(@RequestParam(value = "bsnsRegNo") String bsnsRegNo) throws Exception {
 
+        return ResponseEntity.ok(signinService.selectMemberBrandList(bsnsRegNo));
+    }
 
 }

src/main/java/com/oqpo/api/web/controller/inoutmng/ShmtOdrController.java

@@ -5,11 +5,10 @@ import com.oqpo.api.service.inoutmng.ShmtOdrService;
 import com.oqpo.api.web.dto.request.inoutmng.InstShmtOdrRequest;
 import com.oqpo.api.web.dto.request.inoutmng.ShmtOdrTargetGridRequest;
 import com.oqpo.api.web.dto.request.inoutmng.ShmtOutSearchGridRequest;
-import com.oqpo.api.web.dto.request.pomng.pchOrd.SavePchOrdRequest;
+import com.oqpo.api.web.dto.request.pomng.pchOrd.SpplyOdrPoGridRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
 import com.oqpo.api.web.dto.response.SaveResponse;
 import com.oqpo.api.web.dto.response.inoutmng.InvInfoResponse;
-import com.oqpo.api.web.dto.response.stinfo.brand.BrandInfoResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -25,7 +24,7 @@ import javax.validation.Valid;
 @Slf4j
 @RestController
 @RequestMapping("/api/pomng/inoutmng")
-@Api(tags = {"출하지시 관리 (ShmtOdrController) -- 진행중"})
+@Api(tags = {"출하지시 / 공급사 수주 및 납품서 생성 관리 (ShmtOdrController) -- 진행중"})
 public class ShmtOdrController {
     @Autowired
     private ShmtOdrService shmtOdrService;
@@ -102,4 +101,7 @@ public class ShmtOdrController {
     public ResponseEntity<InvInfoResponse> infoInv(@RequestParam(value = "brandId") String brandId, @RequestParam(value = "dlvSttmtUnqNo") String dlvSttmtUnqNo) throws Exception {
         return ResponseEntity.ok(shmtOdrService.selectInvInfo(brandId, dlvSttmtUnqNo));
     }
+
+
+
 }

src/main/java/com/oqpo/api/web/controller/pomng/PchOrdController.java

@@ -1,18 +1,18 @@
 package com.oqpo.api.web.controller.pomng;
 
+import com.oqpo.api.entity.pomng.PchOdrBaseInfoEntity;
 import com.oqpo.api.enums.DataMessageCode;
 import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.service.pomng.PchOrdService;
-import com.oqpo.api.web.dto.request.pomng.pchOrd.CancelPchOrdDtlRequest;
-import com.oqpo.api.web.dto.request.pomng.pchOrd.PchOrdSearchGridRequest;
-import com.oqpo.api.web.dto.request.pomng.pchOrd.PchReqOrdInitRequest;
-import com.oqpo.api.web.dto.request.pomng.pchOrd.SavePchOrdRequest;
+import com.oqpo.api.web.dto.request.GridRequest;
+import com.oqpo.api.web.dto.request.pomng.pchOrd.*;
 import com.oqpo.api.web.dto.response.DataResponse;
 import com.oqpo.api.web.dto.response.GridResponse;
 import com.oqpo.api.web.dto.response.SaveResponse;
 import com.oqpo.api.web.dto.response.pomng.pchOrd.PchOdrInfoResponse;
 import com.oqpo.api.web.dto.response.pomng.pchOrd.PchOrdInitInfoResponse;
 import com.oqpo.api.web.dto.response.pomng.pchOrd.PoOrdInitInfoResponse;
+import com.oqpo.api.web.dto.response.pomng.pchOrd.SpplyPoOdrSearchListResponse;
 import com.oqpo.api.web.dto.response.pomng.pchReq.PchReqInfoResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Slf4j
 @RestController
@@ -164,4 +166,22 @@ public class PchOrdController {
         return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
     }
 
+
+
+    /**
+     * 설명 : 공급사 수주내역
+     *
+     * @param spplyOdrPoGridRequest
+     * @return
+     * @throws Exception
+     */
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 공급사 수주내역 그리드 리스트")
+    @PostMapping("/spply-po-grid-list")
+    public ResponseEntity<GridResponse> selectSpplyPoGridList(@RequestBody @Valid SpplyOdrPoGridRequest spplyOdrPoGridRequest) throws Exception {
+        return ResponseEntity.ok(pchOrdService.selectSpplyPoGridList(spplyOdrPoGridRequest.getSBrandId(), spplyOdrPoGridRequest.getFromDt(), spplyOdrPoGridRequest.getToDt(), spplyOdrPoGridRequest.getSSpplyId(), spplyOdrPoGridRequest.getSWhsId(), spplyOdrPoGridRequest.getSPchOdrStCd(),  spplyOdrPoGridRequest.getSItemNm(),  spplyOdrPoGridRequest.toDTO(spplyOdrPoGridRequest)));
+    }
 }

src/main/java/com/oqpo/api/web/controller/stinfo/ItemController.java

@@ -67,6 +67,23 @@ public class ItemController {
         return ResponseEntity.ok(itemService.selectItemGridList( itemGridRequest.getSBrandId(), itemGridRequest.getSItemStCd(), itemGridRequest.getSPodrPssblDvsn(), itemGridRequest.getSItemType(), itemGridRequest.getSItemGubun(), itemGridRequest.getSClass1(), itemGridRequest.getSClass2(), itemGridRequest.getSClass3(), itemGridRequest.getSClass4(), itemGridRequest.getSItemNm(),  itemGridRequest.toDTO(itemGridRequest)));
     }
 
+    /**
+     * 설명 : 공급사 품목 그리드 리스트
+     *
+     * @param itemGridRequest
+     * @return
+     * @throws Exception
+     */
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 공급사 품목 그리드 리스트")
+    @PostMapping("/spply-grid-list")
+    public ResponseEntity<GridResponse> spplyDetailGridList(@RequestBody @Valid SpplyItemGridRequest spplyItemGridRequest) throws Exception {
+        return ResponseEntity.ok(itemService.selectSpplyItemGridList( spplyItemGridRequest.getSBrandId(), spplyItemGridRequest.getSSpplyId(),  spplyItemGridRequest.getSItemStCd(), spplyItemGridRequest.getSPodrPssblDvsn(), spplyItemGridRequest.getSItemNm(),  spplyItemGridRequest.toDTO(spplyItemGridRequest)));
+    }
+
 
     /**
      * 설명 : 품목 정보

src/main/java/com/oqpo/api/web/dto/request/pomng/pchOrd/SpplyOdrPoGridRequest.java

@@ -0,0 +1,45 @@
+package com.oqpo.api.web.dto.request.pomng.pchOrd;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+
+@Getter
+@Setter
+public class SpplyOdrPoGridRequest extends GridRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "시작일자")
+    private String fromDt;
+
+    @NotBlank
+    @ApiModelProperty(value = "종료일자")
+    private String toDt;
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @NotBlank
+    @ApiModelProperty(value = "공급사아이디")
+    private String sSpplyId;
+
+    @ApiModelProperty(value = "수주상태-발주상태")
+    private String sPchOdrStCd;
+
+    @ApiModelProperty(value = "납품창고아이디")
+    private String sWhsId;
+
+    @ApiModelProperty(value = "품목명")
+    private String sItemNm;
+
+
+
+    protected SpplyOdrPoGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
+        super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
+    }
+}

src/main/java/com/oqpo/api/web/dto/request/sign/LogInBrandRequest.java

@@ -0,0 +1,16 @@
+package com.oqpo.api.web.dto.request.sign;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+public class LogInBrandRequest {
+    @NotBlank
+    @ApiModelProperty(value = "사업자번호")
+    private String bsnsRegNo;
+}

src/main/java/com/oqpo/api/web/dto/request/sign/SigninAppRequest.java

@@ -0,0 +1,25 @@
+package com.oqpo.api.web.dto.request.sign;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+public class SigninAppRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+
+    @NotBlank
+    @ApiModelProperty(value = "아이디")
+    private String userId;
+
+    @NotBlank
+    @ApiModelProperty(value = "패스워드")
+    private String password;
+}

src/main/java/com/oqpo/api/web/dto/request/sign/SigninRequest.java

@@ -10,6 +10,7 @@ import javax.validation.constraints.NotBlank;
 @Builder
 @AllArgsConstructor(access = AccessLevel.PROTECTED)
 public class SigninRequest {
+
     @NotBlank
     @ApiModelProperty(value = "아이디")
     private String userId;

src/main/java/com/oqpo/api/web/dto/request/stinfo/item/ItemClassGridRequest.java

@@ -5,11 +5,14 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 
 @Getter
 @Setter
 public class ItemClassGridRequest extends GridRequest {
 
+    @NotBlank
     @ApiModelProperty(value = "브랜드아이디")
     private String sBrandId;
 

src/main/java/com/oqpo/api/web/dto/request/stinfo/item/ItemGridRequest.java

@@ -5,12 +5,14 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 
 @Getter
 @Setter
 public class ItemGridRequest extends GridRequest {
 
-
+    @NotBlank
     @ApiModelProperty(value = "브랜드아이디")
     private String sBrandId;
 

src/main/java/com/oqpo/api/web/dto/request/stinfo/item/SaveItemClassMngInfolRequest.java

@@ -13,6 +13,7 @@ public class SaveItemClassMngInfolRequest {
     @ApiModelProperty(value = "CRUD")
     private String viewCd;
 
+    @NotBlank
     @ApiModelProperty(value = "브랜드번호")
     private String brandId;
 

src/main/java/com/oqpo/api/web/dto/request/stinfo/item/SaveItemInfolRequest.java

@@ -13,6 +13,7 @@ public class SaveItemInfolRequest {
     @ApiModelProperty(value = "CRUD")
     private String viewCd;
 
+    @NotBlank
     @ApiModelProperty(value = "브랜드아이디")
     private String brandId;
 

src/main/java/com/oqpo/api/web/dto/request/stinfo/item/SpplyItemGridRequest.java

@@ -0,0 +1,36 @@
+package com.oqpo.api.web.dto.request.stinfo.item;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+
+@Getter
+@Setter
+public class SpplyItemGridRequest extends GridRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @NotBlank
+    @ApiModelProperty(value = "공급사아이디")
+    private String sSpplyId;
+
+    @ApiModelProperty(value = "발주가능여부")
+    private String sPodrPssblDvsn;
+
+    @ApiModelProperty(value = "품목상태")
+    private String sItemStCd;
+
+    @ApiModelProperty(value = "품목명")
+    private String sItemNm;
+
+
+    protected SpplyItemGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
+        super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
+    }
+}

src/main/java/com/oqpo/api/web/dto/request/stinfo/itemUnit/ItemUnitSearchGridRequest.java

@@ -5,12 +5,14 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 
 @Getter
 @Setter
 public class ItemUnitSearchGridRequest extends GridRequest {
 
-
+    @NotBlank
     @ApiModelProperty(value = "브랜드아이디")
     private String sBrandId;
 

src/main/java/com/oqpo/api/web/dto/request/stinfo/itemUnit/SaveItemUnitInfolRequest.java

@@ -16,6 +16,7 @@ public class SaveItemUnitInfolRequest {
     @ApiModelProperty(value = "브랜드단가고유번호")
     private String brandUnitUnqNo;
 
+    @NotBlank
     @ApiModelProperty(value = "브랜드아이디")
     private String brandId;
 

src/main/java/com/oqpo/api/web/dto/request/stinfo/itemUnit/SaveStoreItemUnitInfolRequest.java

@@ -18,9 +18,11 @@ public class SaveStoreItemUnitInfolRequest {
     @ApiModelProperty(value = "CRUD")
     private String viewCd;
 
+    @NotBlank
     @ApiModelProperty(value = "매장아이디")
     private String storeId;
 
+    @NotBlank
     @ApiModelProperty(value = "브랜드아이디")
     private String brandId;
 

src/main/java/com/oqpo/api/web/dto/request/stinfo/itemUnit/SpplyItemUnitSearchGridRequest.java

@@ -0,0 +1,40 @@
+package com.oqpo.api.web.dto.request.stinfo.itemUnit;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+
+@Getter
+@Setter
+public class SpplyItemUnitSearchGridRequest extends GridRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @ApiModelProperty(value = "시작일자")
+    private String fromDt;
+
+    @ApiModelProperty(value = "종료일자")
+    private String toDt;
+
+    @ApiModelProperty(value = "상태")
+    private String sUnitStCd;
+
+    @NotBlank
+    @ApiModelProperty(value = "공급사아이디")
+    private String sSpplyId;
+
+
+    @ApiModelProperty(value = "품목명")
+    private String sItemNm;
+
+
+    protected SpplyItemUnitSearchGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
+        super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
+    }
+}

src/main/java/com/oqpo/api/web/dto/request/stinfo/itemUnit/SstoreItemUnitSearchGridRequest.java

@@ -0,0 +1,26 @@
+package com.oqpo.api.web.dto.request.stinfo.itemUnit;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+
+@Getter
+@Setter
+public class SstoreItemUnitSearchGridRequest extends GridRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @NotBlank
+    @ApiModelProperty(value = "매장아이디")
+    private String sStoreId;
+
+    protected SstoreItemUnitSearchGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
+        super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
+    }
+}

src/main/java/com/oqpo/api/web/dto/request/stinfo/itemUnit/StoreItemUnitSearchGridRequest.java

@@ -5,17 +5,19 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 
 @Getter
 @Setter
 public class StoreItemUnitSearchGridRequest extends GridRequest {
 
-
+    @NotBlank
     @ApiModelProperty(value = "브랜드아이디")
     private String sBrandId;
 
-    @ApiModelProperty(value = "매장명")
-    private String sStoreNm;
+    @ApiModelProperty(value = "매장아이디")
+    private String sStoreId;
 
     protected StoreItemUnitSearchGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
         super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);

src/main/java/com/oqpo/api/web/dto/request/stinfo/spply/SpplyGridRequest.java

@@ -5,12 +5,14 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 
 @Getter
 @Setter
 public class SpplyGridRequest extends GridRequest {
 
-
+    @NotBlank
     @ApiModelProperty(value = "브랜드아이디")
     private String sBrandId;
 

src/main/java/com/oqpo/api/web/dto/request/stinfo/spply/SpplyPopGridRequest.java

@@ -5,11 +5,13 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 
 @Getter
 @Setter
 public class SpplyPopGridRequest extends GridRequest {
-
+    @NotBlank
     @ApiModelProperty(value = "브랜드아이디")
     private String sBrandId;
 

src/main/java/com/oqpo/api/web/dto/request/stinfo/store/StorePopGridRequest.java

@@ -5,11 +5,14 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 
 @Getter
 @Setter
 public class StorePopGridRequest extends GridRequest {
 
+    @NotBlank
     @ApiModelProperty(value = "브랜드아이디")
     private String brandId;
 

src/main/java/com/oqpo/api/web/dto/request/stinfo/store/StoreSearchGridRequest.java

@@ -5,12 +5,15 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 
 @Getter
 @Setter
 public class StoreSearchGridRequest extends GridRequest {
 
-    @ApiModelProperty(value = "브랜드명")
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
     private String sBrandId;
 
     @ApiModelProperty(value = "날짜검색조건 10 오픈일, 20 등록일")

src/main/java/com/oqpo/api/web/dto/response/pomng/pchOrd/SpplyPoOdrSearchListResponse.java

@@ -0,0 +1,29 @@
+package com.oqpo.api.web.dto.response.pomng.pchOrd;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class SpplyPoOdrSearchListResponse {
+
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "브랜드아이디") private String brandId;
+    @ApiModelProperty(value = "브랜드명") private String brandNm;
+    @ApiModelProperty(value = "구매발주번호") private String pchPodrUnqNo;
+    @ApiModelProperty(value = "구매발주상태") private String pchOdrStCd;
+    @ApiModelProperty(value = "구매발주상태명") private String pchOdrStNm;
+    @ApiModelProperty(value = "구매발주일자") private String podrDt;
+    @ApiModelProperty(value = "납품요청일자") private String dlvReqDt;
+    @ApiModelProperty(value = "납품창고명") private String whsNm;
+    @ApiModelProperty(value = "총 발주금액") private Integer podrTotalAmt;
+    @ApiModelProperty(value = "총 품목수량") private Integer podrItemQty;
+    @ApiModelProperty(value = "발주담당자명") private String podrMgrNm;
+
+}

src/main/java/com/oqpo/api/web/dto/response/session/LogInBrandListResponse.java

@@ -0,0 +1,46 @@
+package com.oqpo.api.web.dto.response.session;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.oper.MemberEntity;
+import com.oqpo.api.web.dto.response.pomng.pchReq.PchReqRejectTargetResponse;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class LogInBrandListResponse {
+
+    @ApiModelProperty(value = "그리드 리스트")
+    private List<LogInBrandListResponse.LoginBrandInfo> gridRows;
+
+    public static LogInBrandListResponse toDTO(List<MemberEntity> entities) {
+        if (entities == null) return null;
+        return LogInBrandListResponse.builder()
+                .gridRows(entities.stream()
+                        .map(m -> LogInBrandListResponse.LoginBrandInfo.builder()
+                                .brandId(m.getBrandId())
+                                .brandNm(m.getBrandNm())
+                                .build())
+                        .collect(Collectors.toList()))
+                .build();
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class LoginBrandInfo {
+
+        @ApiModelProperty(value = "브랜드아이디")
+        private String brandId;
+
+        @ApiModelProperty(value = "브랜드명")
+        private String brandNm;
+
+    }
+}

src/main/java/com/oqpo/api/web/dto/response/stinfo/itemUnit/StoreItemUnitInfoResponse.java

@@ -28,7 +28,7 @@ public class StoreItemUnitInfoResponse {
     private Integer gridRecords;
 
     @ApiModelProperty(value = "그리드 리스트")
-    private List<StoreItemUnitInfo> gridRows;
+    private List<StoreItemUnitInfoData> gridRows;
 
 
     public static StoreItemUnitInfoResponse toDTO(List<StoreItemUnitEntity> entities) {
@@ -39,8 +39,10 @@ public class StoreItemUnitInfoResponse {
                 .gridRecords(entities.size())
                 .gridTotal(0)
                 .gridRows(entities.stream()
-                        .map(m -> StoreItemUnitInfo.builder()
-                                .storeUnitUnqNo(m.getStoreUnitUnqNo())
+                        .map(m -> StoreItemUnitInfoData.builder()
+                                .viewCd(m.getViewCd())
+                                .storeUnitUnqNo(m.getStoreUnitUnqNo() == null ? "" :m.getStoreUnitUnqNo())
+                                .brandUnitUnqNo(m.getBrandUnitUnqNo() == null ? "" :m.getBrandUnitUnqNo())
                                 .brandId(m.getBrandId())
                                 .itemId(m.getItemId())
                                 .itemNm(m.getItemNm())
@@ -64,10 +66,17 @@ public class StoreItemUnitInfoResponse {
     @Getter
     @Builder
     @AllArgsConstructor(access = AccessLevel.PROTECTED)
-    static class StoreItemUnitInfo {
+    static class StoreItemUnitInfoData {
+
+        @ApiModelProperty(value = "작업구분")
+        private String viewCd;
+
         @ApiModelProperty(value = "매장단가고유번호")
         private String storeUnitUnqNo;
 
+        @ApiModelProperty(value = "브랜드 단가고유번호")
+        private String brandUnitUnqNo;
+
         @ApiModelProperty(value = "브랜드아이디")
         private String brandId;
 

src/main/resources/mybatis/sqlmaps/Member.xml

@@ -39,6 +39,29 @@
         and replace(tel_no,'-','') = replace(#{telNo},'-','')
     </select>
 
+    <select id="selectMemberBrandList" resultType="com.oqpo.api.entity.oper.MemberEntity">
+        select distinct binfo.brand_id, binfo.brand_nm
+        from  brand_base_info binfo
+                join 	(
+                    select brand_id
+                    from brand_base_info
+                    where bsns_reg_no = #{bsnsRegNo}
+                    or affl_shop_id in (select affl_shop_id from affl_shop_base_info
+                                                where bsns_reg_no = #{bsnsRegNo}
+                                                and   st_cd = 'S000' )
+                    union all
+                    select brand_id
+                    from  store_base_info
+                    where bsns_reg_no = #{bsnsRegNo}
+                    and   store_st_cd = 'ST01'
+                    union all
+                    select brand_id
+                    from  spply_base_info
+                    where bsns_reg_no = #{bsnsRegNo}
+                    and   st_cd = 'S000'
+                    ) tinfo on binfo.brand_id = tinfo.brand_id
+        where binfo.st_cd = 'S000'
+    </select>
 
 
 

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

@@ -265,4 +265,7 @@
         and info.dlv_sttmt_unq_no = #{dlvSttmtUnqNo}
     </select>
 
+
+
+
 </mapper>

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

@@ -285,4 +285,94 @@
             WHERE pch_podr_unq_no = #{item.pchPodrUnqNo}
         </foreach>
     </update>
+
+    <select id="selectSpplyPoGridList" resultType="com.oqpo.api.entity.pomng.PchOdrBaseInfoEntity">
+        select base.brand_id, fn_brand_nm(base.brand_id) as brand_nm, base.pch_podr_unq_no
+        , base.pch_odr_st_cd, fn_code_nm(upper('pch_odr_st_cd'), base.pch_odr_st_cd) as pch_odr_st_cd_nm
+        , date_format(base.podr_dt, '%Y.%m.%d %H:%i:%s') as podr_dt
+        , date_format(base.dlv_req_dt, '%Y.%m.%d %H:%i:%s') as dlv_req_dt
+        , fn_whs_nm(base.brand_id, base.whs_id) as whs_nm
+        , fn_whs_location_nm(base.brand_id, base.whs_id, base.location) as location_nm
+        , base.podr_total_amt, base.podr_item_qty, base.podr_mgr_nm
+        from pch_odr_base_info base
+        where 1 = 1
+        and base.brand_id = #{sBrandId}
+        and base.spply_id = #{sSpplyId}
+        and base.podr_dt between #{fromDt} and #{toDt}
+        <if test="sPchOdrStCd != null and sPchOdrStCd != ''">
+            and base.pch_odr_st_cd = #{sPchOdrStCd}
+        </if>
+        <if test="sWhsId != null and sWhsId != ''">
+            and base.whs_id = #{sWhsId}
+        </if>
+        <if test="sItemNm != null and sItemNm != ''">
+            and ((base.pch_podr_unq_no like concat('%', #{sItemNm}, '%')) or
+            (base.pch_podr_unq_no in (select base.pch_podr_unq_no
+            from pch_odr_base_info base
+            , pch_odr_dtl_ptcl ptcl
+            where 1 = 1
+            and base.pch_podr_unq_no = ptcl.pch_podr_unq_no
+            and base.brand_id = #{sBrandId}
+            and base.spply_id = #{sSpplyId}
+            and base.podr_dt between #{fromDt} and #{toDt}
+            <if test="sPchOdrStCd != null and sPchOdrStCd != ''">
+                and base.pch_odr_st_cd = #{sPchOdrStCd}
+            </if>
+            <if test="sWhsId != null and sWhsId != ''">
+                and base.whs_id = #{sWhsId}
+            </if>
+            and (ptcl.item_id like concat('%', #{sItemNm}, '%') or ptcl.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 pch_req_unq_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by pch_req_unq_no desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by pch_req_unq_no desc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectSpplyPoGridCnt" resultType="int">
+        select count(*)
+        from pch_odr_base_info base
+        where 1 = 1
+        and base.brand_id = #{sBrandId}
+        and base.spply_id = #{sSpplyId}
+        and base.podr_dt between #{fromDt} and #{toDt}
+        <if test="sPchOdrStCd != null and sPchOdrStCd != ''">
+            and base.pch_odr_st_cd = #{sPchOdrStCd}
+        </if>
+        <if test="sWhsId != null and sWhsId != ''">
+            and base.whs_id = #{sWhsId}
+        </if>
+        <if test="sItemNm != null and sItemNm != ''">
+            and ((base.pch_podr_unq_no like concat('%', #{sItemNm}, '%')) or
+            (base.pch_podr_unq_no in (select base.pch_podr_unq_no
+            from pch_odr_base_info base
+            , pch_odr_dtl_ptcl ptcl
+            where 1 = 1
+            and base.pch_podr_unq_no = ptcl.pch_podr_unq_no
+            and base.brand_id = #{sBrandId}
+            and base.spply_id = #{sSpplyId}
+            and base.podr_dt between #{fromDt} and #{toDt}
+            <if test="sPchOdrStCd != null and sPchOdrStCd != ''">
+                and base.pch_odr_st_cd = #{sPchOdrStCd}
+            </if>
+            <if test="sWhsId != null and sWhsId != ''">
+                and base.whs_id = #{sWhsId}
+            </if>
+            and (ptcl.item_id like concat('%', #{sItemNm}, '%') or ptcl.item_nm like concat('%', #{sItemNm}, '%')))))
+        </if>
+    </select>
 </mapper>

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

@@ -58,6 +58,10 @@
         from item_base_info item
         left outer join item_class_ptcl iclas on item.ITEM_ID = iclas.ITEM_ID
         join item_class_mgnt mclas on iclas.item_class_mgnt_no = mclas.item_class_mgnt_no
+        <if test="sSpplyId != null and sSpplyId != ''">
+        join brand_item_unit_info buinfo on item.brand_id = buinfo.brand_id and item.item_id = buinfo.item_id and buinfo.spply_id = #{sSpplyId}
+            and date_format(now(), '%Y%m%d') between  buinfo.cont_stt_dt and buinfo.cont_end_dt
+        </if>
         where item.brand_id = #{sBrandId}
         <if test="sItemStCd != null and sItemStCd != ''">
         and  item.item_st_cd = #{sItemStCd}
@@ -115,6 +119,10 @@
         from item_base_info item
         left outer join item_class_ptcl iclas on item.ITEM_ID = iclas.ITEM_ID
         join item_class_mgnt mclas on iclas.item_class_mgnt_no = mclas.item_class_mgnt_no
+        <if test="sSpplyId != null and sSpplyId != ''">
+            join brand_item_unit_info buinfo on item.brand_id = buinfo.brand_id and item.item_id = buinfo.item_id and buinfo.spply_id = #{sSpplyId}
+            and date_format(now(), '%Y%m%d') between  buinfo.cont_stt_dt and buinfo.cont_end_dt
+        </if>
         where item.brand_id = #{sBrandId}
         <if test="sItemStCd != null and sItemStCd != ''">
             and  item.item_st_cd = #{sItemStCd}

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

@@ -12,8 +12,8 @@
         select  brand_id, store_id, cont_stt_dt, cont_end_dt, min(sys_reg_dttm) as sys_reg_dttm, count(*) as item_cnt
         from    store_item_unit_info
         where   brand_id = #{sBrandId}
-        <if test="sStoreNm != null and sStoreNm != ''">
-            and     store_nm = concat('%',#{sStoreNm},'%')
+        <if test="sStoreId != null and sStoreId != ''">
+            and     store_id = #{sStoreId}
         </if>
         and     unit_target_cd = 'Y'
         group by brand_id, store_id, cont_stt_dt, cont_end_dt
@@ -45,18 +45,64 @@
         select  distinct brand_id, store_id, cont_stt_dt, cont_end_dt
         from    store_item_unit_info
         where   brand_id = #{sBrandId}
-        <if test="sStoreNm != null and sStoreNm != ''">
-            and     store_nm = concat('%',#{sStoreNm},'%')
+        <if test="sStoreId != null and sStoreId != ''">
+            and     store_id = #{sStoreId}
         </if>
         and     unit_target_cd = 'Y'
         ) iunit
     </select>
+<!--
+    <select id="selectSstoreItemUnitGridList" resultType="com.oqpo.api.entity.stinfo.StoreItemUnitEntity">
+        select  /* selectStoreItemUnitGridList */
+        iunit.brand_id, fn_brand_nm(iunit.brand_id) as brand_nm, iunit.store_id,  fn_store_nm(iunit.brand_id, iunit.store_id) as store_nm,
+        date_format(iunit.cont_stt_dt,'%Y.%m.%d') as cont_stt_dt, date_format(iunit.cont_end_dt,'%Y.%m.%d') as cont_end_dt,
+        date_format(iunit.sys_reg_dttm,'%Y.%m.%d') as sys_reg_dttm, iunit.item_cnt
+        from (
+        select  brand_id, store_id, cont_stt_dt, cont_end_dt, min(sys_reg_dttm) as sys_reg_dttm, count(*) as item_cnt
+        from    store_item_unit_info
+        where   brand_id = #{sBrandId}
+        and     store_id = #{sStoreId}
+        and     unit_target_cd = 'Y'
+        group by brand_id, store_id, cont_stt_dt, cont_end_dt
+        ) iunit
+        <choose>
+            <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
+                <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by store_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by store_nm desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by store_nm asc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
 
+    <select id="selectSstoreItemUnitGridCnt" resultType="int">
+        select /*selectStoreItemUnitGridCnt*/
+        count(*)
+        from (
+        select  distinct brand_id, store_id, cont_stt_dt, cont_end_dt
+        from    store_item_unit_info
+        where   brand_id = #{sBrandId}
+        and     store_id = #{sStoreId}
+        and     unit_target_cd = 'Y'
+        ) iunit
+    </select>
+-->
     <select id="selectStoreItemUnitInfo" resultType="com.oqpo.api.entity.stinfo.StoreItemUnitEntity">
         select /*selectStoreItemUnitInfo*/
+                        case when unit.store_unit_unq_no is null then 'C' else 'R' end view_cd,
                         unit.store_unit_unq_no, item.brand_id, item.item_id, item.item_nm,
-                        case when unit.cont_stt_dt is null or unit.cont_stt_dt = '' then #{contSttDt} else date_format(unit.cont_stt_dt,'%Y.%m.%d') end as cont_stt_dt,
-                        case when unit.cont_end_dt is null or unit.cont_end_dt = '' then #{contEndDt} else date_format(unit.cont_end_dt,'%Y.%m.%d') end as cont_end_dt,
+                        case when unit.cont_stt_dt is null or unit.cont_stt_dt = '' then date_format(#{contSttDt},'%Y.%m.%d') else date_format(unit.cont_stt_dt,'%Y.%m.%d') end as cont_stt_dt,
+                        case when unit.cont_end_dt is null or unit.cont_end_dt = '' then date_format(#{contEndDt},'%Y.%m.%d') else date_format(unit.cont_end_dt,'%Y.%m.%d') end as cont_end_dt,
                         case when unit.unit is null or  unit.unit = '' or store.loan_dvsn = 'LD03' then item.unit else unit.unit end as unit   ,
                         case when unit.unit is null or  unit.unit = '' or store.loan_dvsn = 'LD03' then fn_code_nm('DSTRBT_COST_UNIT',item.unit) else fn_code_nm('DSTRBT_COST_UNIT',unit.unit) end as unit_nm   ,
                         case when nvl(unit.stdd_qty,0) = 0 or store.loan_dvsn = 'LD03' then item.store_sale_stdd_qty else unit.stdd_qty end as stdd_qty  ,
@@ -66,6 +112,7 @@
                         case when unit.unit_target_cd is null or unit.unit_target_cd = '' or store.loan_dvsn = 'LD03' then 'Y' else unit.unit_target_cd end as unit_target_cd,
                         case when unit.unit_target_cd is null or unit.unit_target_cd = '' or store.loan_dvsn = 'LD03' then fn_code_nm('DSTRBT_COST_UNIT','Y') else  fn_code_nm('DSTRBT_COST_UNIT',unit.unit_target_cd)  end as unit_target_nm,
                         nvl(item.unit_amt,0) as spply_unit_amt
+                        ,item.brand_unit_unq_no
                 from   brand_item_unit_info item
                 left outer join store_item_unit_info unit on  item.brand_unit_unq_no = unit.brand_unit_unq_no and  item.brand_id = unit.brand_id and item.item_id = unit.item_id and unit.store_id = #{storeId}
                                   and unit.cont_stt_dt = #{contSttDt} and unit.cont_end_dt = #{contEndDt}
@@ -82,6 +129,16 @@
         and    cont_end_dt between #{contSttDt} and #{contEndDt}
     </select>
 
+    <select id="selectStoreItemUnitExistYn" resultType="String">
+        select /* selectStoreItemUnitContDateInfo */
+                case when count(*) > 0 then 'Y' else 'N' END
+        from   store_item_unit_info
+        where  brand_id = #{brandId}
+        and    store_id = #{storeId}
+        and    cont_stt_dt = #{contSttDt}
+        and    cont_end_dt = #{contEndDt}
+    </select>
+
     <update id="updateStoreItemUnitContEnd" >
         update /* updateStoreItemUnitContEnd */
                 store_item_unit_info

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

@@ -206,8 +206,8 @@
                 from brand_base_info
                 where bsns_reg_no = #{bsnsRegNo}
                 or affl_shop_id in (select affl_shop_id
-                from affl_shop_base_info
-                where bsns_reg_no = #{bsnsRegNo})
+                                    from affl_shop_base_info
+                                    where bsns_reg_no = #{bsnsRegNo})
                 union all
                 select brand_id
                 from store_base_info