구매발주현호아 배송구분 및 납품처 창고 _로케이션

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

@@ -455,6 +455,8 @@ public class PchOrdService extends CommonService {
                         .pchOdrStCd(m.getPchOdrStCd() == null ? "" : m.getPchOdrStCd())
                         .pchOdrStNm(m.getPchOdrStNm() == null ? "" : m.getPchOdrStNm())
                         .podrDt(m.getPodrDt() == null ? "" : m.getPodrDt())
+                        .dlvDvsn(m.getDlvDvsn() == null ? "" : m.getDlvDvsn())
+                        .dlvDvsnNm(m.getDlvDvsnNm() == null ? "" : m.getDlvDvsnNm())
                         .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm() + '-' + m.getLocationNm())
                         .locationNm(m.getLocationNm() == null ? "" :  m.getLocationNm())
                         .spplyId(m.getSpplyId() == null ? "" : m.getSpplyId())

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

@@ -63,7 +63,7 @@ public class PchOdrInfoResponse {
                 .podrDt(entity.getPodrDt() == null ? "" : entity.getPodrDt())
                 .whsId(entity.getWhsId() == null ? "" : entity.getWhsId())
                 .location(entity.getLocation() == null ? "" : entity.getLocation())
-                .whsNm(entity.getWhsNm() == null ? "" : entity.getWhsNm() + entity.getLocationNm())
+                .whsNm(entity.getWhsNm() == null ? "" : entity.getWhsNm() + " - " + entity.getLocationNm())
                 .shmtWhsId(entity.getShmtWhsId() == null ? "" : entity.getShmtWhsId())
                 .shmtLocation(entity.getShmtLocation() == null ? "" : entity.getShmtLocation())
                 .shmtWhsNm(entity.getShmtWhsNm() == null ? "" : entity.getShmtWhsNm() + "-" + entity.getShmtLocationNm())

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

@@ -20,6 +20,8 @@ public class PchOdrSearchListResponse {
     @ApiModelProperty(value = "구매발주상태코드") private String pchOdrStCd;
     @ApiModelProperty(value = "구매발주상태명") private String pchOdrStNm;
     @ApiModelProperty(value = "발주일자") private String podrDt;
+    @ApiModelProperty(value = "배송구분") private String dlvDvsn;
+    @ApiModelProperty(value = "배송구분명") private String dlvDvsnNm;
     @ApiModelProperty(value = "납품창고명") private String whsNm;
     @ApiModelProperty(value = "납품LOCATION명") private String locationNm;
     @ApiModelProperty(value = "공급사아이디") private String spplyId;

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

@@ -116,6 +116,7 @@
             , base.podr_total_amt, base.podr_item_qty, base.podr_mgr_nm
             , fn_whs_nm(base.brand_id, base.shmt_whs_id) as shmt_whs_nm
             , fn_whs_location_nm(base.brand_id, base.shmt_whs_id, base.shmt_location) as shmt_location_nm
+            , base.dlv_dvsn , fn_code_nm('dlv_dvsn', dlv_dvsn) AS dlv_dvsn_nm
         from pch_odr_base_info base
         where 1 = 1
         and base.brand_id = #{sBrandId}