시판이유식 커밋

src/main/java/com/backoffice/m/bf_food/M_Bf_foodBO.java

@@ -43,4 +43,9 @@ public interface M_Bf_foodBO {
 	public abstract int delete_bf_lac_milk_single(DataMap paramMap) throws Exception;
 	public abstract int delete_bf_lac_memo_single(DataMap paramMap) throws Exception;
 	public abstract List<DataMap> select_memo_list(DataMap paramMap) throws Exception;
+	
+	public abstract int select_commerce_list_count(DataMap paramMap) throws Exception;
+	public abstract List<DataMap> select_commerce_list(DataMap paramMap) throws Exception;
+	public abstract Object insert_bf_self(DataMap paramMap) throws Exception;
+	public abstract List<DataMap> select_commerce_list_self(DataMap paramMap) throws Exception;
 }

src/main/java/com/backoffice/m/bf_food/M_Bf_foodBOImpl.java

@@ -265,6 +265,27 @@ public class M_Bf_foodBOImpl extends AbstractBOManager implements M_Bf_foodBO {
 		return result;
 	}
     
+    public int select_commerce_list_count(DataMap paramMap) throws Exception{
+        int result = 0;        
+        generalDAO.setNamespace(SQLMAP_NAMESPACE);
+        result = generalDAO.select_item_to_number("select_commerce_list_count", paramMap);
+        return result;
+    }
+    
+    public List<DataMap> select_commerce_list(DataMap paramMap) throws Exception{
+		List<DataMap> lm = null;		
+		generalDAO.setNamespace(SQLMAP_NAMESPACE);
+		lm = generalDAO.select_to_list("select_commerce_list", paramMap);
+		return lm;
+	}
+    
+    public List<DataMap> select_commerce_list_self(DataMap paramMap) throws Exception{
+		List<DataMap> lm = null;		
+		generalDAO.setNamespace(SQLMAP_NAMESPACE);
+		lm = generalDAO.select_to_list("select_commerce_list_self", paramMap);
+		return lm;
+	}
+    
 	public List<DataMap> select_db_lac_milk_list(DataMap paramMap) throws Exception{
 		List<DataMap> lm = null;
 
@@ -430,4 +451,23 @@ public class M_Bf_foodBOImpl extends AbstractBOManager implements M_Bf_foodBO {
 		
 		return result;
 	}
+    
+    public Object insert_bf_self(DataMap paramMap) throws Exception{
+		Object resultObj = null;
+		
+		try {
+			generalDAO.setNamespace(SQLMAP_NAMESPACE);
+			generalDAO.startTransaction();
+			
+			resultObj = generalDAO.insert("insert_bf_commerce_self", paramMap);
+
+			generalDAO.commitTransaction();
+		} catch (SQLException e) {
+			throw e;
+		}finally{
+			generalDAO.endTransaction();
+		}
+		
+		return resultObj;
+	}
 }

src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java

@@ -1632,6 +1632,85 @@ public class M_Bf_foodController extends AbstractControllerManager{
 			result.put("msg", ex1.getMessage());
 		}
 
+		return result;
+    }
+	
+	@RequestMapping(value="ajax_list_db_commerce")
+	@ResponseBody
+	public HashMap<String, Object> ajax_list_db_commerce(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response) {	
+		DataMap paramMap = this.getDataMapFromRequest(request);		
+		
+		HashMap<String, Object> result = new HashMap<String, Object>();
+		
+		try{
+			int rowMax = bf_foodBO.select_commerce_list_count(paramMap);		
+			initPage(paramMap, 100, PAGE_COUNT, rowMax); // check page count
+			
+			PageItem page = (PageItem)paramMap.get("page");
+			
+			List<DataMap> lm = bf_foodBO.select_commerce_list(paramMap);	
+			
+			//List<DataMap> Im = bf_foodBO.select_commerce_list_self(paramMap);
+			
+			if(lm != null) {
+				result.put("list", lm);
+				result.put("page", page);
+			}		
+		}catch(Exception ex1){
+			ex1.printStackTrace();
+		}
+
+		return result; 	
+	}
+	
+	@RequestMapping(value="ajax_list_db_commerce_self")
+	@ResponseBody
+	public HashMap<String, Object> ajax_list_db_commerce_self(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response) {	
+		DataMap paramMap = this.getDataMapFromRequest(request);		
+		
+		HashMap<String, Object> result = new HashMap<String, Object>();
+		
+		try{
+			int rowMax = bf_foodBO.select_commerce_list_count(paramMap);		
+			initPage(paramMap, 100, PAGE_COUNT, rowMax); // check page count
+			
+			PageItem page = (PageItem)paramMap.get("page");
+			
+			//List<DataMap> lm = bf_foodBO.select_commerce_list(paramMap);	
+			
+			List<DataMap> lm = bf_foodBO.select_commerce_list_self(paramMap);
+			
+			if(lm != null) {
+				result.put("list", lm);
+				result.put("page", page);
+			}		
+		}catch(Exception ex1){
+			ex1.printStackTrace();
+		}
+
+		return result; 	
+	}
+	
+	@RequestMapping(value="ajax_insert_self", method=RequestMethod.POST)
+    @ResponseBody
+    public HashMap<String, Object> ajax_insert_self(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
+		HttpSession session = request.getSession(false);
+		DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER);
+
+		DataMap paramMap = gmUtil.getDataMapFromRequest(request);
+		HashMap<String, Object> result = new HashMap<String, Object>();
+		result.put("RESULT", ConstantResultCode.RESULT_INIT);
+
+		try {
+				bf_foodBO.insert_bf_self(paramMap);
+
+				result.put("RESULT", ConstantResultCode.RESULT_SUCCESS);
+		} catch (Exception ex1) {
+			ex1.printStackTrace();
+			result.put("RESULT", ConstantResultCode.RESULT_EXCEPTION);
+			result.put("msg", ex1.getMessage());
+		}
+
 		return result;
     }
 }

src/main/resources/sqlmap/m/bf_food/com.backoffice.m.bf_food.xml

@@ -477,5 +477,110 @@
 		ORDER BY x.reg_dt DESC
      </select>
 	
+	<select id="select_commerce_list" resultClass="dataMap" parameterClass="dataMap">
+		SELECT 
+			 prd_nm
+		FROM tbl_db_bf_commerce  
+		WHERE 1 = 1          
+		  AND prd_nm like N'%$prd_nm$%'
+          <isNotEmpty property="dqi_cate">AND x.dqi_cate = #dqi_cate#</isNotEmpty>
+		  <isNotEmpty property="prd_cate1">AND x.prd_cate1 = #prd_cate1#</isNotEmpty>
+    </select>
+    
+    <select id="select_commerce_list_count" resultClass="Integer" parameterClass="dataMap">
+		SELECT COUNT(*)
+		FROM tbl_db_nutrient x
+		WHERE 1 =1
+        <isNotEmpty property="dqi_cate">AND x.dqi_cate = #dqi_cate#</isNotEmpty>
+    </select>
+    
+    <insert id="insert_bf_commerce_self" parameterClass="dataMap">    
+		INSERT tbl_db_sf_commerce
+		( 
+			reg_dt
+			<isNotEmpty property="food_nm">,prd_nm</isNotEmpty>
+			<isNotEmpty property="calorie">,calorie</isNotEmpty>
+			<isNotEmpty property="srv">,srv</isNotEmpty>
+			<isNotEmpty property="carbohydrate">,carbohydrate</isNotEmpty>
+			<isNotEmpty property="protein">,protein</isNotEmpty>
+			<isNotEmpty property="province">,province</isNotEmpty>
+			<isNotEmpty property="sugar">,sugar</isNotEmpty>
+			<isNotEmpty property="dietary_fiber">,dietary_fiber</isNotEmpty>
+			<isNotEmpty property="dsaturated_fat">,dsaturated_fat</isNotEmpty>
+			<isNotEmpty property="trans_fat">,trans_fat</isNotEmpty>
+			<isNotEmpty property="cholesterol">,cholesterol</isNotEmpty>
+			<isNotEmpty property="salt">,salt</isNotEmpty>
+			<isNotEmpty property="vitamina">,vitamina</isNotEmpty>
+			<isNotEmpty property="vitaminb1">,vitaminb1</isNotEmpty>
+			<isNotEmpty property="vitaminb2">,vitaminb2</isNotEmpty>
+			<isNotEmpty property="niacin">,niacin</isNotEmpty>
+			<isNotEmpty property="vitaminb6">,vitaminb6</isNotEmpty>
+			<isNotEmpty property="vitaminc">,vitaminc</isNotEmpty>
+			<isNotEmpty property="vitamind">,vitamind</isNotEmpty>
+			<isNotEmpty property="vitamine">,vitamine</isNotEmpty>
+			<isNotEmpty property="folic_acid">,folic_acid</isNotEmpty>
+			<isNotEmpty property="steel">,steel</isNotEmpty>
+			<isNotEmpty property="calcium">,calcium</isNotEmpty>
+			<isNotEmpty property="zinc">,zinc</isNotEmpty>
+			<isNotEmpty property="potassium">,potassium</isNotEmpty>
+			<isNotEmpty property="grain">,grain</isNotEmpty>
+			<isNotEmpty property="vegetable">,vegetable</isNotEmpty>
+			<isNotEmpty property="fruit">,fruit</isNotEmpty>
+			<isNotEmpty property="meat">,meat</isNotEmpty>
+			<isNotEmpty property="poultry">,poultry</isNotEmpty>
+			<isNotEmpty property="seafood">,seafood</isNotEmpty>
+			<isNotEmpty property="turbulence">,turbulence</isNotEmpty>
+			<isNotEmpty property="dairy">,dairy</isNotEmpty>
+			<isNotEmpty property="bean">,bean</isNotEmpty>
+			<isNotEmpty property="none">,none</isNotEmpty>
+			<isNotEmpty property="company">,company</isNotEmpty>
+		) VALUES (
+			NOW()
+			<isNotEmpty property="food_nm">,#prd_nm#</isNotEmpty>
+			<isNotEmpty property="calorie">,#calorie#</isNotEmpty>
+			<isNotEmpty property="srv">,#srv#</isNotEmpty>
+			<isNotEmpty property="carbohydrate">,#carbohydrate#</isNotEmpty>
+			<isNotEmpty property="protein">,#protein#</isNotEmpty>
+			<isNotEmpty property="province">,#province#</isNotEmpty>
+			<isNotEmpty property="sugar">,#sugar#</isNotEmpty>
+			<isNotEmpty property="dietary_fiber">,#dietary_fiber#</isNotEmpty>
+			<isNotEmpty property="dsaturated_fat">,#dsaturated_fat#</isNotEmpty>
+			<isNotEmpty property="trans_fat">,#trans_fat#</isNotEmpty>
+			<isNotEmpty property="cholesterol">,#cholesterol#</isNotEmpty>
+			<isNotEmpty property="salt">,#salt#</isNotEmpty>
+			<isNotEmpty property="vitamina">,#vitamina#</isNotEmpty>
+			<isNotEmpty property="vitaminb1">,#vitaminb1#</isNotEmpty>
+			<isNotEmpty property="vitaminb2">,#vitaminb2#</isNotEmpty>
+			<isNotEmpty property="niacin">,#niacin#</isNotEmpty>
+			<isNotEmpty property="vitaminb6">,#vitaminb6#</isNotEmpty>
+			<isNotEmpty property="vitaminc">,#vitaminc#</isNotEmpty>
+			<isNotEmpty property="vitamind">,#vitamind#</isNotEmpty>
+			<isNotEmpty property="vitamine">,#vitamine#</isNotEmpty>
+			<isNotEmpty property="folic_acid">,#folic_acid#</isNotEmpty>
+			<isNotEmpty property="steel">,#steel#</isNotEmpty>
+			<isNotEmpty property="calcium">,#calcium#</isNotEmpty>
+			<isNotEmpty property="zinc">,#zinc#</isNotEmpty>
+			<isNotEmpty property="potassium">,#potassium#</isNotEmpty>
+			<isNotEmpty property="grain">,#grain#</isNotEmpty>
+			<isNotEmpty property="vegetable">,#vegetable#</isNotEmpty>
+			<isNotEmpty property="fruit">,#fruit#</isNotEmpty>
+			<isNotEmpty property="meat">,#meat#</isNotEmpty>
+			<isNotEmpty property="poultry">,#poultry#</isNotEmpty>
+			<isNotEmpty property="seafood">,#seafood#</isNotEmpty>
+			<isNotEmpty property="turbulence">,#turbulence#</isNotEmpty>
+			<isNotEmpty property="dairy">,#dairy#</isNotEmpty>
+			<isNotEmpty property="bean">,#bean#</isNotEmpty>
+			<isNotEmpty property="none">,#none#</isNotEmpty>
+			<isNotEmpty property="company">,#company#</isNotEmpty>
+		)
+    </insert>
+    
+    <select id="select_commerce_list_self" resultClass="dataMap" parameterClass="dataMap">
+		SELECT 
+			 prd_nm
+		FROM tbl_db_sf_commerce  
+		WHERE 1 = 1          
+		  AND prd_nm like N'%$prd_nm$%'
+    </select>
     
 </sqlMap>

src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_commerce_input.ftl

@@ -78,8 +78,9 @@
 					</div>
 					<div class="profile_list">
 						<h2 class="p_title">정보입력</h2>
-						<input type="button" value="시판 이유식 찾기" onclick="javascript:frmCommerce.go_popup()">  
-						<input type="button" value="시판 이유식 넣기" onclick="javascript:frmCommerce.go_popup_self()">  
+						<input type="button" value="시판 이유식" onclick="javascript:frmCommerce.go_popup()">  
+						<input type="button" value="내가넣은 시판 이유식" onclick="javascript:frmCommerce.go_popup_search()">
+						<input type="button" value="새로운 시판 이유식" onclick="javascript:frmCommerce.go_popup_self()">  
 						<div class="p_list_item p_border_box">
 							<label for="child_height" class="p_label">시판 이유식</label>
 							<div class="p_input_box">
@@ -170,7 +171,7 @@
 			<div class="nutrition_kinds_search">
 				<!-- 검색input -->
 				<p class="search_input">
-					<input type="text" id="prd_nm" name="prd_nm" placeholder="시판이유식 검색창"><a href="javascript:list_more('Y');">검색</a>								
+					<input type="text" id="prd_nm_search" name="prd_nm_search" placeholder="시판이유식 검색창"><a href="javascript:list_more('Y');">검색</a>								
 				</p>
 				<!-- 검색결과 -->
 				<ul id="ul_board" class="search_result">				
@@ -188,41 +189,47 @@
 		      <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">메뉴명</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="메뉴명" data-tit="분" step="0.1">
+			  		  <input type="text" id="prd_nm" name="prd_nm" class="required" placeholder="메뉴명">
+			  	  </div>
+			  </div>
+			  <div class="p_list_item p_border_box">
+			  	  <label for="child_height" class="p_label">제조회사</label>
+			  	  <div class="p_input_box">
+			  		  <input type="text" id="company" name="company" class="required" placeholder="제조회사">
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">칼로리</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="칼로리" data-tit="분" step="0.1">
+			  		  <input type="number" id="calorie" name="calorie" class="required" placeholder="칼로리">
 			  		  <span class="unit">kcal</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">1인분</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="1인분" data-tit="분" step="0.1">
+			  		  <input type="number" id="srv" name="srv" class="required" placeholder="1인분">
 			  		  <span class="unit">g</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">탄수화물</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="탄수화물" data-tit="분" step="0.1">
+			  		  <input type="number" id="carbohydrate" name="carbohydrate" class="required" placeholder="탄수화물">
 			  		  <span class="unit">/750g</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">단백질</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="단백질" data-tit="분" step="0.1">
+			  		  <input type="number" id="protein" name="protein" class="required" placeholder="단백질">
 			  		  <span class="unit">/200g</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">지방</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="지방" data-tit="분" step="0.1">
+			  		  <input type="number" id="province" name="province" class="required" placeholder="지방">
 			  		  <span class="unit">/400g</span>
 			  	  </div>
 			  </div>
@@ -239,133 +246,133 @@
 		      <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">당</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="당" data-tit="분" step="0.1">
+			  		  <input type="number" id="sugar" name="sugar" class="required" placeholder="당">
 			  		  <span class="unit">/750g</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">식이섬유</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="식이섬유" data-tit="분" step="0.1">
+			  		  <input type="number" id="dietary_fiber" name="dietary_fiber" class="required" placeholder="식이섬유">
 			  		  <span class="unit">/30g</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">포화지방</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="포화지방" data-tit="분" step="0.1">
+			  		  <input type="number" id="dsaturated_fat" name="dsaturated_fat" class="required" placeholder="포화지방">
 			  		  <span class="unit">/350g</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">트랜스지방</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="트랜스지방" data-tit="분" step="0.1">
+			  		  <input type="number" id="trans_fat" name="trans_fat" class="required" placeholder="트랜스지방">
 			  		  <span class="unit">/200g</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">콜레스테롤</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="콜레스테롤" data-tit="분" step="0.1">
+			  		  <input type="number" id="cholesterol" name="cholesterol" class="required" placeholder="콜레스테롤">
 			  		  <span class="unit">/300mg</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">나트륨</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="나트륨" data-tit="분" step="0.1">
+			  		  <input type="number" id="salt" name="salt" class="required" placeholder="나트륨">
 			  		  <span class="unit">/1500mg</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">비타민A</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="비타민A" data-tit="분" step="0.1">
+			  		  <input type="number" id="vitamina" name="vitamina" class="required" placeholder="비타민A">
 			  		  <span class="unit">/3000ug RAE</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">비타민B1</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="비타민B1" data-tit="분" step="0.1">
+			  		  <input type="number" id="vitaminb1" name="vitaminb1" class="required" placeholder="비타민B1">
 			  		  <span class="unit">/350mg</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">비타민B2</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="비타민B2" data-tit="분" step="0.1">
+			  		  <input type="number" id="vitaminb2" name="vitaminb2" class="required" placeholder="비타민B2">
 			  		  <span class="unit">/350mg</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">나이아신</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="나이아신" data-tit="분" step="0.1">
+			  		  <input type="number" id="niacin" name="niacin" class="required" placeholder="나이아신">
 			  		  <span class="unit">/350mg NE</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">비타민B6</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="비타민B6" data-tit="분" step="0.1">
+			  		  <input type="number" id="vitaminb6" name="vitaminb6" class="required" placeholder="비타민B6">
 			  		  <span class="unit">/100mg</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">비타민C</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="비타민C" data-tit="분" step="0.1">
+			  		  <input type="number" id="vitaminc" name="vitaminc" class="required" placeholder="비타민C">
 			  		  <span class="unit">/2000mg</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">비타민D</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="비타민D" data-tit="분" step="0.1">
+			  		  <input type="number" id="vitamind" name="vitamind" class="required" placeholder="비타민D">
 			  		  <span class="unit">/100ug</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">비타민E</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="비타민E" data-tit="분" step="0.1">
+			  		  <input type="number" id="vitamine" name="vitamine" class="required" placeholder="비타민E">
 			  		  <span class="unit">/540mg a-TE</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">엽산</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="엽산" data-tit="분" step="0.1">
+			  		  <input type="number" id="folic_acid" name="folic_acid" class="required" placeholder="엽산">
 			  		  <span class="unit">/1000ug DFE</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">철</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="철" data-tit="분" step="0.1">
+			  		  <input type="number" id="steel" name="steel" class="required" placeholder="철">
 			  		  <span class="unit">/3000mg</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">칼슘</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="칼슘" data-tit="분" step="0.1">
+			  		  <input type="number" id="calcium" name="calcium" class="required" placeholder="칼슘">
 			  		  <span class="unit">/3000mg</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">아연</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="아연" data-tit="분" step="0.1">
+			  		  <input type="number" id="zinc" name="zinc" class="required" placeholder="아연">
 			  		  <span class="unit">/3000mg</span>
 			  	  </div>
 			  </div>
 			  <div class="p_list_item p_border_box">
 			  	  <label for="child_height" class="p_label">칼륨</label>
 			  	  <div class="p_input_box">
-			  		  <input type="number" id="eat_minute" name="eat_minute" value="${model['df_minute']!}" class="required" placeholder="칼륨" data-tit="분" step="0.1">
+			  		  <input type="number" id="potassium" name="potassium" class="required" placeholder="칼륨">
 			  		  <span class="unit">/3000mg</span>
 			  	  </div>
 			  </div>
@@ -380,46 +387,65 @@
 	  <div class="content">
 	      <div class="profile_list">
 		      <div class="checkbox">
-                <input type="checkbox" id="agree_privacy" name="agree_privacy">
-                <label for="agree_privacy">곡류군</label>
+                <input type="checkbox" id="agree_grain" name="agree_grain">
+                <label for="agree_grain">곡류군</label>
               </div>
               <div class="checkbox">
-                <input type="checkbox" id="agree_privacy" name="agree_privacy">
-                <label for="agree_privacy">채소군</label>
+                <input type="checkbox" id="agree_vegetable" name="agree_vegetable">
+                <label for="agree_vegetable">채소군</label>
               </div>
               <div class="checkbox">
-                <input type="checkbox" id="agree_privacy" name="agree_privacy">
-                <label for="agree_privacy">과일군</label>
+                <input type="checkbox" id="agree_fruit" name="agree_fruit">
+                <label for="agree_fruit">과일군</label>
               </div>
               <div class="checkbox">
-                <input type="checkbox" id="agree_privacy" name="agree_privacy">
-                <label for="agree_privacy">육류</label>
+                <input type="checkbox" id="agree_meat" name="agree_meet">
+                <label for="agree_meat">육류</label>
               </div>
               <div class="checkbox">
-                <input type="checkbox" id="agree_privacy" name="agree_privacy">
-                <label for="agree_privacy">가금류</label>
+                <input type="checkbox" id="agree_poultry" name="agree_poultry">
+                <label for="agree_poultry">가금류</label>
               </div>
               <div class="checkbox">
-                <input type="checkbox" id="agree_privacy" name="agree_privacy">
-                <label for="agree_privacy">어패류</label>
+                <input type="checkbox" id="agree_seafood" name="agree_seafood">
+                <label for="agree_seafood">어패류</label>
               </div>
               <div class="checkbox">
-                <input type="checkbox" id="agree_privacy" name="agree_privacy">
-                <label for="agree_privacy">난류</label>
+                <input type="checkbox" id="agree_turbulence" name="agree_turbulence">
+                <label for="agree_turbulence">난류</label>
               </div>
               <div class="checkbox">
-                <input type="checkbox" id="agree_privacy" name="agree_privacy">
-                <label for="agree_privacy">유제품류</label>
+                <input type="checkbox" id="agree_dairy" name="agree_dairy">
+                <label for="agree_dairy">유제품류</label>
               </div>
               <div class="checkbox">
-                <input type="checkbox" id="agree_privacy" name="agree_privacy">
-                <label for="agree_privacy">콩류</label>
+                <input type="checkbox" id="agree_bean" name="agree_bean">
+                <label for="agree_bean">콩류</label>
               </div>
               <div class="checkbox">
-                <input type="checkbox" id="agree_privacy" name="agree_privacy">
-                <label for="agree_privacy">해당없음</label>
+                <input type="checkbox" id="agree_none" name="agree_none">
+                <label for="agree_none">해당없음</label>
+              </div>
+			  <input type="button" value="저장하기" onclick="javascript:frmCommerce.go_popup_self4()">  
+		  </div>	  
+	  </div>
+    </div>
+    
+    <div id="popup_search" class="Pstyle">
+
+	  <span class="b-close">X</span>
+	  <div class="content">
+		<div class="nutrition_kinds_basic">
+			<h2>시판이유식을 선택해주세요.</h2>
+			<div class="nutrition_kinds_search">
+				<!-- 검색input -->
+				<p class="search_input">
+					<input type="text" id="prd_nm_search2" name="prd_nm_search2" placeholder="시판이유식 검색창"><a href="javascript:list_more2('Y');">검색</a>								
+				</p>
+				<!-- 검색결과 -->
+				<ul id="ul_board2" class="search_result">				
+				</ul>
 			</div>
-			  <input type="button" value="저장하기" onclick="javascript:frmCommerce.go_popup_self2()">  
 		</div>
 	  </div>
     </div>
@@ -526,6 +552,92 @@
    		go_popup_self3: function() {
 			$('#popup_self3').bPopup();
 			$('#popup_self2').bPopup().close();
+   		},
+   		go_popup_self4: function() {
+			$('#popup_self3').bPopup().close();
+			this.ajax_insert_self()
+   		},
+   		go_popup_search: function() {
+			$('#popup_search').bPopup();
+   		},
+   		ajax_insert_self: function(){
+			
+			var self = {}
+			self.prd_nm = $('#prd_nm').val()
+			self.company = $('#company').val()
+			self.calorie = $('#calorie').val()
+			self.srv = $('#srv').val()
+			self.carbohydrate = $('#carbohydrate').val()
+			self.protein = $('#protein').val()
+			self.province = $('#province').val()
+			self.sugar = $('#sugar').val()
+			self.dietary_fiber = $('#dietary_fiber').val()
+			self.dsaturated_fat = $('#dsaturated_fat').val()
+			self.trans_fat = $('#trans_fat').val()
+			self.cholesterol = $('#cholesterol').val()
+			self.salt = $('#salt').val()
+			self.vitamina = $('#vitamina').val()
+			self.vitaminb1 = $('#vitaminb1').val()
+			self.vitaminb2 = $('#vitaminb2').val()
+			self.niacin = $('#niacin').val()
+			self.vitaminb6 = $('#vitaminb6').val()
+			self.vitaminc = $('#vitaminc').val()
+			self.vitamind = $('#vitamind').val()
+			self.vitamine = $('#vitamine').val()
+			self.folic_acid = $('#folic_acid').val()
+			self.steel = $('#steel').val()
+			self.calcium = $('#calcium').val()
+			self.zinc = $('#zinc').val()
+			self.potassium = $('#potassium').val()
+			if($(agree_grain).is(":checked") == true){
+				self.grain = "Y"
+			}
+			if($(agree_vegetable).is(":checked") == true){
+				self.vegetable = "Y"
+			}
+			if($(agree_fruit).is(":checked") == true){
+				self.fruit = "Y"
+			}
+			if($(agree_meat).is(":checked") == true){
+				self.meat = "Y"
+			}
+			if($(agree_poultry).is(":checked") == true){
+				self.poultry = "Y"
+			}
+			if($(agree_seafood).is(":checked") == true){
+				self.seafood = "Y"
+			}
+			if($(agree_turbulence).is(":checked") == true){
+				self.turbulence = "Y"
+			}
+			if($(agree_dairy).is(":checked") == true){
+				self.dairy = "Y"
+			}
+			if($(agree_bean).is(":checked") == true){
+				self.bean = "Y"
+			}
+			if($(agree_none).is(":checked") == true){
+				self.none = "Y"
+			}
+			
+			$.ajax({
+				url:'${URL_ROOT}/m/bf_food/ajax_insert_self.do?1=1',
+				type:'post',
+				data: self,
+				dataType:'json',
+				error:function(request,status,error){
+					Swal.fire({text:"등록되지 않았습니다"})
+				},
+				success:function(result){
+					console.log(result)
+					var RESULT = result.RESULT
+					if(RESULT == 0){ //0:RESULT_SUCCESS
+						Swal.fire({text:"입력되었습니다"}).then((result) => { location.replace('./view_bf_commerce_input.do?smc_no=${(model["smc_no"])!}') })
+					}else{
+						Swal.fire({text:"등록되지 않았습니다"})
+					}
+				},
+			})
 		}
 	}
 	
@@ -553,9 +665,9 @@
 		$('#ul_board').empty();
 	 	}
 	 	
-	 	 var prd_nm = $('#prd_nm').val();
+	 	 var prd_nm_search = $('#prd_nm_search').val();
 	 	 
-	 	 ajax_data(prd_nm);
+	 	 ajax_data(prd_nm_search);
 	 }
 	 
 	 function ajax_data(keyword){		
@@ -568,7 +680,7 @@
 	            nextPage = (nowPage + 1);
 
 	            $.ajax({
-	            	url:'${URL_ROOT}/m/db/db_nutrient/ajax_list_db_nutrient.do',
+	            	url:'${URL_ROOT}/m/bf_food/ajax_list_db_commerce.do',
 	                   type:'get',
 	                   data: {                     
 	                	   "prd_nm" : keyword ,
@@ -621,9 +733,84 @@
         }
     }
     
+    function list_more2(is_new) {
+	 	if(is_new == 'Y'){
+	 		nowPage = 0;
+		$('#ul_board').empty();
+	 	}
+	 	
+	 	 var prd_nm_search2 = $('#prd_nm_search2').val();
+	 	 
+	 	 ajax_data(prd_nm_search2);
+	 }
+	 
+	 function ajax_data(keyword){		
+        if(keyword == ''){
+        	Swal.fire({text: '검색어를 입력해주세요'});
+        }else{
+	        if (is_loading == false) { 
+	            is_loading = true;
+	            
+	            nextPage = (nowPage + 1);
+
+	            $.ajax({
+	            	url:'${URL_ROOT}/m/bf_food/ajax_list_db_commerce_self.do',
+	                   type:'get',
+	                   data: {                     
+	                	   "prd_nm" : keyword ,
+	                       "nowPage":nextPage
+	                   },
+	                   dataType:'json',
+	                   error:function(request,status,error){
+	                       is_stop_more = false;
+	                   },
+	                   success:function(result){
+	                        var html = '';
+	                        
+	                        nowPage = Number(result.page.nowPage);
+	                        maxPage = Number(result.page.maxPage);
+	                        
+	                        $('#nowPage').text(nowPage);
+	                        
+	                        if(nowPage == maxPage){
+	                            $('.more_btn_box').remove();
+	                        }
+
+	                        if(result.list != null && result.list.length > 0) {	    
+	                            for(var i=0;i<result.list.length;i++) {
+	                                var dn_no = result.list[i].dn_no;
+	                                var prd_nm = result.list[i].prd_nm;
+	                                var company = result.list[i].company;                                    
+	                                var barcode = result.list[i].barcode;                               
+	                                var imgurl1 = result.list[i].imgurl1;
+	                                                
+									html +='<li><a href="javascript:save_set(\'db_dn_no\', \'' + dn_no + '\', \'' + prd_nm + '\');"><img src="' + imgurl1 + '" alt="섭취량 이미지" />' + prd_nm + '</a></li>';
+	                            }
+	                            
+	                            var ul_board2 = $('#ul_board2');
+	                            ul_board2.append(html);
+	                            
+	                            ul_board2.on( 'scroll', function(){
+	                        		var top =ul_board2.height() + ul_board2.prop("scrollTop");
+	                        		var scrolHeight = ul_board2.prop("scrollHeight");
+	                        		
+	                        	   if(top > scrolHeight - 5) {
+	                        		   list_more('N')
+	                        	   }
+	                        	});	                            
+	                        }
+	                        
+	                        is_loading = false;
+	                   }
+	            });            
+	        }
+        }
+    }
+    
     function save_set(col, val, title){	
 		$('#last_prd_nm').val(title);
 		$('#popup').bPopup().close();
+		$('#popup_search').bPopup().close();
 	}
     
 	 </script>