메인 화면설계문서 및 발주관련 수정

src/main/java/com/oqpo/api/web/dto/request/stockmng/StockMngPassQtyGridRequest.java

@@ -46,10 +46,10 @@ public class StockMngPassQtyGridRequest {
 
     @Getter
     @Builder
+    @NoArgsConstructor
     @AllArgsConstructor(access = AccessLevel.PROTECTED)
     static class PassQtyItemList {
 
-        @NotBlank
         @ApiModelProperty(value = "품목아이디")
         private String itemId;
 

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

@@ -29,16 +29,24 @@ public class PchOdrInfoResponse {
     @ApiModelProperty(value = "공급사아이디") private String spplyId;
     @ApiModelProperty(value = "공급사명") private String spplyNm;
     @ApiModelProperty(value = "발주일자") private String podrDt;
-    @ApiModelProperty(value = "납품창고") private String whsDvsnNm;
-    @ApiModelProperty(value = "출고창고") private String shmtWhsDvsnNm;
+    @ApiModelProperty(value = "납품창고") private String whsNm;
+    @ApiModelProperty(value = "납품창고코드") private String whsId;
+    @ApiModelProperty(value = "납품창고Location") private String location;
+    @ApiModelProperty(value = "출고창고") private String shmtWhsNm;
+    @ApiModelProperty(value = "출고창고코드") private String shmtWhsId;
+    @ApiModelProperty(value = "출고창고코드") private String shmtLocation;
     @ApiModelProperty(value = "발주합계금액") private Long podrTotalAmt;
+    @ApiModelProperty(value = "창고구분") private String whsDvsn;
+    @ApiModelProperty(value = "창고구분명") private String whsDvsnNm;
     @ApiModelProperty(value = "발주품목수량") private Integer podrItemQty;
     @ApiModelProperty(value = "발주담당자명") private String podrMgrNm;
     @ApiModelProperty(value = "발주담당자전화번호") private String podrMgrTelNo;
     @ApiModelProperty(value = "배송구분명") private String dlvDvsnNm;
+    @ApiModelProperty(value = "배송구분명") private String dlvDvsn;
     @ApiModelProperty(value = "납품요청일") private String dlvReqDt;
     @ApiModelProperty(value = "매장아이디") private String storeId;
 
+
     @ApiModelProperty(value = "구매발주 품목 정보")
     private List<PchOdrInfoResponse.PchOrdPoDtlInfo> pchOdrDtlList;
 
@@ -53,13 +61,20 @@ public class PchOdrInfoResponse {
                 .spplyId(entity.getSpplyId() == null ? "" : entity.getSpplyId())
                 .spplyNm(entity.getSpplyNm() == null ? "" : entity.getSpplyNm())
                 .podrDt(entity.getPodrDt() == null ? "" : entity.getPodrDt())
-                .whsDvsnNm(entity.getWhsDvsnNm() == null ? "" : entity.getWhsDvsnNm() + "-" + entity.getLocationNm())
-                .shmtWhsDvsnNm(entity.getShmtWhsNm() == null ? "" : entity.getShmtWhsNm() + "-" + entity.getShmtLocationNm())
+                .whsId(entity.getWhsId() == null ? "" : entity.getWhsId())
+                .location(entity.getLocation() == null ? "" : entity.getLocation())
+                .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())
+                .whsDvsn(entity.getWhsDvsn() == null ? "" : entity.getWhsDvsn())
+                .whsDvsnNm(entity.getWhsDvsnNm() == null? "" : entity.getWhsDvsnNm())
                 .podrTotalAmt(entity.getPodrTotalAmt() == null ? 0 : entity.getPodrTotalAmt())
                 .podrItemQty(entity.getPodrItemQty() == null ? 0 : entity.getPodrItemQty())
                 .podrMgrNm(entity.getPodrMgrNm() == null ? "" : entity.getPodrMgrNm())
                 .podrMgrTelNo(entity.getPodrMgrTelNo() == null ? "" : entity.getPodrMgrTelNo())
                 .dlvDvsnNm(entity.getDlvDvsnNm() == null ? "" : entity.getDlvDvsnNm())
+                .dlvDvsn(entity.getDlvDvsn() == null ? "" : entity.getDlvDvsn())
                 .dlvReqDt(entity.getDlvReqDt() == null ? "" : entity.getDlvReqDt())
                 .storeId(entity.getStoreId() == null ? "" : entity.getStoreId())
                 .pchOdrDtlList(dtlEntityList.stream()

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

@@ -211,6 +211,8 @@
             , base.pch_odr_st_cd, fn_code_nm(upper('pch_odr_st_cd'), base.pch_odr_st_cd) as pch_odr_st_nm
             , base.spply_id, fn_spply_nm(base.spply_id) as spply_nm, date_format(base.podr_dt, '%Y.%m.%d') as podr_dt
             , fn_whs_nm(base.brand_id, base.whs_id) as whs_nm
+            , base.whs_id, base.location, base.shmt_whs_id, base.shmt_location, base.dlv_dvsn, base.whs_dvsn
+            , fn_code_nm(upper('WHS_DVSN'), base.whs_dvsn) as whs_dvns_nm
             , fn_whs_location_nm(base.brand_id, base.whs_id, base.location) as location_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

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

@@ -223,9 +223,10 @@
     </update>
 
     <select id="selectStoreLoanMgntUnqNo" resultType="String">
-        select loan_mgnt_unq_no
-         from store_base_info
+         select loan_mgnt_unq_no
+         from loan_mgnt_base_info
          where store_id = #{storeId}
+         and   use_yn = 'Y'
     </select>
 
 </mapper>