납품서 창고구분 추가

src/main/java/com/oqpo/api/entity/inoutmng/DeliInfoMgntEntity.java

@@ -48,7 +48,7 @@ public class DeliInfoMgntEntity implements Serializable {
     private String whsAddr;
     private String whsMgrTelNo;
     private String shmtWhsId;
-    private String shmtLocation;
+    private String shmtLocation; 
 
 
     private String dlvBsnsRegno;

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

@@ -822,6 +822,8 @@ public class ShmtOdrService extends CommonService {
                         .unitAmt(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt())
                         .dlvMgrNm(m.getDlvMgrNm() == null ? "" : m.getDlvMgrNm())
                         .dlvMgrTelNo(m.getDlvMgrTelNo() == null ? "" : m.getDlvMgrTelNo())
+                        .whsDvsn(m.getWhsDvsn() == null ? "" : m.getWhsDvsn())
+                        .whsDvsnNm(m.getWhsDvsnNm() == null ? "" : m.getWhsDvsnNm())
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);

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

@@ -40,5 +40,7 @@ public class DeliDtlSearchListResponse {
     @ApiModelProperty(value = "납품금액") private Long dlvAmt;
     @ApiModelProperty(value = "납품담당자명") private String dlvMgrNm;
     @ApiModelProperty(value = "납품담당자연락처") private String dlvMgrTelNo;
+    @ApiModelProperty(value = "창고구분") private String whsDvsn;
+    @ApiModelProperty(value = "창고구분명") private String whsDvsnNm;
 
 }

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

@@ -363,14 +363,20 @@
             , info.spply_id, info.spply_nm, info.dlv_st_cd, fn_code_nm(upper('dlv_st_cd'), info.dlv_st_cd) as dlv_st_nm
             , info.whs_id, info.location, fn_whs_nm(info.brand_id, info.whs_id) as whs_nm
             , fn_whs_location_nm(info.brand_id, info.whs_id, info.location) as location_nm
-            , date_format(info.podr_reg_dt, '%Y.%m.%d') as podr_reg_dt, date_format(info.dlv_req_dt, '%Y.%m.%d') as dlv_req_dt
-            , date_format(info.dlv_reg_dt, '%Y.%m.%d') as dlv_req_dt, date_format(info.dlv_sch_dt, '%y.%m.%d') as dlv_sch_dt
+            , date_format(info.podr_reg_dt, '%Y.%m.%d') as podr_reg_dt
+            , date_format(info.dlv_req_dt, '%Y.%m.%d') as dlv_req_dt
+            , date_format(info.dlv_reg_dt, '%Y.%m.%d') as dlv_reg_dt
+            , date_format(info.dlv_sch_dt, '%y.%m.%d') as dlv_sch_dt
             , date_format(info.dlv_cmplt_dt, '%Y.%m.%d') as dlv_cmplt_dt
             , ptcl.item_id as 'deliDtlMgntInfo.item_id', ptcl.item_nm as 'deliDtlMgntInfo.item_nm'
             , ptcl.podr_qty as 'deliDtlMgntInfo.podr_qty', ptcl.dlv_qty as 'deliDtlMgntInfo.dlv_qty'
             , ptcl.unit as 'deliDtlMgntInfo.unit', ptcl.unit_amt as 'deliDtlMgntInfo.unit_amt'
-            , ptcl.pch_podr_unq_no as 'deliDtlMgntInfo.pch_podr_unq_no' , ptcl.pch_podr_dtl_no as 'deliDtlMgntInfo.pch_podr_dtl_no'
-            , info.dlv_mgr_nm , info.dlv_mgr_mbl_no
+            , ptcl.pch_podr_unq_no as 'deliDtlMgntInfo.pch_podr_unq_no' 
+            , ptcl.pch_podr_dtl_no as 'deliDtlMgntInfo.pch_podr_dtl_no'
+            , info.dlv_mgr_nm 
+            , IFNULL(info.dlv_mgr_mbl_no, info.DLV_MGR_TEL_NO) AS dlv_mgr_tel_no 
+            , info.whs_dvsn /* 창고구분 */
+            , fn_code_nm(upper('whs_dvsn'), info.whs_dvsn) as whs_dvsn_nm /* 창고구분 명 */
         from deli_info_mgnt info
              , deli_dtl_ptcl ptcl
         where 1 = 1
@@ -458,8 +464,10 @@
         , info.spply_id, info.spply_nm, info.dlv_st_cd, fn_code_nm(upper('dlv_st_cd'), info.dlv_st_cd) as dlv_st_nm
         , info.whs_id, info.location, fn_whs_nm(info.brand_id, info.whs_id) as whs_nm
         , fn_whs_location_nm(info.brand_id, info.whs_id, info.location) as location_nm
-        , date_format(info.podr_reg_dt, '%Y.%m.%d') as podr_reg_dt, date_format(info.dlv_req_dt, '%Y.%m.%d') as dlv_req_dt
-        , date_format(info.dlv_reg_dt, '%Y.%m.%d') as dlv_req_dt, date_format(info.dlv_sch_dt, '%Y.%m.%d') as dlv_sch_dt
+        , date_format(info.podr_reg_dt, '%Y.%m.%d') as podr_reg_dt
+        , date_format(info.dlv_req_dt, '%Y.%m.%d') as dlv_req_dt
+        , date_format(info.dlv_reg_dt, '%Y.%m.%d') as dlv_reg_dt
+        , date_format(info.dlv_sch_dt, '%Y.%m.%d') as dlv_sch_dt
         , date_format(info.dlv_cmplt_dt, '%Y.%m.%d') as dlv_cmplt_dt
         , ptcl.item_id as 'deliDtlMgntInfo.item_id', ptcl.item_nm as 'deliDtlMgntInfo.item_nm'
         , ptcl.podr_qty as 'deliDtlMgntInfo.podr_qty', ptcl.dlv_qty as 'deliDtlMgntInfo.dlv_qty'