change inController

src/main/java/com/no1/wms/in/InController.java

@@ -79,37 +79,7 @@ public class InController {
 	@PostMapping("/create_process")
 	@ResponseBody
 	public boolean createProcess(InDto dto) {
-		int j = inService.checkIfExistsStock(dto);
+		return inService.chechAndUpdateOrCreateProcess(dto);
-		if(j == 1) {
-			int k = inService.updateStockProcess(dto);
-			if(k == 1) {
-				int i = inService.createProcess(dto);
-				if(i == k) {
-					System.out.println("달라서 새로만듬");
-					return true;
-				}else {
-					return false;
-				}
-			}else {
-				return false;
-			}
-			
-		}else if(j == 0) {
-			int k = inService.createStockProcess(dto);
-			if(k == 1) {
-				int i = inService.createProcess(dto);
-				if(i == k) {
-					System.out.println("같아서 합침");
-					return true;
-				}else {
-					return false;
-				}
-			}else {
-				return false;
-			}
-		}else {
-			return false;
-		}
 	}
 	
 	@PostMapping("/read")
@@ -202,8 +172,8 @@ public class InController {
         List<Map<String, Object>> list = null;
         int count = 0;
 
-        list = stockservice.warehousesSelect(searchn, search, startRow, perPage, product_id);
+        list = stockservice.warehousesSelect(searchn, search, startRow, perPage);
-        count = stockservice.warehouseCount(searchn, search, product_id);
+        count = stockservice.warehouseCount(searchn, search);
 
 
         mav.addObject("list", list);

src/main/java/com/no1/wms/in/InService.java

@@ -58,4 +58,45 @@ public class InService {
 		return mapper.createStockProcess(dto);
 	}
 	
+	//createProcess
+	public boolean chechAndUpdateOrCreateProcess(InDto dto) {
+		int j = mapper.checkIfExistsStock(dto);
+		if(j == 1) {
+			int k = mapper.updateStockProcess(dto);
+			if(k == 1) {
+				int i = mapper.createProcess(dto);
+				if(i == k) {
+					System.out.println("달라서 새로만듬");
+					return true;
+				}else {
+					return false;
+				}
+			}else {
+				return false;
+			}
+			
+		}else if(j == 0) {
+			int k = mapper.createStockProcess(dto);
+			if(k == 1) {
+				int i = mapper.createProcess(dto);
+				if(i == k) {
+					System.out.println("같아서 합침");
+					return true;
+				}else {
+					return false;
+				}
+			}else {
+				return false;
+			}
+		}else {
+			return false;
+		}
+	}
+	
+	
+	
+	
+	
+	
+	
 }

src/main/webapp/WEB-INF/views/in/update.jsp

@@ -103,6 +103,7 @@
 
                         <c:set var="userData" value="${sessionScope.userData}" />
                         <input type='hidden' id="manager_id" value="${userData.id}">
+                        <input type='hidden' id="id" value="${dto.id}">
                     </div>
                 </div>
             </div>
@@ -216,41 +217,41 @@
           });//submitBtn
         
 	});//ready
-	function showSearchModal(title, val){
+	function showSearchModal_product(title, val){
-        $("#searchModalLabel").text(title);
+	       $("#searchModalLabel").text(title);
-        const data = { name : val};
+	       const data = { name : val};
-        $.ajax({
+	       $.ajax({
-            type : 'post',           // 타입 (get, post, put 등등)
+	           type : 'post',           // 타입 (get, post, put 등등)
-            url : '/product/show_modal',           // 요청할 서버url
+	           url : '/in/show_modal_product',           // 요청할 서버url
-            dataType : 'html',       // 데이터 타입 (html, xml, json, text 등등)
+	           dataType : 'html',       // 데이터 타입 (html, xml, json, text 등등)
-            data : data,
+	           data : data,
-            success : function(result) { // 결과 성공 콜백함수
+	           success : function(result) { // 결과 성공 콜백함수
-                $("#search_modal_body").html(result);
+	               $("#search_modal_body").html(result);
-                searchModalBootStrap.show();
+	               searchModalBootStrap.show();
-            },
+	           },
-            error : function(request, status, error) {
+	           error : function(request, status, error) {
-                alert(error)
+	               alert(error)
-            }
+	           }
-        });
+	       });
-    }
+	   }//showSearchModal_products
 	
-	 function showSearchModal2(title, val){
+	function showSearchModal_warehouse(title, val){
-	        $("#searchModalLabel").text(title);
+	     $("#searchModalLabel").text(title);
-	        const data = { name : val};
+	     const data = { name : val};
-	        $.ajax({
+	     $.ajax({
-	            type : 'post',           // 타입 (get, post, put 등등)
+	         type : 'post',           // 타입 (get, post, put 등등)
-	            url : '/product/show_modal2',           // 요청할 서버url
+	         url : '/in/show_modal_warehouse',           // 요청할 서버url
-	            dataType : 'html',       // 데이터 타입 (html, xml, json, text 등등)
+	         dataType : 'html',       // 데이터 타입 (html, xml, json, text 등등)
-	            data : data,
+	         data : data,
-	            success : function(result) { // 결과 성공 콜백함수
+	         success : function(result) { // 결과 성공 콜백함수
-	                $("#search_modal_body").html(result);
+	             $("#search_modal_body").html(result);
-	                searchModalBootStrap.show();
+	             searchModalBootStrap.show();
-	            },
+	         },
-	            error : function(request, status, error) {
+	         error : function(request, status, error) {
-	                alert(error)
+	             alert(error)
-	            }
+	         }
-	        });
+	     	});
-	    }
+ 	}//showSearchModal_warehouse
 	</script>
 </body>
 </html>