فهرست منبع

재입고 알림 화면에서 배치로 변경

eskim 5 سال پیش
والد
کامیت
84ec9011cc

+ 1 - 0
src/main/java/com/style24/persistence/domain/ReinboundInform.java

@@ -26,6 +26,7 @@ public class ReinboundInform extends TscBaseDomain {
 	private String optCd2;
 	private String reqDt;
 	private String informDt;
+	private int pastDays;
 
 	private String custId;
 	private String brandEnm;

+ 3 - 2
src/main/java/com/style24/persistence/mybatis/shop/TsaGoods.xml

@@ -3564,6 +3564,7 @@
 		                   , DATE_FORMAT(IA.REG_DT,'%Y%m%d%H%i%S') AS REG_DT
 		                   , FN_GET_USER_NM(IA.UPD_NO)             AS UPD_NM
 		                   , DATE_FORMAT(IA.UPD_DT,'%Y%m%d%H%i%S') AS UPD_DT
+		                   , DATEDIFF(CURRENT_DATE(),IA.REQ_DT)    AS PAST_DAYS
 		                   , IA.CUST_NO
 		                   , C.CUST_ID
 		                   , C.CUST_NM
@@ -3626,10 +3627,10 @@
 		                  </if>
 		              </if>
 		              <if test='beforSkipFlag != null and beforSkipFlag == "Y"'>
-		              AND DATE_FORMAT(IA.REQ_DT, '%Y%m%d')  >= DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -15 DAY), '%Y%m%d') 
+		              AND DATEDIFF(CURRENT_DATE(),IA.REQ_DT) <![CDATA[<=]]> 15
 		              </if>
 		              <include refid="getGoodsListCondition_sql"/>
-		              ORDER BY IA.RINBD_INFO_SQ
+		              ORDER BY IA.REQ_DT DESC
 		<include refid="getListLimitPagingCondition_sql"/>
 	</select> 
 	

+ 5 - 12
src/main/webapp/WEB-INF/views/goods/GoodsReinboundInformForm.html

@@ -116,7 +116,7 @@
 			<!-- 상단버튼 영역  -->
 			<ul class="panelBar">
 				<li class="right">
-					<button type="button" class="btn btn-primary btn-lg" id="reinboundInformSend">재입고알림 발송</button>
+					<!-- <button type="button" class="btn btn-primary btn-lg" id="reinboundInformSend">재입고알림 발송</button> -->
 					검색결과 : <strong><span id="gridRowTotalCount">0</span> 건</strong>&nbsp;
 					쪽번호 <span id="pgNo">0</span>/ <strong id="endPgNo">0</strong>&nbsp;&nbsp;
 					<select id="pageSize" name="pageSize">
@@ -145,20 +145,11 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 
-	//var toDateStr = new Date().format("YYYYMMDD");
-	var date = new Date();
-	var beforeDay = date.before(0, 0, 15).format("YYYYMMDD");
-		
 	var sessRoleCd = [[${sessionInfo.roleCd}]];
 	var goodsStatList = gagajf.convertToArray([[${goodsStatList}]]);
 	var uploadGoodsUrl = [[${@environment.getProperty('upload.goods.view')}]];
 
 	var columnDefs = [
-		{width: 40, minWidth: 40, cellClass: 'text-right', headerCheckboxSelection: true, filter: false
-			, checkboxSelection: function (params) {
-				return (beforeDay > params.data.reqDt ) ? false : true;
-			}
-		},
 		{headerName: 'No', width: 60, cellClass: 'text-center',
 			valueGetter: function(params) { return cfnGridNumner('searchForm',params.node.rowIndex, 'A');}
 		},
@@ -205,7 +196,9 @@
 				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';
 			}
 		},
-		{headerName: "수정자", field: "updNm" , width: 100, cellClass: 'text-center'}
+		{headerName: "수정자", field: "updNm" , width: 100, cellClass: 'text-center'},
+		{headerName: "경과일수", field: "pastDays" , width: 100, cellClass: 'text-center', hide: true}
+		
 		
 	];
 	
@@ -411,7 +404,7 @@
 				return false;
 			}
 			
-			if (beforeDay > item.reqDt){
+			if (item.pastDays > 15){
 				chkFlag = true;
 				mcxDialog.alert("요청일이 15일경과한 재입고알림은 발송할 수 없습니다.");
 				return false;