재입고알림 경과 제외 조건 추가

style24.admin/src/main/java/com/style24/persistence/domain/ReinboundInform.java

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

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaGoods.xml

@@ -3404,6 +3404,9 @@
 		    ]]>
 		    </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') 
+		              </if>
 		<include refid="getGoodsListCondition_sql"/>
 		ORDER BY IA.REG_DT DESC
 	</select>
@@ -3451,7 +3454,6 @@
 		              LEFT OUTER JOIN TB_GOODS_IMG GI ON IA.GOODS_CD = GI.GOODS_CD
 		                                              AND IA.OPT_CD1 = GI.COLOR_CD 
 		              WHERE 1=1
-		              AND IA.DEL_YN = 'N'
 		              <if test="rinbdInfoSq != null and rinbdInfoSq != ''">
 		              AND IA.RINBD_INFO_SQ = #{rinbdInfoSq}
 		              </if>
@@ -3491,6 +3493,9 @@
 		                  ]]>
 		                  </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') 
+		              </if>
 		              <include refid="getGoodsListCondition_sql"/>
 		              ORDER BY IA.REG_DT DESC
 		<include refid="getListPagingCondition_sql"/>
@@ -3503,9 +3508,7 @@
 		SET INFORM_DT = NOW()
 		  , UPD_NO = #{updNo}
 		  , UPD_DT = NOW()
-		WHERE 1=1
-		AND DEL_YN = 'N'
-		AND RINBD_INFO_SQ = #{rinbdInfoSq}
+		WHERE RINBD_INFO_SQ = #{rinbdInfoSq}
 	</update>
 	
 </mapper>

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsReinboundInformForm.html

@@ -145,12 +145,20 @@
 <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, checkboxSelection: true, filter: false},
+		{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');}
 		},
@@ -399,9 +407,7 @@
 			return false;
 		}
 
-		//var toDateStr = new Date().format("YYYYMMDD");
-		var date = new Date();
-		var beforeDay = date.before(0, 0, 15).format("YYYYMMDD");
+		
 		
 		var arrRinbdInfoSq = [];
 		var chkFlag = false;
@@ -452,6 +458,7 @@
 	
 	$(document).ready(function() {
 		
+		var chkBeforSkipFlag = '&nbsp;&nbsp;<label class="chkBox"><input type="checkbox" name="beforSkipFlag" value="Y">경과데이터 제외</label>';
 		cfnCreateCalendar('#sellTerms', 'stDate', 'edDate', true, '예약일', 'X');
 
 		var selectCode = '<select  name="dateGbn" id="dateGbn">';
@@ -460,6 +467,7 @@
 		selectCode += '</select>';
 
 		$("#searchForm").find('#sellTerms').prepend(selectCode);
+		$("#searchForm").find('#sellTerms').append(chkBeforSkipFlag);
 
 		// Create a agGrid
 		gagaAgGrid.createGrid('gridList', gridOptions);