From 04392168ba1d1a1c388f022fdd2d81f165d017e1 Mon Sep 17 00:00:00 2001
From: Suh <enjoylife727@gmail.com>
Date: Fri, 19 Jan 2024 22:14:52 +0900
Subject: [PATCH] =?UTF-8?q?planin=20url=20=EA=B4=80=EB=A0=A8=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/no1/wms/planin/PlanInController.java | 4 ++--
 src/main/java/com/no1/wms/planin/PlanInMapper.java     | 2 +-
 src/main/java/com/no1/wms/planin/PlanInService.java    | 4 ++--
 src/main/resources/mappers/PlainInMapper.xml           | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/no1/wms/planin/PlanInController.java b/src/main/java/com/no1/wms/planin/PlanInController.java
index 08e0650..280b117 100644
--- a/src/main/java/com/no1/wms/planin/PlanInController.java
+++ b/src/main/java/com/no1/wms/planin/PlanInController.java
@@ -112,9 +112,9 @@ public class PlanInController {
     // 엑셀 다운로드 
     @GetMapping("/qr/{id}")
     @ResponseBody
-    public String qr(@PathVariable("id")String id, HttpServletResponse response)
+    public String qr(@PathVariable("id")String qrHash, HttpServletResponse response)
     {
-        List<PlanInDto> list = planinservice.selectByUrl(id);
+        List<PlanInDto> list = planinservice.selectByQRHash(qrHash);
 
         Utils.makePlanInExcel(list, response);
 
diff --git a/src/main/java/com/no1/wms/planin/PlanInMapper.java b/src/main/java/com/no1/wms/planin/PlanInMapper.java
index 5175b53..711d85b 100644
--- a/src/main/java/com/no1/wms/planin/PlanInMapper.java
+++ b/src/main/java/com/no1/wms/planin/PlanInMapper.java
@@ -16,7 +16,7 @@ public interface PlanInMapper {
 
     List<PlanInDto> selectById(PlanInDto dto);
 
-    List<PlanInDto> selectByUrl(String id);
+    List<PlanInDto> selectByQRHash(String qrHash);
 
     int deleteById(PlanInDto dto);
 
diff --git a/src/main/java/com/no1/wms/planin/PlanInService.java b/src/main/java/com/no1/wms/planin/PlanInService.java
index a11b287..2431a51 100644
--- a/src/main/java/com/no1/wms/planin/PlanInService.java
+++ b/src/main/java/com/no1/wms/planin/PlanInService.java
@@ -45,9 +45,9 @@ public class PlanInService {
         return mapper.delete(dto);
     }
 
-    List<PlanInDto> selectByUrl(String id) {
+    List<PlanInDto> selectByQRHash(String qrHash) {
 
-        return mapper.selectByUrl(id);
+        return mapper.selectByQRHash(qrHash);
     }
 
 
diff --git a/src/main/resources/mappers/PlainInMapper.xml b/src/main/resources/mappers/PlainInMapper.xml
index 41bdc32..3e41af4 100644
--- a/src/main/resources/mappers/PlainInMapper.xml
+++ b/src/main/resources/mappers/PlainInMapper.xml
@@ -44,7 +44,7 @@
                         and plan.warehouse_id = warehouse.id and product.kan_code = product_category.kan_code 
         where plan.group_number = #{groupNumber}
     </select>
-    <select id="selectByUrl" resultMap="planInResultMap">
+    <select id="selectByQRHash" resultMap="planInResultMap">
         SELECT
             plan.group_number, plan.product_id, plan.quantity, plan.date, plan.manager_id,
             plan.warehouse_id, plan.qr_hash, plan.url, plan.clear, plan.other, plan.activation, plan.view_group_number,
@@ -53,7 +53,7 @@
             from plan_In plan join account acc join vendor join warehouse join product join product_category
             on plan.product_id = product.id and product.vendor_id = vendor.id and plan.manager_id = acc.id
             and plan.warehouse_id = warehouse.id and product.kan_code = product_category.kan_code
-        WHERE plan.url = #{id}
+        WHERE plan.qr_hash = #{qrHash}
     </select>
     <select id="selectAll" resultMap="planInResultMap" parameterType="map">
         SELECT
@@ -82,8 +82,8 @@
         )
         VALUES (#{groupNumber}, #{productId}, #{quantity},
                 #{date},
-                #{managerId}, #{warehouseId}, #{qrHash},
-                #{groupNumber}, #{clear},
+                #{managerId}, #{warehouseId}, #{groupNumber},
+                uuid(), #{clear},
                 #{other}, true,
                 CASE
                     WHEN #{viewGroupNumber} IS NOT NULL