구매요청건 반려 목록 출력 및 품목분류 삭제건 수정조치

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

@@ -39,4 +39,5 @@ public interface PchReqMapper {
     List<PchReqBaseInfoEntity> selectPchReqPoTargetGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId , @Param("sWhsId") String sWhsId , @Param("sItemNm") String sItemNm ,  GridRequest gridRequest)throws Exception;
     int selectPchReqPoTargetGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId , @Param("sWhsId") String sWhsId , @Param("sItemNm") String sItemNm )throws Exception;
 
+    List<PchReqDtlPtclEntity> selectPchRejectPrTargetList(@Param("pchReqUnqNo") String pchReqUnqNo) ;
 }

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

@@ -33,7 +33,7 @@ public interface ItemMapper {
 
     int insertItemClassMngInfo(@Param("userId") String userId, ItemClassMngEntity entity) throws Exception;
     int updateItemClassMngInfo(@Param("userId") String userId, ItemClassMngEntity entity) throws Exception;
-    int deleteItemClassMngInfo(@Param("userId") String userId, List<ItemClassMngEntity> gridDeleteData) throws Exception;
+    int deleteItemClassMngInfo(@Param("userId") String userId, @Param("itemClassMgntNo") String itemClassMgntNo ) throws Exception;
 
 
     List<ItemClassMngEntity> selectItemClassMngGridList(@Param("sBrandId") String sBrandId, @Param("sItemClass1") String sItemClass1, @Param("sItemClass2") String sItemClass2,  @Param("sItemClass3") String sItemClass3, @Param("sItemClass4") String sItemClass4,@Param("sItemClassNm") String sItemClassNm, GridRequest gridRequest)throws Exception;

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

@@ -2,11 +2,10 @@ package com.oqpo.api.service.pomng;
 
 
 import com.oqpo.api.entity.loanmng.LoanMgntBaseInfoEntity;
-import com.oqpo.api.entity.oper.AfflSaleInfoEntity;
 import com.oqpo.api.entity.oper.UserMngEntity;
 import com.oqpo.api.entity.pomng.PchReqBaseInfoEntity;
 import com.oqpo.api.entity.pomng.PchReqDtlPtclEntity;
-import com.oqpo.api.entity.stinfo.BrandEntity;
+import com.oqpo.api.entity.stinfo.ItemClassMngEntity;
 import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.exception.GlobalException;
 import com.oqpo.api.mapper.loanmng.LoanStateMapper;
@@ -15,14 +14,10 @@ import com.oqpo.api.mapper.pomng.PchReqMapper;
 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.pchReq.PchReqRejecctTargetInfoRequest;
 import com.oqpo.api.web.dto.request.pomng.pchReq.SavePchReqlRequest;
-import com.oqpo.api.web.dto.request.stinfo.brand.SaveBrandInfolRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
-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.PchReqPoTargetSearchListResponse;
-import com.oqpo.api.web.dto.response.pomng.pchReq.PchReqSearchListResponse;
-import com.oqpo.api.web.dto.response.stinfo.brand.BrandInfoResponse;
+import com.oqpo.api.web.dto.response.pomng.pchReq.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -250,4 +245,8 @@ public class PchReqService extends CommonService {
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
+
+    public PchReqRejectTargetResponse selectPchRejectPrTargetList(String pchReqUnqNo) throws Exception {
+        return PchReqRejectTargetResponse.toDTO(pchReqMapper.selectPchRejectPrTargetList(pchReqUnqNo));
+    }
 }

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

@@ -316,13 +316,9 @@ public class ItemService extends CommonService {
 
     /* 품목분류 삭제 */
     @Transactional
-    public void delItemClassMngInfo(String userId, DelItemInfolRequest delItemInfolRequest) throws Exception {
+    public void delItemClassMngInfo(String userId, String itemClassMgntNo) throws Exception {
         try {
-            List<ItemClassMngEntity> gridDeleteData = delItemInfolRequest.toCodeEntities(delItemInfolRequest.getGridDeleteData());
-            if (gridDeleteData.size() > 0) {
-                   itemMapper.deleteItemClassMngInfo(userId, gridDeleteData);
-            }
-
+                itemMapper.deleteItemClassMngInfo(userId, itemClassMgntNo);
         } catch (GlobalException e) {
             e.getStackTrace();
             throw new GlobalException(e.getSystemMessageCode());

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

@@ -1,21 +1,18 @@
 package com.oqpo.api.web.controller.pomng;
 
-import com.oqpo.api.enums.DataMessageCode;
 import com.oqpo.api.enums.SystemMessageCode;
-import com.oqpo.api.service.oper.AfflService;
+import com.oqpo.api.exception.GlobalException;
 import com.oqpo.api.service.pomng.PchReqService;
-import com.oqpo.api.web.dto.request.oper.affl.AfflGridRequest;
-import com.oqpo.api.web.dto.request.oper.affl.AfflShopBaseInfoGridRequest;
-import com.oqpo.api.web.dto.request.oper.affl.SaveAfflRequest;
 import com.oqpo.api.web.dto.request.pomng.pchReq.PchReqPoTargetSearchGridRequest;
+import com.oqpo.api.web.dto.request.pomng.pchReq.PchReqRejecctTargetInfoRequest;
 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.request.stinfo.item.DelItemInfolRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
 import com.oqpo.api.web.dto.response.SaveResponse;
-import com.oqpo.api.web.dto.response.oper.affl.AfflShopInfoResponse;
 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;
@@ -125,4 +122,27 @@ public class PchReqController {
         return ResponseEntity.ok(pchReqService.selectPchReqPoTargetGridList(pchReqPoTargetSearchGridRequest.getSBrandId(), pchReqPoTargetSearchGridRequest.getFromDt(), pchReqPoTargetSearchGridRequest.getToDt(), pchReqPoTargetSearchGridRequest.getSSpplyId(), pchReqPoTargetSearchGridRequest.getSWhsId(), pchReqPoTargetSearchGridRequest.getSItemNm(),  pchReqPoTargetSearchGridRequest.toDTO(pchReqPoTargetSearchGridRequest)));
     }
 
+
+    /**
+     * 설명 : 구매요청 반련 대상 리스트
+     *
+     * @param pchReqRejectTargerListRequest
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
+            @ApiImplicitParam(name = "pchReqUnqNo", value = "구매요청번호", required = true, dataType = "String", paramType = "query")
+    })
+    @ApiOperation(value = "구매요청 반련 대상 리스트")
+    @GetMapping("/reject-pchreq-target")
+    public ResponseEntity<PchReqRejectTargetResponse> rejectTargetPchReq(@RequestParam(value = "pchReqUnqNo") String pchReqUnqNo) throws Exception {
+
+            return ResponseEntity.ok(pchReqService.selectPchRejectPrTargetList(pchReqUnqNo));
+    }
+
+
+
+
+
 }

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

@@ -172,12 +172,13 @@ public class ItemController {
      * @throws Exception
      */
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
+            @ApiImplicitParam(name = "itemClassMgntNo", value = "품목분류번호", required = true, dataType = "String", paramType = "query")
     })
     @ApiOperation(value = "품목분류 삭제")
-    @PostMapping("/del-itemClassMng")
-    public ResponseEntity<SaveResponse> saveItemClassMng(@ApiIgnore String userId, @RequestBody @Valid DelItemInfolRequest delItemInfolRequest) throws Exception {
-        itemService.delItemClassMngInfo(userId, delItemInfolRequest);
+    @GetMapping("/del-itemClassMng")
+    public ResponseEntity<SaveResponse> saveItemClassMng(@ApiIgnore String userId, @RequestParam(value = "itemClassMgntNo") String itemClassMgntNo) throws Exception {
+        itemService.delItemClassMngInfo(userId, itemClassMgntNo);
         return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
     }
 

src/main/java/com/oqpo/api/web/dto/request/pomng/pchReq/PchReqRejecctTargetInfoRequest.java

@@ -0,0 +1,50 @@
+package com.oqpo.api.web.dto.request.pomng.pchReq;
+
+import com.oqpo.api.entity.pomng.PchReqBaseInfoEntity;
+import com.oqpo.api.entity.stinfo.ItemClassMngEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+public class PchReqRejecctTargetInfoRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+
+    @ApiModelProperty(value = "반려대상 구매요청리스트")
+    private List<PchReqRejecctTargetInfoRequest.PchReqRejTagInfo> gridUpdateData;
+
+    @ApiModelProperty(value = "반려대상ddddd 구매요청리스트")
+    private List<PchReqRejecctTargetInfoRequest.PchReqRejTagInfo> gridInsertData;
+
+    @ApiModelProperty(value = "반려대상ddddd 구매요청리스트")
+    private List<PchReqRejecctTargetInfoRequest.PchReqRejTagInfo> gridDeleteData;
+
+    public List<PchReqBaseInfoEntity> toCodeEntities(List< PchReqRejecctTargetInfoRequest.PchReqRejTagInfo > gridData) {
+        List<PchReqBaseInfoEntity> entities = new ArrayList<>();
+        if (gridData == null || gridData.size() == 0)
+            return entities;
+
+        gridData.forEach(x -> {
+            PchReqBaseInfoEntity entity = new PchReqBaseInfoEntity();
+            entity.setPchReqUnqNo(x.getPchReqUnqNo());
+            entities.add(entity);
+        });
+        return entities;
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class PchReqRejTagInfo {
+        @NotBlank
+        @ApiModelProperty(value = "구매요청번호")
+        private String pchReqUnqNo;
+    }
+}

src/main/java/com/oqpo/api/web/dto/response/pomng/pchReq/PchReqRejectTargetResponse.java

@@ -0,0 +1,84 @@
+package com.oqpo.api.web.dto.response.pomng.pchReq;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.pomng.PchReqDtlPtclEntity;
+import com.oqpo.api.entity.stinfo.StoreItemUnitEntity;
+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 PchReqRejectTargetResponse {
+
+    @ApiModelProperty(value = "그리드 페이지")
+    private Integer gridPage;
+
+    @ApiModelProperty(value = "그리드 전체 페이지 수")
+    private Integer gridTotal;
+
+    @ApiModelProperty(value = "그리드 전체 목록 수")
+    private Integer gridRecords;
+
+    @ApiModelProperty(value = "그리드 리스트")
+    private List<PchReqInfo> gridRows;
+
+
+    public static PchReqRejectTargetResponse toDTO(List<PchReqDtlPtclEntity> entities) {
+        if (entities == null) return null;
+
+        return PchReqRejectTargetResponse.builder()
+                .gridPage(0)
+                .gridRecords(entities.size())
+                .gridTotal(0)
+                .gridRows(entities.stream()
+                        .map(m -> PchReqInfo.builder()
+                                .pchReqUnqNo(m.getPchReqUnqNo())
+                                .pchReqDtlNo(m.getPchReqDtlNo())
+                                .itemId(m.getItemId())
+                                .itemNm(m.getItemNm())
+                                .pchReqQty(m.getPchReqQty())
+                                .pchReqAmt(m.getPchReqAmt())
+                                .build())
+                        .collect(Collectors.toList()))
+                .build();
+    }
+
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class PchReqInfo {
+
+        @ApiModelProperty(value = "구매요청번호")
+        private String pchReqUnqNo;
+
+        @ApiModelProperty(value = "구매요청상세항번")
+        private String pchReqDtlNo;
+
+        @ApiModelProperty(value = "품목아이디")
+        private String itemId;
+
+        @ApiModelProperty(value = "품목명")
+        private String itemNm;
+
+        @ApiModelProperty(value = "구매요청수량")
+        private Integer pchReqQty;
+
+        @ApiModelProperty(value = "구매요청금액")
+        private Integer pchReqAmt;
+
+    }
+
+
+
+
+
+
+}

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

@@ -258,4 +258,18 @@
             and (ptcl.item_id like concat('%', #{sItemNm}, '%') or ptcl.item_nm like concat('%', #{sItemNm}, '%'))
         </if>
     </select>
+
+    <select id="selectPchRejectPrTargetList" resultType="com.oqpo.api.entity.pomng.PchReqDtlPtclEntity">
+        select  /* PchReq.selectPchRejectPrTargetList */
+              base.pch_req_unq_no, ptcl.pch_req_dtl_no
+            , ptcl.item_id, ptcl.item_nm
+            , ptcl.pch_req_qty, ptcl.pch_req_amt
+        from pch_req_base_info base
+            , pch_req_dtl_ptcl ptcl
+        where 1 = 1
+        and base.pch_req_unq_no = ptcl.pch_req_unq_no
+        and base.pch_req_st_cd = 'PR20'
+        and base.pch_req_unq_no  = #{pchReqUnqNo}
+    </select>
+
 </mapper>

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

@@ -336,10 +336,7 @@
             , sys_chg_id         =  #{userId}
             , del_yn             =  'Y'
         where 1=1
-        and   item_class_mgnt_no in
-        <foreach collection="gridDeleteData" item="item" separator="," open="(" close=")">
-            #{item.itemClassMgntNo}
-        </foreach>
+        and   item_class_mgnt_no  = #{itemClassMgntNo}
     </update>