From cb3684f1b303f066abb43292c72854ee6a249837 Mon Sep 17 00:00:00 2001 From: Suh Date: Wed, 17 Jan 2024 16:21:06 +0900 Subject: [PATCH 1/3] auth aspect --- src/main/java/com/no1/wms/base/AuthAspect.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/no1/wms/base/AuthAspect.java b/src/main/java/com/no1/wms/base/AuthAspect.java index 3553aa9..20a7d25 100644 --- a/src/main/java/com/no1/wms/base/AuthAspect.java +++ b/src/main/java/com/no1/wms/base/AuthAspect.java @@ -102,6 +102,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())); From 80251dd3383f4e1c716faf55de5fdcfe5ca4c1ad Mon Sep 17 00:00:00 2001 From: Suh Date: Wed, 17 Jan 2024 16:21:41 +0900 Subject: [PATCH 2/3] auth aspect --- src/main/java/com/no1/wms/base/AuthAspect.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/no1/wms/base/AuthAspect.java b/src/main/java/com/no1/wms/base/AuthAspect.java index 20a7d25..9c79cb3 100644 --- a/src/main/java/com/no1/wms/base/AuthAspect.java +++ b/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()); From f7666aa84fb237f142b5f8faee8bd6e04d19b9fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=B5=E1=86=B7=E1=84=86=E1=85=B5=E1=86=AB?= =?UTF-8?q?=E1=84=80=E1=85=AE?= Date: Wed, 17 Jan 2024 16:48:32 +0900 Subject: [PATCH 3/3] Planinn list --- .../com/no1/wms/planin/PlanInController.java | 9 +-- .../java/com/no1/wms/planin/PlanInDto.java | 43 ++++++++++- .../java/com/no1/wms/planin/PlanInMapper.java | 4 +- .../com/no1/wms/planin/PlanInService.java | 4 +- src/main/resources/mappers/PlainInMapper.xml | 12 +-- src/main/webapp/WEB-INF/views/planin/list.jsp | 74 +++++++++++++++++++ 6 files changed, 127 insertions(+), 19 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/planin/list.jsp diff --git a/src/main/java/com/no1/wms/planin/PlanInController.java b/src/main/java/com/no1/wms/planin/PlanInController.java index 87be4e5..c413a06 100644 --- a/src/main/java/com/no1/wms/planin/PlanInController.java +++ b/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 list = planinservice.selectAll(searchn, search, startRow, perPage); + List 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; } diff --git a/src/main/java/com/no1/wms/planin/PlanInDto.java b/src/main/java/com/no1/wms/planin/PlanInDto.java index 6002619..e4cdc01 100644 --- a/src/main/java/com/no1/wms/planin/PlanInDto.java +++ b/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; } diff --git a/src/main/java/com/no1/wms/planin/PlanInMapper.java b/src/main/java/com/no1/wms/planin/PlanInMapper.java index c25aada..fb395e1 100644 --- a/src/main/java/com/no1/wms/planin/PlanInMapper.java +++ b/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 selectAll(Map m); + List selectAll(Map m); int count(Map m); } diff --git a/src/main/java/com/no1/wms/planin/PlanInService.java b/src/main/java/com/no1/wms/planin/PlanInService.java index d26659a..534d995 100644 --- a/src/main/java/com/no1/wms/planin/PlanInService.java +++ b/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 selectAll(int searchn, String search, int start, int perPage){ + public List selectAll(int searchn, String search, int start, int perPage){ HashMap map = new HashMap(); map.put("search", search); map.put("start", start); diff --git a/src/main/resources/mappers/PlainInMapper.xml b/src/main/resources/mappers/PlainInMapper.xml index 9f5847d..3eba420 100644 --- a/src/main/resources/mappers/PlainInMapper.xml +++ b/src/main/resources/mappers/PlainInMapper.xml @@ -54,11 +54,11 @@ and plan.warehouse_id = warehouse.id - acc.activation = 1 and acc.name like concat('%',#{search},'%') - acc.activation = 1 and acc.employee_number like concat('%',#{search},'%') + plan.activation = 1 and product.name like concat('%',#{search},'%') + plan.activation = 1 and plan.group_number like concat('%',#{search},'%') - order by acc.id desc limit #{start}, #{perPage} + order by plan.group_number desc limit #{start}, #{perPage} @@ -104,11 +104,11 @@ update plan_In SET activation = false WHERE group_number = #{groupNumber} and product_id = #{productId} + + + + + + + + + + +
+
+ + + < + + + + + + + + + + + + +
그룹번호제품명수량입고 예정 날짜비고
${dto.viewGroupNumber}${dto.productDto.name}${dto.quantity}${dto.other}
+
+
+
+
+
+ +
+
+
+ + +
+ +
\ No newline at end of file