Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/mappers/StockMapper.xml

build.gradle

@@ -19,15 +19,19 @@ repositories {
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-jdbc'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
-	implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.3.0'
+	implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3'
 	compileOnly 'org.projectlombok:lombok'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
 	annotationProcessor 'org.projectlombok:lombok'
-	implementation group: 'org.glassfish.web', name: 'jakarta.servlet.jsp.jstl', version: '2.0.0'
+	// https://mvnrepository.com/artifact/javax.servlet/jstl
+	implementation group: 'javax.servlet', name: 'jstl', version: '1.2'
+
+
+
 	implementation 'org.apache.tomcat.embed:tomcat-embed-jasper'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-	testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:2.3.0'
+	testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:2.1.3'
 	// https://mvnrepository.com/artifact/com.google.code.gson/gson
 	implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
 	// https://mvnrepository.com/artifact/org.apache.poi/poi

src/main/java/com/no1/wms/authority/AuthorityController.java

@@ -5,6 +5,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;
 
+import java.util.UUID;
+
 @Controller
 public class AuthorityController {
     @Autowired
@@ -12,10 +14,11 @@ public class AuthorityController {
 
 
     @GetMapping("/test/tt")
-    public ModelAndView test(ModelAndView mav){
+    public ModelAndView test(ModelAndView mav, AuthorityDto d){
-        //AuthorityDto dto = authorityService.selectById("94690a18-a933-11ee-b9dd-0242ac110006");
+        d.setId("94690a18-a933-11ee-b9dd-0242ac110006");
+        AuthorityDto dto = authorityService.selectById(d);
 
-        //System.out.println(dto.getName());
+        System.out.println(dto.getName());
 
         mav.setViewName("test/testlayout");
         return mav;

src/main/java/com/no1/wms/authority/AuthorityDto.java

@@ -10,20 +10,21 @@ import java.util.UUID;
 @AllArgsConstructor
 @Alias("AuthorityDto")
 public class AuthorityDto {
-    private UUID id;
+    private String id;
     private String name;
-    private int account;
+    private Integer account;
-    private int authority;
+    private Integer authority;
-    private int productCategory;
+    private Integer productCategory;
-    private int product;
+    private Integer product;
-    private int prices;
+    private Integer prices;
-    private int vendor;
+    private Integer vendor;
-    private int warehouse;
+    private Integer warehouse;
-    private int stock;
+    private Integer stock;
-    private int planIn;
+    private Integer planIn;
-    private int productIn;
+    private Integer productIn;
-    private int productOut;
+    private Integer productOut;
-    private int board;
+    private Integer board;
-    private boolean activation;
+    private Boolean activation;
-    private boolean isGroupAuthority;
+    private Boolean isGroupAuthority;
+
 }

src/main/java/com/no1/wms/authority/AuthorityMapper.java

@@ -1,11 +1,12 @@
 package com.no1.wms.authority;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
 
 import java.util.UUID;
 
-
+@Repository
 @Mapper
 public interface AuthorityMapper {
-    AuthorityDto selectById(String id);
+    AuthorityDto selectById(AuthorityDto id);
 }

src/main/java/com/no1/wms/authority/AuthorityService.java

@@ -11,7 +11,7 @@ public class AuthorityService {
 
     @Autowired
     AuthorityMapper mapper;
-    public AuthorityDto selectById(String id){
+    public AuthorityDto selectById(AuthorityDto dto){
-        return mapper.selectById(id);
+        return mapper.selectById(dto);
     }
 }

src/main/java/com/no1/wms/base/WebConfig.java

@@ -1,6 +1,7 @@
 package com.no1.wms.base;
 
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

src/main/java/com/no1/wms/category/CategoryController.java

@@ -2,6 +2,8 @@ package com.no1.wms.category;
 
 import java.util.List;
 
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -16,7 +18,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.no1.wms.excel.ExcelUtils;
 
-import javax.servlet.http.HttpServletResponse;
 
 
 @Controller

src/main/java/com/no1/wms/excel/ExcelUtils.java

@@ -4,6 +4,8 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -13,7 +15,8 @@ import org.springframework.stereotype.Service;
 
 import com.no1.wms.category.CategoryDto;
 
-import javax.servlet.http.HttpServletResponse;
+
+
 
 @Service
 public class ExcelUtils {

src/main/resources/static/css/base.css

@@ -19,3 +19,44 @@
 #search_modal_content{
     height : 80vh;
 }
+
+.w-10{
+    width : 10%!important;
+}
+
+.w-15{
+    width : 15%!important;
+}
+
+.w-20{
+    width : 20%!important;
+}
+
+.w-25{
+    width : 25%!important;
+}
+
+.w-30{
+    width : 30%!important;
+}
+.w-35{
+    width : 35%!important;
+}
+.w-40{
+    width : 40%!important;
+}
+.w-45{
+    width : 45%!important;
+}
+.w-50{
+    width : 50%!important;
+}
+.w-55{
+    width : 50%!important;
+}
+.w-60{
+    width : 60%!important;
+}
+.w-65{
+    width : 65%!important;
+}

src/main/resources/static/dev/base.css

@@ -19,3 +19,44 @@
 #search_modal_content{
     height : 80vh;
 }
+
+.w-10{
+    width : 10%!important;
+}
+
+.w-15{
+    width : 15%!important;
+}
+
+.w-20{
+    width : 20%!important;
+}
+
+.w-25{
+    width : 25%!important;
+}
+
+.w-30{
+    width : 30%!important;
+}
+.w-35{
+    width : 35%!important;
+}
+.w-40{
+    width : 40%!important;
+}
+.w-45{
+    width : 45%!important;
+}
+.w-50{
+    width : 50%!important;
+}
+.w-55{
+    width : 50%!important;
+}
+.w-60{
+    width : 60%!important;
+}
+.w-65{
+    width : 65%!important;
+}

src/main/webapp/WEB-INF/views/category/create.jsp

@@ -5,15 +5,6 @@
 <meta charset="UTF-8">
 <title>카테고리 생성</title>
 <style>
-.ulTag {
-	padding: 0;
-}
-
-li {
-	display: inline-block;
-	width: 130px;
-	margin-right: 10px;
-}
 
 input {
 	display: inline-block;
@@ -22,34 +13,66 @@ input {
 #checkKan {
 	margin-left: 10px; /* .checkKan 버튼과 옆의 input 사이 간격 조절 */
 }
+.header {
+	text-align: center;
+	color: white;
+}
+.body{
+	text-align: center;
+}
+
 </style>
 </head>
 <body>
 	<div class="header">
-		<h1>제품 카테고리 생성</h1>
+		<h1><b>제품 카테고리 생성</b></h1>
 	</div>
 	<hr>
 	<div class="body">
 		<form id="createForm">
 			<div class="ulTag">
-				<ul>
+				<div class="row">
-					<li>대분류</li>
+	                <div class="col-12">
+		                <div class="input-group mb-3">
+		                	<span class="input-group-text" id="basic-addon1">대분류</span>
+		                	<input type="text" name="cls_nm_1" class="form-control" placeholder="대분류를 입력하세요" aria-label="대분류" aria-describedby="basic-addon1">
+	                	</div>
+	                	<!-- 설명만 있는 입력 -->
+	                	<div class="input-group mb-3">
+		                	<span class="input-group-text" id="basic-addon1">중분류</span>
+		                	<input type="text" name="cls_nm_2" class="form-control" placeholder="중분류를 입력하세요" aria-label="중분류" aria-describedby="basic-addon1">
+	                	</div>
+	                	<div class="input-group mb-3">
+		                	<span class="input-group-text" id="basic-addon1">소분류</span>
+		                	<input type="text" name="cls_nm_3" class="form-control" placeholder="소분류를 입력하세요" aria-label="소분류" aria-describedby="basic-addon1">
+	                	</div>
+	                	<div class="input-group mb-3">
+		                	<span class="input-group-text" id="basic-addon1">중분류</span>
+		                	<input type="text" name="cls_nm_4" class="form-control" placeholder="세분류를 입력하세요" aria-label="세분류" aria-describedby="basic-addon1">
+	                	</div>
+	                	<div class="input-group mb-3">
+  							<input type="text" name="kan_code" class="form-control" placeholder="KAN 분류코드" aria-label="KAN 분류코드" aria-describedby="button-addon2">
+  							<button class="btn btn-outline-secondary" style="background-color:#FF5E5E;" type="button" id="button-addon2">중복확인</button>
+						</div>
+                	</div>
+            	</div>
+					대분류
 					<input type="text" name="cls_nm_1">
-					<br>
+					
-					<li>중분류</li>
+					중분류
 					<input type="text" name="cls_nm_2">
-					<br>
+					
-					<li>소분류</li>
+					소분류
 					<input type="text" name="cls_nm_3">
-					<br>
+					
-					<li>세분류</li>
+					세분류
 					<input type="text" name="cls_nm_4">
-					<br>
+					
-					<li>KAN 분류코드</li>
+					KAN 분류코드
 					<input type="text" name="kan_code" id="kan_code">
 					<input type="button" id="checkKan" value="중복확인">
 					<span id="chackDiv"></span>
-				</ul>
+				
 			</div>
 			<div class="Btn">
 				<button id="commit">생성</button>

src/main/webapp/WEB-INF/views/category/list.jsp

@@ -9,41 +9,6 @@
 .header {
 	text-align: center;
 }
-
-.body {
-	width: 80%;
-	margin: 20px auto;
-}
-
-.searchDropdown {
-	text-align: center;
-	display: inline-block;
-	margin-right: 10px;
-}
-
-select {
-	padding: 8px;
-}
-.search{
-	position: relative;
-	left: 70%;
-}
-
-.searchInput {
-	display: inline-block;
-	padding: 8px;
-}
-
-.searchButton {
-	display: inline-block;
-}
-
-
-table {
-	width: 100%;
-	border-collapse: collapse;
-	text-align: center;
-}
 </style>
 </head>
 <body>
@@ -54,7 +19,7 @@ table {
 	</div>
 	<hr>
 	<div class="body">
-		<div class="search">
+		<div class="search12">
 			<form action="categorysearch">
 				<div class="searchDropdown" id="searchDropdown">
 					<select>
@@ -72,7 +37,7 @@ table {
 				</div>
 		</div>
 		</form>
-		<div class="table">
+		<div class="table12">
 			<table>
 				<tr>
 					<th>KAN코드</th>
@@ -98,7 +63,7 @@ table {
 			<img alt="엑셀다운로드 이미지" src="엑셀다운로드 이미지">
 			<button id="uploadExcel" value="업로드">업로드</button>
 		</div>
-		<div class="paging">
+		<div class="paging12">
 			<!-- 페이징 -->
 		</div>
 		<div class="createButton">