Переглянути джерело

공급사 등록일 항목 추가 및 브랜드 구매요청 테슽 수정 후 반영

dwkim 2 роки тому
батько
коміт
e760f56563

+ 1 - 0
src/main/java/com/oqpo/api/service/stinfo/SpplyService.java

@@ -96,6 +96,7 @@ public class SpplyService extends CommonService {
96 96
                         .stNm(m.getStNm() == null ? "" : m.getStNm() )
97 97
                         .bsnsRegNo(m.getBsnsRegNo() == null ? "" : m.getBsnsRegNo())
98 98
                         .ownerNm(m.getOwnerNm() == null ? "" :  m.getOwnerNm())
99
+                        .sysRegDttm(m.getSysRegDttm() == null ? "" : m.getSysRegDttm())
99 100
                         .build())
100 101
                 .collect(Collectors.toList());
101 102
 

+ 0 - 1
src/main/java/com/oqpo/api/web/dto/request/pomng/pchReq/SavePchReqlRequest.java

@@ -48,7 +48,6 @@ public class SavePchReqlRequest {
48 48
     @ApiModelProperty(value = "창고상세위치정보")
49 49
     private String location;
50 50
 
51
-    @NotBlank
52 51
     @ApiModelProperty(value = "매장고유여신번호")
53 52
     private String loanMgntUnqNo;
54 53
 

+ 1 - 1
src/main/java/com/oqpo/api/web/dto/response/pomng/pchReq/PchReqInitInfoResponse.java

@@ -43,7 +43,7 @@ public class PchReqInitInfoResponse {
43 43
                 .loanDvsn(loanEntity == null ?  "" : loanEntity.getLoanDvsn() == null ? "" : loanEntity.getLoanDvsn())
44 44
                 .loanDvsnNm(loanEntity == null ?  "" : loanEntity.getLoanDvsnNm() == null ? "" : loanEntity.getLoanDvsnNm())
45 45
                 .loanMgntUnqNo(loanEntity == null ?  "" : loanEntity.getLoanMgntUnqNo() == null ? "" : loanEntity.getLoanMgntUnqNo())
46
-                .pchReqDvsn(uEntity.getStoreId() == null ? "PD03" : "PD01")
46
+                .pchReqDvsn(uEntity.getStoreId() == null || "".equals(uEntity.getStoreId()) ? "PD03" : "PD01")
47 47
                 .build();
48 48
     }
49 49
 

+ 4 - 0
src/main/java/com/oqpo/api/web/dto/response/stinfo/spply/SpplySearchResponse.java

@@ -37,4 +37,8 @@ public class SpplySearchResponse {
37 37
 
38 38
     @ApiModelProperty(value = "대표자명")
39 39
     private String ownerNm;
40
+
41
+    @ApiModelProperty(value = "최초등록일")
42
+    private String sysRegDttm;
43
+
40 44
 }

+ 1 - 1
src/main/resources/mybatis/sqlmaps/stinfo/Supply.xml

@@ -46,7 +46,7 @@
46 46
     <select id="selectSpplyGridList" resultType="com.oqpo.api.entity.stinfo.SpplyEntity">
47 47
         select /* selectSpplyGridList */
48 48
                 brand_id, fn_brand_nm(brand_id) as brand_nm, spply_id, spply_nm, st_cd, fn_code_nm('ST_CD',st_cd) as st_nm
49
-                , bsns_reg_no, owner_nm
49
+                , bsns_reg_no, owner_nm, date_format(sys_reg_dttm,'%Y.%m.%d %H:%i:%s') as sys_reg_dttm
50 50
         from   spply_base_info
51 51
         where  brand_id = #{sBrandId}
52 52
         <if test="sStCd != null and sStCd != ''">