Merge remote-tracking branch 'origin/master'

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

@@ -91,6 +91,7 @@ public class AuthAspect {
         data.setEmployeeNumber("11232");
         HttpSession session = request.getSession();
 
+
         AccountDto dto = accountService.selectByLogin(data);
         if(dto.getPassword().equals(data.getPassword())){
             authDto.setId(dto.getPersonalAuthorityId());
@@ -102,6 +103,7 @@ public class AuthAspect {
             auth.put("category",getAuthArrayFromInt(authDto.getProductCategory()));
             auth.put("product",getAuthArrayFromInt(authDto.getProduct()));
             auth.put("price",getAuthArrayFromInt(authDto.getPrices())); //prices
+            auth.put("planin",getAuthArrayFromInt(authDto.getPrices())); //prices
             auth.put("vendor",getAuthArrayFromInt(authDto.getVendor()));
             auth.put("warehouse",getAuthArrayFromInt(authDto.getWarehouse()));
             auth.put("stock",getAuthArrayFromInt(authDto.getStock()));

src/main/java/com/no1/wms/planin/PlanInController.java

@@ -1,8 +1,5 @@
 package com.no1.wms.planin;
 
-import com.no1.wms.account.AccountDto;
-import com.no1.wms.planin.PlanInService;
-
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +12,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 
 @Controller
-@RequestMapping("planin")
+@RequestMapping("plan_in")
 public class PlanInController {
     @Autowired
     PlanInService planinservice;
@@ -35,7 +32,7 @@ public class PlanInController {
 
 
         //스톡서비스로 재고 리스트 출력 메서트 작성
-        List<AccountDto> list = planinservice.selectAll(searchn, search, startRow, perPage);
+        List<PlanInDto> list = planinservice.selectAll(searchn, search, startRow, perPage);
 
         int begin = (page - 1) / pageNum * pageNum + 1;
         int end = begin + pageNum - 1;
@@ -49,7 +46,7 @@ public class PlanInController {
         mav.addObject("pageNum", pageNum);
         mav.addObject("begin", begin);
         mav.addObject("page", page);
-        mav.setViewName("account/list");
+        mav.setViewName("planin/list");
         return mav;
     }
 	

src/main/java/com/no1/wms/planin/PlanInDto.java

@@ -1,5 +1,46 @@
 package com.no1.wms.planin;
 
-public class PlanInDto {
+import java.util.Date;
 
+import org.apache.ibatis.type.Alias;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.no1.wms.account.AccountDto;
+import com.no1.wms.product.ProductDto;
+import com.no1.wms.vendor.VendorDto;
+import com.no1.wms.warehouse.WarehouseDto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Alias("PlanInDto")
+public class PlanInDto {
+	private String groupNumber;
+	private String productId;
+	private Integer quantity;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date date;
+	private String vendorId;
+	private String managerId;
+	private String warehouseId;
+	private String qrHash;
+	private String url;
+	private Boolean clear;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date vendorDate;
+	private String other;
+	private Boolean activation;
+	private Integer viewGroupNumber;
+	private String oldProductId;
+	
+	private ProductDto productDto;
+	private VendorDto vendorDto;
+	private AccountDto accountDto;
+	private WarehouseDto warehouseDto;
 }

src/main/java/com/no1/wms/planin/PlanInMapper.java

@@ -6,13 +6,11 @@ import java.util.Map;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
-import com.no1.wms.account.AccountDto;
-
 @Repository
 @Mapper
 public interface PlanInMapper {
 	
-    List<AccountDto> selectAll(Map<String, Object> m);
+    List<PlanInDto> selectAll(Map<String, Object> m);
 	
     int count(Map<String, Object> m);
 }

src/main/java/com/no1/wms/planin/PlanInService.java

@@ -6,14 +6,12 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.no1.wms.account.AccountDto;
-
 @Service
 public class PlanInService {
 	@Autowired
 	PlanInMapper mapper;
 	
-    public List<AccountDto> selectAll(int searchn, String search, int start, int perPage){
+    public List<PlanInDto> selectAll(int searchn, String search, int start, int perPage){
         HashMap<String, Object> map = new HashMap<String, Object>();
         map.put("search", search);
         map.put("start", start);