브랜드 및 발주저장 부분 오류수정

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

@@ -1,39 +1,27 @@
 package com.oqpo.api.service.pomng;
 
 
-import com.oqpo.api.entity.loanmng.LoanMgntBaseInfoEntity;
 import com.oqpo.api.entity.oper.UserMngEntity;
 import com.oqpo.api.entity.pomng.PchOdrBaseInfoEntity;
 import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
-import com.oqpo.api.entity.pomng.PchReqBaseInfoEntity;
-import com.oqpo.api.entity.pomng.PchReqDtlPtclEntity;
 import com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity;
 import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.exception.GlobalException;
-import com.oqpo.api.mapper.loanmng.LoanStateMapper;
 import com.oqpo.api.mapper.oper.UserMngMapper;
 import com.oqpo.api.mapper.pomng.PchOrdMapper;
-import com.oqpo.api.mapper.pomng.PchReqMapper;
 import com.oqpo.api.mapper.stockmng.StockMngMapper;
 import com.oqpo.api.service.CommonService;
-import com.oqpo.api.util.DateUtil;
-import com.oqpo.api.web.dto.request.GridRequest;
 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.pomng.pchReq.SavePchReqlRequest;
-import com.oqpo.api.web.dto.response.GridResponse;
 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.pchReq.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 @Slf4j

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

@@ -3,20 +3,12 @@ package com.oqpo.api.web.controller.pomng;
 import com.oqpo.api.enums.DataMessageCode;
 import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.service.pomng.PchOrdService;
-import com.oqpo.api.service.pomng.PchReqService;
 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.pomng.pchReq.PchReqPoTargetSearchGridRequest;
-import com.oqpo.api.web.dto.request.pomng.pchReq.PchReqSearchGridRequest;
-import com.oqpo.api.web.dto.request.pomng.pchReq.SavePchReqlRequest;
 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.PchOrdInitInfoResponse;
 import com.oqpo.api.web.dto.response.pomng.pchOrd.PoOrdInitInfoResponse;
-import com.oqpo.api.web.dto.response.pomng.pchReq.PchReqInfoResponse;
-import com.oqpo.api.web.dto.response.pomng.pchReq.PchReqInitInfoResponse;
-import com.oqpo.api.web.dto.response.pomng.pchReq.PchReqRejectTargetResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

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

@@ -1,7 +1,6 @@
 package com.oqpo.api.web.dto.request.pomng.pchOrd;
 
 import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
-import com.oqpo.api.entity.pomng.PchReqDtlPtclEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
@@ -41,10 +40,10 @@ public class SavePchOrdRequest {
 
 
     @ApiModelProperty(value = "등록 품목리스트")
-    private List<SavePchOrdRequest.SaveItemList> gridInsertData;
+    private List<SavePoItemList> gridInsertData;
 
 
-    public List<PchOdrDtlPtclEntity> toCodeEntities(List<SavePchOrdRequest.SaveItemList> gridData) {
+    public List<PchOdrDtlPtclEntity> toCodeEntities(List<SavePoItemList> gridData) {
         List<PchOdrDtlPtclEntity> entities = new ArrayList<>();
         if (gridData == null || gridData.size() == 0)
             return entities;
@@ -56,6 +55,7 @@ public class SavePchOrdRequest {
             entity.setItemId(x.getItemId());
             entity.setPodrQty(x.getPodrQty());
             entity.setBrandUnitUnqNo(x.getBrandUnitUnqNo());
+            entity.setStoreUnitUnqNo(x.getStoreUnitUnqNo());
             entities.add(entity);
         });
         return entities;
@@ -64,7 +64,7 @@ public class SavePchOrdRequest {
     @Getter
     @Builder
     @AllArgsConstructor(access = AccessLevel.PROTECTED)
-    static class SaveItemList {
+    static class SavePoItemList {
 
         @ApiModelProperty(value = "구매요청고유번호") private String pchReqUnqNo;
         @ApiModelProperty(value = "구매요청상세번호") private String pchReqDtlNo;

src/main/java/com/oqpo/api/web/dto/response/stinfo/brand/BrandInfoResponse.java

@@ -134,7 +134,7 @@ public class BrandInfoResponse {
                 .emalAddr(entity.getEmalAddr() == null ? "" :entity.getEmalAddr())
                 .bnkCd(entity.getBnkCd() == null ? "" :entity.getBnkCd())
                 .bnkCdNm(entity.getBrandNm() == null ? "" :entity.getBrandNm())
-                .acctNo(entity.getBrandNm() == null ? "" :entity.getBrandNm())
+                .acctNo(entity.getAcctNo() == null ? "" :entity.getAcctNo())
                 .owacNm(entity.getOwacNm() == null ? "" :entity.getOwacNm())
                 .ownerNm(entity.getOwnerNm() == null ? "" :entity.getOwnerNm())
                 .afflShopId(entity.getAfflShopId() == null ? "" :entity.getAfflShopId())