Quellcode durchsuchen

납품서 수정

dwkim vor 2 Jahren
Ursprung
Commit
58e5ea9b82

+ 2 - 2
src/main/java/com/oqpo/api/web/dto/response/inoutmng/InvInfoResponse.java

@@ -25,7 +25,7 @@ public class InvInfoResponse {
25 25
 
26 26
     @ApiModelProperty(value = "발행일") private String dlvRegDt;
27 27
     @ApiModelProperty(value = "납품서번호") private String dlvSttmtUnqNo;
28
-    @ApiModelProperty(value = "납품일") private String dvlSchDt;
28
+    @ApiModelProperty(value = "납품일") private String dlvSchDt;
29 29
     @ApiModelProperty(value = "납품담당자") private String dlvMgrNm;  // dlv_mgr_tel_no
30 30
     @ApiModelProperty(value = "납품장소") private String whsAddr;
31 31
     @ApiModelProperty(value = "납품전화번호") private String whsMgrTelNo;
@@ -50,7 +50,7 @@ public class InvInfoResponse {
50 50
         return InvInfoResponse.builder()
51 51
                 .dlvRegDt(entity.getDlvRegDt() == null ? "" : entity.getDlvRegDt())
52 52
                 .dlvSttmtUnqNo(entity.getDlvSttmtUnqNo() == null ? "" : entity.getDlvSttmtUnqNo())
53
-                .dvlSchDt(entity.getDlvSchDt() == null ? "" :  entity.getDlvSchDt())
53
+                .dlvSchDt(entity.getDlvSchDt() == null ? "" :  entity.getDlvSchDt())
54 54
                 .dlvMgrNm(entity.getDlvMgrNm() == null ? "" : entity.getDlvMgrNm() + "( " + entity.getDlvMgrTelNo() + " )")
55 55
                 .whsAddr(entity.getWhsAddr() == null ? "" : entity.getWhsAddr())
56 56
                 .whsMgrTelNo(entity.getWhsMgrTelNo() == null ? "" : entity.getWhsMgrTelNo())

+ 2 - 1
src/main/resources/mybatis/sqlmaps/inoutmng/ShmtOdr.xml

@@ -253,6 +253,7 @@
253 253
             , concat(whs.addr1 ,' ',whs.addr2) as whs_addr
254 254
             , fn_get_telno(whs.mgr_tel_no) as whs_mgr_tel_no
255 255
             , deli.store_id
256
+            , date_format(deli.dlv_sch_dt,'%Y.%m.%d') as dlv_sch_dt
256 257
         from   deli_info_mgnt deli
257 258
         join   whs_mgnt_base_info whs on whs.brand_id = deli.brand_id and whs.whs_id = deli.whs_id
258 259
         where  deli.brand_id = #{brandId}
@@ -366,7 +367,7 @@
366 367
             , date_format(info.podr_reg_dt, '%Y.%m.%d') as podr_reg_dt
367 368
             , date_format(info.dlv_req_dt, '%Y.%m.%d') as dlv_req_dt
368 369
             , date_format(info.dlv_reg_dt, '%Y.%m.%d') as dlv_reg_dt
369
-            , date_format(info.dlv_sch_dt, '%y.%m.%d') as dlv_sch_dt
370
+            , date_format(info.dlv_sch_dt, '%Y.%m.%d') as dlv_sch_dt
370 371
             , date_format(info.dlv_cmplt_dt, '%Y.%m.%d') as dlv_cmplt_dt
371 372
             , ptcl.item_id as 'deliDtlMgntInfo.item_id', ptcl.item_nm as 'deliDtlMgntInfo.item_nm'
372 373
             , ptcl.podr_qty as 'deliDtlMgntInfo.podr_qty', ptcl.dlv_qty as 'deliDtlMgntInfo.dlv_qty'