폐기신청 정보 API 반영

src/main/java/cokr/xit/adds/core/spring/exception/CustomExceptionHandler.java

@@ -164,13 +164,11 @@ public class CustomExceptionHandler {
     }
 
     private ResponseEntity<ApiBaseResponse<?>> makeEntity(final Integer code, final String message, final HttpStatus status) {
-        ApiBaseResponse<Object> build = ApiBaseResponse.builder()
+        ApiBaseResponse<?> build = ApiBaseResponse.builder()
             .success(false)
             .code(code)
             .message(message)
-            //.data(message)
             .build();
-
 		// HttpHeaders headers = new HttpHeaders();
 		// headers.setContentType(MediaType.APPLICATION_JSON);
 

src/main/java/cokr/xit/adds/inf/nims/model/NimsApiDto.java

@@ -210,18 +210,25 @@ public class NimsApiDto {
     @SuperBuilder
     public static class DsuseRpt {
 
-        /**
-         * 마약류취급자식별번호
-         */
-        @JsonProperty(value = "BSSH_CD", required = true)
-        private String bsshCd;
-
         /**
          * 사용자 보고 식별 번호
          */
         @JsonProperty(value = "USR_RPT_ID_NO", required = true)
         private String usrRptIdNo;
 
+        /**
+         * 참조 사용자 보고 식별 번호
+         * 취소|변경시 필수 - 사용자 보고 식별 번호
+         */
+        @JsonProperty(value = "REF_USR_RPT_ID_NO")
+        private String refUsrRptIdNo;
+
+        /**
+         * 마약류취급자식별번호
+         */
+        @JsonProperty(value = "BSSH_CD", required = true)
+        private String bsshCd;
+
         /**
          * 보고 유형 코드(0-신규,1-취소,2-변경)
          */
@@ -292,6 +299,7 @@ public class NimsApiDto {
         @JsonProperty(value = "RPT_PRG_STTS_CD", required = true)
         private String rptPgrSttsCd;
 
+
         /**
          * 폐기보고상세 목록
          */
@@ -306,6 +314,12 @@ public class NimsApiDto {
     @AllArgsConstructor
     @SuperBuilder
     public static class DsuseRptDtl {
+        /**
+         * 사용자 보고 식별 번호
+         */
+        @JsonProperty(value = "USR_RPT_ID_NO", required = true)
+        private String usrRptIdNo;
+
         /**
          * 사용자 보고 라인 식별 번호
          */

src/main/java/cokr/xit/adds/inf/nims/service/bean/InfNimsServiceBean.java

@@ -155,6 +155,7 @@ public class InfNimsServiceBean extends AbstractServiceBean implements InfNimsSe
 
 	private NimsApiResult.Response<NimsApiDto.DsuseRpt> getDsuseRptResponse() {
 		NimsApiDto.DsuseRptDtl dtl1 = NimsApiDto.DsuseRptDtl.builder()
+			.usrRptIdNo("usrRptIdNo")
 			.usrRptLnIdNo("dsuseRptDtlIdNo")
 			.prdctCd("상품코드")
 			.prductNm("제품명")
@@ -169,6 +170,7 @@ public class InfNimsServiceBean extends AbstractServiceBean implements InfNimsSe
 			.dsuseQy(30)
 			.build();
 		NimsApiDto.DsuseRptDtl dtl2 = NimsApiDto.DsuseRptDtl.builder()
+			.usrRptIdNo("usrRptIdNo")
 			.usrRptLnIdNo("dsuseRptDtlIdNo1")
 			.prdctCd("상품코드1")
 			.prductNm("제품명1")

src/main/resources/database/DDL/adds_nims.sql

@@ -54,11 +54,12 @@ CREATE TABLE tb_cmm_refresh_token
 CREATE TABLE tb_dsuse_mgt
 (
   dscdmng_id      varchar(10)  NOT NULL COMMENT '폐기관리_id',
+  usr_rpt_id_no   varchar(30)  NOT NULL COMMENT '사용자_보고_식별_번호',
+  ref_usr_rpt_id_no varchar(30)  NULL COMMENT '참조_사용자_보고_식별_번호',
   user_id         varchar(10)  NULL     COMMENT '사용자_아이디',
   bssh_cd         varchar(10)  NOT NULL COMMENT '마약류취급자식별_번호',
   prgrs_stts_cd   varchar(10)  NULL     COMMENT '진행_상태_코드',
   rpt_rcept_no    varchar(30)  NULL     COMMENT '보고_접수_번호',
-  usr_rpt_id_no   varchar(30)  NULL     COMMENT '사용자_보고_식별_번호',
   rpt_ty_cd       varchar(1)   NULL     COMMENT '보고_유형_코드(0-신규,1-취소,2-변경)',
   rnd_dtl_rpt_cnt decimal      NULL     COMMENT '수불_상세_보고_수',
   hdr_de          varchar(8)   NULL     COMMENT '취급_일자',
@@ -75,14 +76,14 @@ CREATE TABLE tb_dsuse_mgt
   rgtr            varchar(10)  NOT NULL COMMENT '등록자',
   mdfcn_dt        varchar(14)  NULL     COMMENT '수정_일시',
   mdfr            varchar(10)  NULL     COMMENT '수정자',
-  PRIMARY KEY (dscdmng_id)
+  PRIMARY KEY (dscdmng_id, usr_rpt_id_no)
 ) COMMENT '폐기관리';
 
 CREATE TABLE tb_dsuse_mgt_dtl
 (
   dscdmng_id       varchar(10)  NOT NULL COMMENT '폐기관리_id',
-  dscdmng_sn       varchar(3)   NOT NULL COMMENT '폐기관리_순번',
+  usr_rpt_id_no   varchar(30)   NOT NULL COMMENT '사용자_보고_식별_번호',
-  usr_rpt_ln_id_no varchar(35)  NULL     COMMENT '사용자_보고_라인_식별_번호',
+  usr_rpt_ln_id_no varchar(35)  NOT NULL COMMENT '사용자_보고_라인_식별_번호',
   prdct_cd         varchar(14)  NOT NULL COMMENT '제품_코드',
   prduct_nm        varchar(300) NULL     COMMENT '제품_명',
   min_distb_qy     decimal      NULL     COMMENT '최소_유통단위_수량',
@@ -99,9 +100,9 @@ CREATE TABLE tb_dsuse_mgt_dtl
   rgtr             varchar(10)  NOT NULL COMMENT '등록자',
   mdfcn_dt         varchar(14)  NULL     COMMENT '수정_일시',
   mdfr             varchar(10)  NULL     COMMENT '수정자',
-  PRIMARY KEY (dscdmng_id, dscdmng_sn),
+  PRIMARY KEY (dscdmng_id, usr_rpt_id_no, usr_rpt_ln_id_no),
   constraint fk_dsuse_mgt_to_dtl_dsuse_mgt
-      foreign key (dscdmng_id) references tb_dsuse_mgt (dscdmng_id)
+      foreign key (dscdmng_id, usr_rpt_id_no) references tb_dsuse_mgt (dscdmng_id, usr_rpt_id_no)
 ) COMMENT '폐기관리_상세';
 
 CREATE TABLE tb_jrdt_gov_info