From 3c0409041f9dfb20a9427be6cd226279230c3547 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: Thu, 18 Jan 2024 10:02:25 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=85=EA=B3=A0=EC=98=88=EC=A0=95=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/no1/wms/planin/PlanInController.java | 1 - .../java/com/no1/wms/planin/PlanInDto.java | 4 +- .../com/no1/wms/planin/PlanInService.java | 3 - src/main/resources/mappers/PlainInMapper.xml | 21 ++--- src/main/webapp/WEB-INF/views/planin/list.jsp | 1 + src/main/webapp/WEB-INF/views/planin/read.jsp | 79 ++++++++++++++++++- 6 files changed, 92 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/no1/wms/planin/PlanInController.java b/src/main/java/com/no1/wms/planin/PlanInController.java index 8bfb345..1cbd0de 100644 --- a/src/main/java/com/no1/wms/planin/PlanInController.java +++ b/src/main/java/com/no1/wms/planin/PlanInController.java @@ -60,7 +60,6 @@ public class PlanInController { mav.addObject("list", list); mav.setViewName("planin/read"); - 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 e4cdc01..26ee921 100644 --- a/src/main/java/com/no1/wms/planin/PlanInDto.java +++ b/src/main/java/com/no1/wms/planin/PlanInDto.java @@ -6,6 +6,7 @@ import org.apache.ibatis.type.Alias; import org.springframework.format.annotation.DateTimeFormat; import com.no1.wms.account.AccountDto; +import com.no1.wms.category.CategoryDto; import com.no1.wms.product.ProductDto; import com.no1.wms.vendor.VendorDto; import com.no1.wms.warehouse.WarehouseDto; @@ -38,9 +39,10 @@ public class PlanInDto { private Boolean activation; private Integer viewGroupNumber; private String oldProductId; + private String cName; private ProductDto productDto; private VendorDto vendorDto; private AccountDto accountDto; private WarehouseDto warehouseDto; -} +} \ No newline at end of file diff --git a/src/main/java/com/no1/wms/planin/PlanInService.java b/src/main/java/com/no1/wms/planin/PlanInService.java index b711061..dd0201b 100644 --- a/src/main/java/com/no1/wms/planin/PlanInService.java +++ b/src/main/java/com/no1/wms/planin/PlanInService.java @@ -17,9 +17,6 @@ public class PlanInService { map.put("start", start); map.put("perPage", perPage); map.put("searchn", searchn); - - - return mapper.selectAll(map); } diff --git a/src/main/resources/mappers/PlainInMapper.xml b/src/main/resources/mappers/PlainInMapper.xml index f55563d..4f5d4b0 100644 --- a/src/main/resources/mappers/PlainInMapper.xml +++ b/src/main/resources/mappers/PlainInMapper.xml @@ -17,6 +17,7 @@ + @@ -38,20 +39,22 @@ SELECT plan.group_number, plan.product_id, plan.quantity, plan.date, plan.vendor_id, plan.manager_id, plan.warehouse_id, plan.qr_hash, plan.url, plan.clear, plan.vendor_date, plan.other, plan.activation, plan.view_group_number, - product.id p_id, product.name p_name, acc.id acc_id, acc.name acc_name, vendor.id v_id, vendor.name v_name, warehouse.id w_id, warehouse.name w_name - from plan_In plan join account acc join vendor join warehouse join product + product.id p_id, product.name p_name, acc.id acc_id, acc.name acc_name, vendor.id v_id, vendor.name v_name, + warehouse.id w_id, warehouse.name w_name, product_category.kan_code p_kan, product_category.cls_Nm_4 c_name + from plan_In plan join account acc join vendor join warehouse join product join product_category on plan.product_id = product.id and plan.vendor_id = vendor.id and plan.manager_id = acc.id - and plan.warehouse_id = warehouse.id + and plan.warehouse_id = warehouse.id and product.kan_code = product_category.kan_code where plan.group_number = #{groupNumber} + + + + + + + + + +
+
+ + + + + + + + + + + + + + + +
제품 카테고리제품명수량공급업체날짜수정/삭제
${dto.cName}${dto.productDto.name}${dto.quantity}${dto.vendorDto.name} +
+
+
+
+
+
+ +
+
+
+ + +
+ + +
\ No newline at end of file