fix : 접수신청 조회 및 등록화면수정.

src/main/java/cokr/xit/adds/nims/dsuseMgtReceiptQuery.java

@@ -21,28 +21,41 @@ public class dsuseMgtReceiptQuery extends QueryRequest{
 	private String schDateFrom; 		// 검색 일자 시작
 	private String schDateTo; 			// 검색 일자 종료
 
-	
-	private String dscdmngId;
-	private String deptCd;
-	private String userId;
-	private String prgrsSttsCd;
-	private String bsshCd;
-	private String rndDtlRptCnt;
-	private String hdrDe;
-	private String dsuseSeCd;
-	private String dsusePrvCd;
-	private String dsuseMthCd;
-	private String dsuseLoc;
-	private String dsuseDe;
-	private String stts;
-	private String usrRptIdNo;
-	private String orgUsrRptIdNo;
-	private String rptTyCd;
-	private String useYn;
-	private String regDt;
-	private String rgtr;
-	private String mdfcnDt;
-	private String mdfr;
+	//폐기관리
+	private String dscdmngId;			// 폐기관리 ID
+	private String deptCd;				// 부서 코드
+	private String userId;				// 사용자 ID
+	private String prgrsSttsCd;			// 진행 상태 코드
+	private String bsshCd;				// 마약류 취급자 식별 번호
+	private String rndDtlRptCnt;		// 수불 상세 보고 수
+	private String hdrDe;				// 취급 일자
+	private String dsuseSeCd;			// 폐기 구분 코드
+	private String dsusePrvCd;			// 폐기 사유 코드
+	private String dsuseMthCd;			// 폐기 방법 코드
+	private String dsuseLoc;			// 폐기 장소
+	private String dsuseDe;				// 폐기 일자
+	private String stts;				// 처리 상태
+	private String usrRptIdNo;			// 사용자 보고 식별 번호
+	private String orgUsrRptIdNo;		// 원 사용자 보고 식별 번호
+	private String rptTyCd;				// 보고 유형 코드
+	private String useYn;				// 사용 여부
+	private String regDt;				// 등록 일시
+	private String rgtr;				// 등록자
+	private String mdfcnDt;				// 수정 일시
+	private String mdfr;				// 수정자
+	
+	//저장소 정보
+	private String bsshNm;				// 업체명
+	private String indutyNm;			// 업종명
+	private String hdntCd;				// 의료업자 구분
+	private String hdntNm;				// 의료업자 구분명
+	private String bizrno;				// 사업자등록번호
+	private String rprsntvNm;			// 대표자 명
+	private String chrgNm;				// 담당자 명
+	private String hptlNo;				// 요양기관 기호
+	private String joinYn;				// 획원가입 여부
+	private String bsshSttsNm;		// 상태
+	private String prmisnNo;			// 허가 번호
 
 	public String getschDateOpt() {
 		return ifEmpty(schDateOpt, () -> null);
@@ -259,4 +272,102 @@ public class dsuseMgtReceiptQuery extends QueryRequest{
 		this.mdfr = mdfr;
 		return self();
 	}		
+	
+	public String getbsshNm() {
+		return ifEmpty(bsshNm, () -> null);
+	}
+
+	public <T extends dsuseMgtReceiptQuery> T setbsshNm(String bsshNm) {
+		this.bsshNm = bsshNm;
+		return self();
+	}
+	
+	public String getindutyNm() {
+		return ifEmpty(indutyNm, () -> null);
+	}
+
+	public <T extends dsuseMgtReceiptQuery> T setindutyNm(String indutyNm) {
+		this.indutyNm = indutyNm;
+		return self();
+	}
+	
+	public String gethdntCd() {
+		return ifEmpty(hdntCd, () -> null);
+	}
+
+	public <T extends dsuseMgtReceiptQuery> T sethdntCd(String hdntCd) {
+		this.hdntCd = hdntCd;
+		return self();
+	}
+	public String gethdntNm() {
+		return ifEmpty(hdntNm, () -> null);
+	}
+
+	public <T extends dsuseMgtReceiptQuery> T sethdntNm(String hdntNm) {
+		this.hdntNm = hdntNm;
+		return self();
+	}	
+	
+	public String getbizrno() {
+		return ifEmpty(bizrno, () -> null);
+	}
+
+	public <T extends dsuseMgtReceiptQuery> T setbizrno(String bizrno) {
+		this.bizrno = bizrno;
+		return self();
+	}	
+	
+	public String getrprsntvNm() {
+		return ifEmpty(rprsntvNm, () -> null);
+	}
+
+	public <T extends dsuseMgtReceiptQuery> T setrprsntvNm(String rprsntvNm) {
+		this.rprsntvNm = rprsntvNm;
+		return self();
+	}		
+	
+	public String getchrgNm() {
+		return ifEmpty(chrgNm, () -> null);
+	}
+
+	public <T extends dsuseMgtReceiptQuery> T setchrgNm(String chrgNm) {
+		this.chrgNm = chrgNm;
+		return self();
+	}	
+	
+	public String gethptlNo() {
+		return ifEmpty(hptlNo, () -> null);
+	}
+
+	public <T extends dsuseMgtReceiptQuery> T sethptlNo(String hptlNo) {
+		this.hptlNo = hptlNo;
+		return self();
+	}	
+	
+	public String getjoinYn() {
+		return ifEmpty(joinYn, () -> null);
+	}
+
+	public <T extends dsuseMgtReceiptQuery> T setjoinYn(String joinYn) {
+		this.joinYn = joinYn;
+		return self();
+	}	
+	
+	public String getbsshSttsNm() {
+		return ifEmpty(bsshSttsNm, () -> null);
+	}
+
+	public <T extends dsuseMgtReceiptQuery> T setbsshSttsNm(String bsshSttsNm) {
+		this.bsshSttsNm = bsshSttsNm;
+		return self();
+	}	
+	
+	public String getprmisnNo() {
+		return ifEmpty(prmisnNo, () -> null);
+	}
+
+	public <T extends dsuseMgtReceiptQuery> T setprmisnNo(String prmisnNo) {
+		this.prmisnNo = prmisnNo;
+		return self();
+	}	
 }

src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml

@@ -9,33 +9,45 @@
 
     <sql id="select">
         SELECT 
-			  DSCDMNG_ID											<!-- 폐기관리 ID -->
-			, DEPT_CD												<!-- 부서 코드 -->
-			, USER_ID												<!-- 사용자 ID -->
-			, PRGRS_STTS_CD											<!-- 진행상태 코드 -->
-			, GET_CODE_NM("ADD511", PRGRS_STTS_CD) PRGRS_STTS_NM	<!-- 진행상태 -->
-			, BSSH_CD												<!-- 마약류취급자 식별번호 -->
-			, RND_DTL_RPT_CNT										<!-- 수불_상세_보고_수 -->
-			, HDR_DE												<!-- 취급 일자 -->
-			, DSUSE_SE_CD											<!-- 폐기 구분 코드 -->
-			, GET_CODE_NM("ADDS03", DSUSE_SE_CD) DSUSE_SE_NM		<!-- 폐기 구분 -->
-			, DSUSE_PRV_CD											<!-- 폐기 사유 코드 -->
-			, GET_CODE_NM("ADDS04", DSUSE_PRV_CD) DSUSE_PRV_NM		<!-- 폐기 사유 -->
-			, DSUSE_MTH_CD											<!-- 폐기 방법 코드 -->
-			, GET_CODE_NM("ADDS05", DSUSE_MTH_CD) DSUSE_MTH_NM		<!-- 폐기 방법 -->
-			, DSUSE_LOC												<!-- 폐기 장소 -->
-			, DSUSE_DE												<!-- 폐기 일자 -->
-			, STTS													<!-- 처리상태 -->
-			, USR_RPT_ID_NO											<!-- 사용자 보고 식별 번호 -->
-			, ORG_USR_RPT_ID_NO										<!-- 원 사용자 보고 식별 번호 -->
-			, RPT_TY_CD												<!-- 보고 유형 코드 -->
-			, GET_CODE_NM("ADDS02", RPT_TY_CD) RPT_TY_NM			<!-- 보고 유형 -->
-			, USE_YN												<!-- 사용여부 -->
-			, REG_DT												<!-- 등록일시 -->
-			, RGTR													<!-- 등록자 -->
-			, MDFCN_DT												<!-- 수정일시 -->
-			, MDFR													<!-- 수정자 -->
-		FROM TB_DSUSE_MGT
+			  A.DSCDMNG_ID											<!-- 폐기관리 ID -->
+			, A.DEPT_CD												<!-- 부서 코드 -->
+			, A.USER_ID												<!-- 사용자 ID -->
+			, A.PRGRS_STTS_CD										<!-- 진행상태 코드 -->
+			, GET_CODE_NM("ADD511", A.PRGRS_STTS_CD) PRGRS_STTS_NM	<!-- 진행상태 -->
+			, A.BSSH_CD												<!-- 마약류취급자 식별번호 -->
+			, A.RND_DTL_RPT_CNT										<!-- 수불_상세_보고_수 -->
+			, A.HDR_DE												<!-- 취급 일자 -->
+			, A.DSUSE_SE_CD											<!-- 폐기 구분 코드 -->
+			, GET_CODE_NM("ADDS03", A.DSUSE_SE_CD) DSUSE_SE_NM		<!-- 폐기 구분 -->
+			, A.DSUSE_PRV_CD										<!-- 폐기 사유 코드 -->
+			, GET_CODE_NM("ADDS04", A.DSUSE_PRV_CD) DSUSE_PRV_NM	<!-- 폐기 사유 -->
+			, A.DSUSE_MTH_CD										<!-- 폐기 방법 코드 -->
+			, GET_CODE_NM("ADDS05", A.DSUSE_MTH_CD) DSUSE_MTH_NM	<!-- 폐기 방법 -->
+			, A.DSUSE_LOC											<!-- 폐기 장소 -->
+			, A.DSUSE_DE											<!-- 폐기 일자 -->
+			, A.STTS												<!-- 처리상태 -->
+			, A.USR_RPT_ID_NO										<!-- 사용자 보고 식별 번호 -->
+			, A.ORG_USR_RPT_ID_NO									<!-- 원 사용자 보고 식별 번호 -->
+			, A.RPT_TY_CD											<!-- 보고 유형 코드 -->
+			, GET_CODE_NM("ADDS02", A.RPT_TY_CD) RPT_TY_NM			<!-- 보고 유형 -->
+			, A.USE_YN												<!-- 사용여부 -->
+			, A.REG_DT												<!-- 등록일시 -->
+			, A.RGTR												<!-- 등록자 -->
+			, A.MDFCN_DT											<!-- 수정일시 -->
+			, A.MDFR												<!-- 수정자 -->
+			, B.BSSH_NM												<!-- 업체 명 -->
+			, B.INDUTY_NM											<!-- 업종 명 -->
+			, B.HDNT_CD												<!-- 의료업자 구분 -->
+			, B.HDNT_NM												<!-- 의료업자 구분 명 -->
+			, B.BIZRNO												<!-- 사업자등록번호 -->
+			, B.RPRSNTV_NM											<!-- 대표자 명 -->
+			, B.CHRG_NM												<!-- 담당자 명 -->
+			, B.HPTL_NO												<!-- 요양기관 번호 -->
+			, B.JOIN_YN												<!-- 회원가입 여부 -->
+			, B.BSSH_STTS_NM										<!-- 상태 -->
+			, B.PRMISN_NO											<!-- 허가번호 -->
+		FROM TB_DSUSE_MGT A
+		  LEFT OUTER JOIN TB_BSSH_INFO B ON A.BSSH_CD = B.BSSH_CD
     </sql>
 
     <select id="selectDsuseMgtReceiptcList" parameterType="map" resultType="dataobject">/* 전자우편 안내문 목록 조회(epostGdccMapper.selectEpostGdccList) */
@@ -45,21 +57,21 @@
         <choose>
             <when test="schDateOpt == 'hdrDe'">
 				<if test="schDateFrom != null">
-					AND HDR_DE <![CDATA[>=]]> #{schDateFrom}    <!-- 취급 일자 시작 -->
+					AND A.HDR_DE <![CDATA[>=]]> #{schDateFrom}    <!-- 취급 일자 시작 -->
 		        </if>
         		<if test="schDateTo != null">
-		           AND HDR_DE <![CDATA[<=]]> #{schDateTo}      <!-- 취급 일자 종료 -->
+		           AND A.HDR_DE <![CDATA[<=]]> #{schDateTo}      <!-- 취급 일자 종료 -->
 		        </if>
             </when>
             <when test="schRegDateOpt == 'mdfcnDt'">
 				<if test="schDateFrom != null">
-					AND HDR_DE <![CDATA[>=]]> #{schDateFrom}    <!-- 보고 일자 시작 -->
+					AND A.HDR_DE <![CDATA[>=]]> #{schDateFrom}    <!-- 보고 일자 시작 -->
 		        </if>
         		<if test="schDateTo != null">
-		           AND HDR_DE <![CDATA[<=]]> #{schDateTo}      <!-- 보고 일자 종료 -->
+		           AND A.HDR_DE <![CDATA[<=]]> #{schDateTo}      <!-- 보고 일자 종료 -->
 		        </if>
 		        <if test="schSttsCd != null">
-		           AND PRGRS_STTS_CD   =  #{schSttsCd}   <!-- 부과 제외 구분 코드 -->
+		           AND A.PRGRS_STTS_CD   =  #{schSttsCd}   <!-- 부과 제외 구분 코드 -->
             	</if>
             </when>
             <otherwise>

src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp

@@ -13,12 +13,28 @@
 			<!-- 입력 영역 -->
 			<form id="frmEdit--${pageName}" name="frmEdit">
 				<!-- hidden -->
-                <label for="storge--${pageName}">취급자 정보</label>
+                <label for="bssh--${pageName}">취급자 정보</label>
 				<div class="row my-1 mx-4 g-1 border-card rounded-3">
+				<div class="col-md-10">
+					<label for="bsshNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">마약류 취급자</label>
+					<input type="text" class="form-control w-30" id="bsshNm--${pageName}" name="bsshNm" data-map="BSSH_NM">
+					<button type="button" class="btn btn-search w-px-120" id="btnBsshSearch--${pageName}" title="검색">검색</button>
+				</div>
+				<div class="col-md-5">
+					<label for="storgeSeNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">저장소 유형</label>
+					<input type="text" class="form-control w-30" id="storgeSeNm--${pageName}" name="storgeSeNm" data-map="STORGE_SE_NM" readonly>
+				</div>
+				<div class="col-md-5">
+					<label for="storgeNo--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">저장소 번호</label>
+					<input type="text" class="form-control w-30" id="storgeNo--${pageName}" name="storgeNo" data-map="STORGE_NO" readonly>
+				</div>
 				<div class="col-md-5">
-					<label for="storgeNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">마약류 취급자</label>
+					<label for="storgeNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">저장소 명</label>
 					<input type="text" class="form-control w-30" id="storgeNm--${pageName}" name="storgeNm" data-map="STORGE_NM" readonly>
-					<button type="button" class="btn btn-sm btn-outline-dark" id="btnSearch--${pageName}" title="검색">검색</button>
+				</div>
+				<div class="col-md-12">
+					<label for="bsshadres--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">주소</label>
+					<input type="text" class="form-control w-60" id="bsshAdres--${pageName}" name="bsshAdres" data-map="BSSH_ADRES" readonly>
 				</div>
 				<div class="col-md-12">
 					<label for="addr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">폐기사유</label>
@@ -34,40 +50,77 @@
 			<label for="rtpyrNm--${pageName}">폐기정보 상세</label>
 			<form id="code-form">
 				<div class="row my-1 mx-4 g-1 border-card rounded-3">
-				<div class="col-md-6">
-				<label for="rtpyrNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">제품명</label>
-				<input type="text" id="rtpyrNm--${pageName}" name="rtpyrNm" data-map="RTPYR_NM" class="form-control" readonly="">
-				<button type="button" class="btn btn-search w-px-120" id="btnSearch--excl02010" title="검색">바코드 검색</button>
-				</div>
+					<div class="col-md-6">
+					<label for="rtpyrNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">제품명</label>
+					<input type="text" id="rtpyrNm--${pageName}" name="rtpyrNm" data-map="RTPYR_NM" class="form-control" readonly="">
+					<button type="button" class="btn btn-search w-px-120" id="btnSearch--excl02010" title="검색">바코드 검색</button>
+					</div>
 							
-				<div class="col-md-6">
-					<label for="dtlAddr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">제품 코드</label>
-					<input type="text" id="dtlAddr--${pageName}" name="dtlAddr" data-map="DTL_ADDR" class="form-control w-px-300" readonly="" data-maxlengthb="200">
-				</div>
-				<div class="col-md-6">
-					<label for="dtlAddr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">제조 번호</label>
-					<input type="text" id="dtlAddr--${pageName}" name="dtlAddr" data-map="DTL_ADDR" class="form-control w-px-300" readonly="" data-maxlengthb="200">
-				</div>
-				<div class="col-md-6">
-					<label for="dtlAddr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">제조 일련 번호</label>
-					<input type="text" id="dtlAddr--${pageName}" name="dtlAddr" data-map="DTL_ADDR" class="form-control w-px-300" readonly="" data-maxlengthb="200">
-				</div>
-				<div class="col-md-12">
-					<label for="addr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">유효기간</label>
-					<input type="text" id="dtlAddr--${pageName}" name="dtlAddr" data-map="DTL_ADDR" class="form-control w-px-200" readonly="" data-maxlengthb="200">
-				</div>
-				<div class="col-md-4">
-					<label for="zip--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">최소 유통단위 슈량</label>
-					<input type="text" id="zip--${pageName}" name="zip" data-map="ZIP" class="form-control w-px-100" readonly="">
-				</div>
-				<div class="col-md-4">
-					<label for="addr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">낱개 단위 수량</label>
-					<input type="text" id="addr--${pageName}" name="addr" data-map="ADDR" class="form-control w-px-100" data-maxlengthb="320" readonly="">
-				</div>
-				<div class="col-md-4">
-					<label for="addr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">폐기 수량</label>
-					<input type="text" id="addr--${pageName}" name="addr" data-map="ADDR" class="form-control w-px-100" data-maxlengthb="320">
+					<div class="col-md-6">
+						<label for="dtlAddr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">제품 코드</label>
+						<input type="text" id="dtlAddr--${pageName}" name="dtlAddr" data-map="DTL_ADDR" class="form-control  w-px-300" readonly="" data-maxlengthb="200">
+					</div>
+					<div class="col-md-6">
+						<label for="dtlAddr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">제조 번호</label>
+						<input type="text" id="dtlAddr--${pageName}" name="dtlAddr" data-map="DTL_ADDR" class="form-control w-px-300" readonly="" data-maxlengthb="200">
+					</div>
+					<div class="col-md-6">
+						<label for="dtlAddr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">제조 일련 번호</label>
+						<input type="text" id="dtlAddr--${pageName}" name="dtlAddr" data-map="DTL_ADDR" class="form-control w-px-300" readonly="" data-maxlengthb="200">
+					</div>
+					<div class="col-md-12">
+						<label for="addr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">유효기간</label>
+						<input type="text" id="dtlAddr--${pageName}" name="dtlAddr" data-map="DTL_ADDR" class="form-control w-px-200" readonly="" data-maxlengthb="200">
+					</div>
+					<div class="col-md-4">
+						<label for="zip--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">최소 유통단위 슈량</label>
+						<input type="text" id="zip--${pageName}" name="zip" data-map="ZIP" class="form-control w-px-100" readonly="">
+					</div>
+					<div class="col-md-4">
+						<label for="addr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">낱개 단위 수량</label>
+						<input type="text" id="addr--${pageName}" name="addr" data-map="ADDR" class="form-control w-px-100" data-maxlengthb="320" readonly="">
+					</div>
+					<div class="col-md-4">
+						<label for="addr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">폐기 수량</label>
+						<input type="text" id="addr--${pageName}" name="addr" data-map="ADDR" class="form-control w-px-100" data-maxlengthb="320">
+					</div>
+					<div style=" align-content: center; text-align: center;">
+						<span>
+						<!-- 업무 버튼 -->
+							<button type="button" class="btn btn-primary w-px-80" id="btnSave--excl02040" title="저장">추가</button>
+		                    <button type="button" class="btn btn-primary w-px-80" id="btnSave--excl02040" title="저장">제거</button>
+						</span>
+					</div>
 				</div>
+				<table class="datatables-ajax table table-bordered dataTable no-footer" id="DataTables_Table_0" aria-describedby="DataTables_Table_0_info">
+					<thead>
+						<tr><th style="width: 15.828px;text-align:center;" tabindex="0">No</th>
+							<th class="sorting sorting_asc" aria-sort="ascending" style="width: 223.719px;">제품명</th>
+							<th class="sorting" style="width: 146.156px;">제품코드</th>
+							<th class="sorting" style="width: 160.141px;">제품번호</th>
+							<th class="sorting" style="width: 160.141px;">제조 일련 번호</th>
+							<th class="sorting" style="width: 230.469px;">유효기간</th>
+							<th class="sorting" style="width: 230.469px;">최소 유통단위 수량</th>
+							<th class="sorting" style="width: 230.469px;">낱개 단위 수량</th>
+							<th class="sorting" style="width: 230.469px;">폐기 수량</th>
+						</tr>
+                    </thead>
+                    <tbody id="userList">
+                   	
+                    </tbody>
+                   	<template id="prductRow">
+                   	<tr data-key="{PRDUCT_CD}">
+                       <td style="text-align:center;"><input value="{PRDUCT_CD}" onchange="userControl.select('{PRDUCT_CD}', this.checked);" type="checkbox" class="form-check-input"></td>
+                       <td {onclick}="" {ondblclick}="">{PRDUCT_CD}</td>
+                       <td {onclick}="" {ondblclick}="">{PRDUCT_NM}</td>
+                       <td {onclick}="" {ondblclick}="">{MNF_NO}</td>
+                       <td {onclick}="" {ondblclick}="">{PRD_VALID_DE}</td>
+                       <td {onclick}="" {ondblclick}="">{MIN_DISTB_QY}</td>
+                       <td {onclick}="" {ondblclick}="">{PCE_QY}</td>
+                       <td {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
+                    </tr>
+                    </template>
+				</table>
 			</form>
 		</form> <!-- /입력 영역 -->
 	</div> <!-- <div class="card"> -->

src/main/webapp/WEB-INF/jsp/include/head.jsp

@@ -28,13 +28,16 @@
   <link rel="stylesheet" href="<c:url value="/webjars/3rd-party/sneat/fonts/flag-icons.css"/>" />
 
   <!-- Core CSS -->  
+   <!-- 
   <link rel="stylesheet" href="<c:url value="/webjars/3rd-party/sneat/css/rtl/core.css"/>" class="template-customizer-core-css" />
   <link rel="stylesheet" href="<c:url value="/webjars/3rd-party/sneat/css/rtl/theme-default.css"/>" class="template-customizer-theme-css" />
-  <link rel="stylesheet" href="<c:url value="/resources/css/xit-extend.css"/>" class="template-customizer-core-css" />
+  -->
+  <link rel="stylesheet" href="<c:url value="/resources/css/xit-core.css"/>" class="template-customizer-core-css" />
   <link rel="stylesheet" href="<c:url value="/resources/css/xit-layout.css"/>"/>
+  <link rel="stylesheet" href="<c:url value="/resources/css/xit-extend.css"/>" class="template-customizer-core-css" />
+   
+  
   
- <!-- 
-  <link rel="stylesheet" href="<c:url value="/resources/css/xit-core.css"/>" class="template-customizer-core-css" />
 
   -->