반품처리 오류수정 및 문서 보완하여 올림

src/main/java/com/oqpo/api/enums/SystemMessageCode.java

@@ -27,6 +27,7 @@ public enum SystemMessageCode {
     BATCH_OK (90000, "배치 성공", HttpStatus.OK),
     REJECT_OK (20022, "반려 되었습니다.", HttpStatus.OK),
     RTN_REQ_OK (20023, "반품요청 되었습니다.", HttpStatus.OK),
+    CANCEL_OK (20024, "취소 되었습니다.", HttpStatus.OK),
     ERR_PW(40001, "현재의 비밀번호가 틀립니다. ", HttpStatus.BAD_REQUEST),
     ERR_FIND_ID(40002, "입력하신  정보로 등록된 아이디가 없습니다.", HttpStatus.BAD_REQUEST),
     ERR_FIND_PW(40003, "입력하신  정보로 등록된 아이디가 없습니다.", HttpStatus.BAD_REQUEST),

src/main/java/com/oqpo/api/web/controller/rtnmng/RtnOrdController.java

@@ -28,7 +28,7 @@ import javax.validation.Valid;
 @Slf4j
 @RestController
 @RequestMapping("/api/rtnmng/rtn")
-@Api(tags = {"반품발주 -"})
+@Api(tags = {"반품발주 - 개발완료"})
 public class RtnOrdController {
     @Autowired
     private RtnOdrService rtnOdrService;
@@ -160,7 +160,7 @@ public class RtnOrdController {
     @PostMapping("/cancel-rtnPo")
     public ResponseEntity<SaveResponse> cancelRtnOdr(@ApiIgnore String userId, @RequestBody @Valid CancelRtnOrdDtlRequest cancelRtnOrdDtlRequest) throws Exception {
         rtnOdrService.cancelRtnOrdDtl(userId,  cancelRtnOrdDtlRequest);
-        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.CANCEL_OK));
     }
 
 

src/main/java/com/oqpo/api/web/controller/rtnmng/RtnReqController.java

@@ -31,7 +31,7 @@ import javax.validation.Valid;
 @Slf4j
 @RestController
 @RequestMapping("/api/rtnmng")
-@Api(tags = {"반품요청 관리 (RtnReqController) -- 진행중"})
+@Api(tags = {"반품요청 관리 (RtnReqController) -- 개발완료"})
 public class RtnReqController {
     @Autowired
     private RtnReqService rtnReqService;

src/main/java/com/oqpo/api/web/dto/response/rtnmng/rtnOrd/RtnOdrInfoResponse.java

@@ -97,7 +97,6 @@ public class RtnOdrInfoResponse {
                                 .rtnReqQty(m.getRtnReqQty() == null ? 0 : m.getRtnReqQty())
                                 .rtnDvsn(m.getRtnDvsn() == null ? "" : m.getRtnDvsn())
                                 .rtnDvsnNm(m.getRtnDvsnNm() == null ? "" : m.getRtnDvsnNm())
-                                .rtnQty(m.getRtnQty() == null ? 0 : m.getRtnQty())
                                 .rtnAmt(m.getRtnAmt() == null ? 0 : m.getRtnAmt())
                                 .rtnRsnDvsn(m.getRtnRsnDvsn() == null ? "" : m.getRtnRsnDvsn())
                                 .rtnRsnDvsnNm(m.getRtnRsnDvsnNm() == null ? "" : m.getRtnRsnDvsnNm())
@@ -127,7 +126,6 @@ public class RtnOdrInfoResponse {
         @ApiModelProperty(value = "반품요청수량") private Integer rtnReqQty;
         @ApiModelProperty(value = "반품구분") private String rtnDvsn;
         @ApiModelProperty(value = "반품구분명") private String rtnDvsnNm;
-        @ApiModelProperty(value = "반품수량") private Integer rtnQty;
         @ApiModelProperty(value = "반품금액") private Long rtnAmt;
         @ApiModelProperty(value = "반품사유구분") private String rtnRsnDvsn;
         @ApiModelProperty(value = "반품사유구분명") private String rtnRsnDvsnNm;

src/main/java/com/oqpo/api/web/dto/response/rtnmng/rtnOrd/RtnOrdInitInfoResponse.java

@@ -84,6 +84,11 @@ public class RtnOrdInitInfoResponse {
                                 .rtnDvsn(m.getRtnDvsn() == null ? "" : m.getRtnDvsn())
                                 .rtnDvsnNm(m.getRtnDvsnNm() == null ? "" : m.getRtnDvsnNm())
                                 .unitGubun(m.getUnitGubun() == null ? "" : m.getUnitGubun())
+                                .rtnDvsn(m.getRtnDvsn() == null ? "" : m.getRtnDvsn())
+                                .rtnDvsnNm(m.getRtnDvsnNm() == null ? "" : m.getRtnDvsnNm())
+                                .rtnRsnDvsn(m.getRtnRsnDvsn() == null ? "" : m.getRtnRsnDvsn())
+                                .rtnRsnDvsnNm(m.getRtnRsnDvsnNm() == null ? "" : m.getRtnRsnDvsnNm())
+                                .rtnRsn(m.getRtnRsn() == null ? "" : m.getRtnRsn())
                                 .build())
                         .collect(Collectors.toList()))
                 .build();
@@ -122,17 +127,27 @@ public class RtnOrdInitInfoResponse {
         @ApiModelProperty(value = "반품발주금액")
         private Long rtnAmt;
 
+        @ApiModelProperty(value = "반품구분")
+        private String rtnDvsn;
+
+        @ApiModelProperty(value = "반품구분명")
+        private String rtnDvsnNm;
+
+        @ApiModelProperty(value = "반품사유구분")
+        private String rtnRsnDvsn;
+
+        @ApiModelProperty(value = "반품사유구분명")
+        private String rtnRsnDvsnNm;
+
+        @ApiModelProperty(value = "반품사유명")
+        private String rtnRsn;
+
         @ApiModelProperty(value = "브랜드단가고유번호")
         private String brandUnitUnqNo;
 
         @ApiModelProperty(value = "매장단가고유번호")
         private String storeUnitUnqNo;
 
-        @ApiModelProperty(value = "반품사유구분") private String rtnRsnDvsn;
-        @ApiModelProperty(value = "반품사유구분명") private String rtnRsnDvsnNm;
-        @ApiModelProperty(value = "반품사유내용") private String rtnRsn;
-        @ApiModelProperty(value = "반품구분") private String rtnDvsn;
-        @ApiModelProperty(value = "반품구분명") private String rtnDvsnNm;
         @ApiModelProperty(value = "단가구분") private String unitGubun;
 
     }

src/main/resources/mybatis/sqlmaps/rtnmng/RtnOrd.xml

@@ -242,7 +242,7 @@
     <select id="selectROdrDtlList" resultType="com.oqpo.api.entity.rtnmng.RtnOdrDtlPtclEntity">
                select rtn_podr_unq_no, rtn_podr_dtl_no, rtn_req_unq_no, rtn_req_dtl_no
                      , item_id, item_nm, unit, unit_amt, date_format(col_req_dt, '%Y.%m.%d') as col_req_dt
-                     , rtn_req_qty, rtn_dvsn, fn_code_nm('RTN_DVSN',rtn_dvsn) as rtn_dvsn_nm,   rtn_qty, rtn_amt
+                     , rtn_req_qty, rtn_dvsn, fn_code_nm('RTN_DVSN',rtn_dvsn) as rtn_dvsn_nm,   rtn_amt
                       , rtn_rsn_dvsn, fn_code_nm('RTN_RSN_DVSN',rtn_rsn_dvsn) as rtn_rsn_dvsn_nm
                      , rtn_rsn, rtn_odr_qty, rtn_odr_amt, rodr_dtl_st_cd, fn_code_nm('RODR_DTL_ST_CD',rodr_dtl_st_cd) as rodr_dtl_st_nm
                 from rtn_odr_dtl_ptcl
@@ -344,7 +344,6 @@
     <select id="selectSpplyRtnOdrGridCnt" resultType="int">
         select count(*)
         from   rtn_odr_base_info base
-        from   rtn_odr_base_info base
         where  1=1
         and    base.brand_id = #{sBrandId}
         and    base.spply_id = #{sSpplyId}