반품처리 - 수거요청일 항목 추가

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

@@ -774,6 +774,7 @@ public class ColOdrService extends CommonService {
                         .rtnWhsId(m.getRtnWhsId() == null ? "" : m.getRtnWhsId())
                         .rtnLocation(m.getRtnLocation() == null ? "" : m.getRtnLocation())
                         .rtnWhsNm(m.getRtnWhsNm() == null ? "" : m.getRtnWhsNm())
+                        .colSchDt(m.getColReqDt() == null ? "" : m.getColReqDt())
                         .colSchDt(m.getColSchDt() == null ? "" : m.getColSchDt())
                         .pickMgrNm(m.getPickMgrNm() == null ? "" : m.getPickMgrNm())
                         .pickMgrTelNo(m.getPickMgrTelNo() == null ? "" : m.getPickMgrTelNo())

src/main/java/com/oqpo/api/web/dto/response/inoutmng/RtnStockTargetResponse.java

@@ -33,6 +33,7 @@ public class RtnStockTargetResponse {
     @ApiModelProperty(value = "수거창고") private String rtnWhsId;
     @ApiModelProperty(value = "수거LOCATION") private String rtnLocation;
     @ApiModelProperty(value = "수거창고명") private String rtnWhsNm;
+    @ApiModelProperty(value = "수거요청일") private String colReqDt;
     @ApiModelProperty(value = "수거예정일") private String colSchDt;
     @ApiModelProperty(value = "수거담당자명") private String pickMgrNm;
     @ApiModelProperty(value = "수거담당자연락처") private String pickMgrTelNo;

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

@@ -559,7 +559,7 @@
                , base.whs_id, base.location
                , 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
                , mgnt.spply_id, fn_spply_nm(mgnt.spply_id) as spply_nm
-                , dtl.unit_amt as 'pickDtlInfo.unit_amt'
+                , dtl.unit_amt as 'pickDtlInfo.unit_amt', date_format(mgnt.col_req_dt,'%Y.%m.%d') as col_req_dt
         from   pick_info_mgnt mgnt
               ,pick_dtl_ptcl dtl
               ,rtn_odr_dtl_ptcl ptcl