Merge pull request #238 from beyond-sw-camp/feat/purchase/#213_구매목록-프론트

feat: 구매서 조회 및 상세조회 페이지 구현
beyond-sw-camp · Dec 18, 2024 · 5722eb4 · 5722eb4
2 parents 7de451e + f11e72d
commit 5722eb4
Show file tree

Hide file tree

Showing 16 changed files with 925 additions and 28 deletions.
diff --git a/SCM/backend/src/main/java/error/pirate/backend/common/Pagination.java b/SCM/backend/src/main/java/error/pirate/backend/common/Pagination.java
@@ -1,5 +1,6 @@
 package error.pirate.backend.common;
 
+import io.micrometer.common.util.StringUtils;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
@@ -25,6 +26,13 @@ public class Pagination {
 
     private int totalPageNo;
 
+    public String getSearchEndDate() {
+        if(StringUtils.isNotEmpty(searchEndDate)) {
+            return searchEndDate + " 23:59:59";
+        }
+        return null;
+    }
+
     public int getOffset() {
         return (pageNo - 1) * limit;
     }

diff --git a/SCM/backend/src/main/java/error/pirate/backend/purchase/query/dto/PurchaseItemResponse.java b/SCM/backend/src/main/java/error/pirate/backend/purchase/query/dto/PurchaseItemResponse.java
@@ -12,6 +12,8 @@ public class PurchaseItemResponse {
 
     private Long itemSeq; // 품목 번호
 
+    private String warehouseName;  // 입고창고명
+
     private String itemName;  // 품목 이름
 
     private String itemImageUrl;  // 품목 사진 url

diff --git a/SCM/backend/src/main/java/error/pirate/backend/purchase/query/dto/PurchaseRequest.java b/SCM/backend/src/main/java/error/pirate/backend/purchase/query/dto/PurchaseRequest.java
@@ -5,7 +5,7 @@
 
 public class PurchaseRequest extends Pagination {
 
-    private String clientName;  // 거래처명
+    private String clientName;
 
     private PurchaseStatus purchaseStatus;
 

diff --git a/SCM/backend/src/main/java/error/pirate/backend/purchase/query/dto/PurchaseResponse.java b/SCM/backend/src/main/java/error/pirate/backend/purchase/query/dto/PurchaseResponse.java
@@ -18,12 +18,13 @@ public class PurchaseResponse {
 
     private String clientName; // 거래처 이름
 
-    private String warehouseName;  // 입고창고명
-
     private String purchaseName; // 구매처명
 
     private PurchaseStatus purchaseStatus; // 상태
 
+    @Setter
+    private String purchaseStatusValue;
+
     private LocalDateTime purchaseContractDate; // 계약일
 
     private LocalDateTime purchaseRegDate;

diff --git a/SCM/backend/src/main/java/error/pirate/backend/purchase/query/service/PurchaseService.java b/SCM/backend/src/main/java/error/pirate/backend/purchase/query/service/PurchaseService.java
@@ -33,6 +33,8 @@ public PurchaseResponsePagination readPurchaseList(PurchaseRequest request) {
 
         int totalCount = purchaseMapper.readPurchaseListCount(request);
 
+        purchaseResponseList.forEach(order -> order.setPurchaseStatusValue(order.getPurchaseStatus().getValue()));
+
         Pagination pagination = new Pagination();
         pagination.responsePaging(request.getPageNo(), totalCount);
 
@@ -48,7 +50,7 @@ public byte[] purchaseExcelDown(PurchaseRequest request) {
         request.setOffset(null);
         List<PurchaseResponse> purchaseResponseList = purchaseMapper.readPurchaseList(request);
 
-        String[] headers = {"구매서명", "구매서 품목", "거래처명", "입고 창고명", "계약일", "상태"};
+        String[] headers = {"구매서명", "구매서 품목", "거래처명", "계약일", "상태"};
         String[][] excel = new String[purchaseResponseList.size()][headers.length];
 
         for(int i=0 ; i<purchaseResponseList.size() ; i++) {
@@ -61,11 +63,10 @@ public byte[] purchaseExcelDown(PurchaseRequest request) {
                     .map(PurchaseItemResponse::getItemName)
                     .collect(Collectors.joining(", "));//  품목
             excel[i][2] = dto.getClientName();
-            excel[i][3] = dto.getWarehouseName();
-            excel[i][4] = dto.getPurchaseContractDate() != null
+            excel[i][3] = dto.getPurchaseContractDate() != null
                     ? dto.getPurchaseContractDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
                     : null;
-            excel[i][5] = String.valueOf(dto.getPurchaseStatus());
+            excel[i][4] = String.valueOf(dto.getPurchaseStatus());
         }
 
         return excelDownBody.excelDownBody(excel, headers, "구매서");

diff --git a/...end/src/main/java/error/pirate/backend/purchaseOrder/query/dto/PurchaseOrderResponse.java b/...end/src/main/java/error/pirate/backend/purchaseOrder/query/dto/PurchaseOrderResponse.java
@@ -20,6 +20,9 @@ public class PurchaseOrderResponse {
 
     private PurchaseOrderStatus purchaseOrderStatus; // 발주서 상태
 
+    @Setter
+    private String purchaseOrderStatusValue;
+
     private LocalDateTime purchaseOrderDueDate; // 발주서 계약 납기일
 
     private LocalDateTime purchaseOrderTargetDueDate; // 발주서 목표 납기일

diff --git a/.../src/main/java/error/pirate/backend/purchaseOrder/query/service/PurchaseOrderService.java b/.../src/main/java/error/pirate/backend/purchaseOrder/query/service/PurchaseOrderService.java
@@ -33,6 +33,8 @@ public PurchaseOrderResponsePagination readPurchaseOrderList(PurchaseOrderReques
 
         int totalCount = purchaseOrderMapper.readPurchaseOrderListCount(purchaseOrderRequest);
 
+        purchaseOrderResponseList.forEach(order -> order.setPurchaseOrderStatusValue(order.getPurchaseOrderStatus().getValue()));
+
         Pagination pagination = new Pagination();
         pagination.responsePaging(purchaseOrderRequest.getPageNo(), totalCount);
 

diff --git a/SCM/backend/src/main/resources/mappers/purchase/PurchaseMapper.xml b/SCM/backend/src/main/resources/mappers/purchase/PurchaseMapper.xml
@@ -13,28 +13,27 @@
             tp.purchase_extended_price,
             tp.purchase_note,
             tu.user_name,
-            tc.client_name,
-            tw.warehouse_name
+            tc.client_name
         FROM tb_purchase tp
         JOIN tb_user tu USING (user_seq)
-        JOIN tb_warehouse tw USING (warehouse_seq)
-        JOIN tb_client tc ON (tu.user_seq = tc.user_seq)
+        JOIN tb_purchase_order tpo USING (purchase_order_seq)
+        JOIN tb_client tc ON (tpo.client_seq = tc.client_seq)
         <trim prefix="WHERE" prefixOverrides="AND">
             <if test="searchStartDate != null and searchStartDate != ''">
                 <![CDATA[
-                AND #{searchStartDate} <= tpo.purchase_order_target_due_date
+                AND #{searchStartDate} <= tp.purchase_contract_date
                 ]]>
             </if>
             <if test="searchEndDate != null and searchEndDate != ''">
                 <![CDATA[
-                AND #{searchEndDate} >= tpo.purchase_order_target_due_date
+                AND #{searchEndDate} >= tp.purchase_contract_date
                 ]]>
             </if>
-            <if test="clientName != null">
-                AND tc.client_name LIKE CONCAT('%', #{clientName}, '%')
+            <if test="searchName != null">
+                AND tc.client_name LIKE CONCAT('%', #{searchName}, '%')
             </if>
-            <if test="purchaseStatus != null">
-                AND tp.purchase_status = #{purchaseStatus}
+            <if test="searchStatus != null">
+                AND tp.purchase_status = #{searchStatus}
             </if>
         </trim>
         ORDER BY tp.purchase_seq
@@ -52,9 +51,11 @@
             tpi.purchase_item_status,
             tpi.purchase_item_note,
             ti.item_name,
-            ti.item_image_url
+            ti.item_image_url,
+            tw.warehouse_name
         FROM tb_purchase_item tpi
         JOIN tb_item ti USING (item_seq)
+        JOIN tb_warehouse tw ON (ti.warehouse_seq = tw.warehouse_seq)
         WHERE tpi.purchase_seq = #{purchaseSeq}
         ORDER BY tpi.purchase_item_seq
     </select>
@@ -64,24 +65,24 @@
             COUNT(*)
         FROM tb_purchase tp
         JOIN tb_user tu USING (user_seq)
-        JOIN tb_warehouse tw USING (warehouse_seq)
-        JOIN tb_client tc ON (tu.user_seq = tc.user_seq)
+        JOIN tb_purchase_order tpo USING (purchase_order_seq)
+        JOIN tb_client tc ON (tpo.client_seq = tc.client_seq)
         <trim prefix="WHERE" prefixOverrides="AND">
             <if test="searchStartDate != null and searchStartDate != ''">
                 <![CDATA[
-                AND #{searchStartDate} <= tpo.purchase_order_target_due_date
+                AND #{searchStartDate} <= tp.purchase_contract_date
                 ]]>
             </if>
             <if test="searchEndDate != null and searchEndDate != ''">
                 <![CDATA[
-                AND #{searchEndDate} >= tpo.purchase_order_target_due_date
+                AND #{searchEndDate} >= tp.purchase_contract_date
                 ]]>
             </if>
-            <if test="clientName != null">
-                AND tc.client_name LIKE CONCAT('%', #{clientName}, '%')
+            <if test="searchName != null">
+                AND tc.client_name LIKE CONCAT('%', #{searchName}, '%')
             </if>
-            <if test="purchaseStatus != null">
-                AND tp.purchase_status = #{purchaseStatus}
+            <if test="searchStatus != null">
+                AND tp.purchase_status = #{searchStatus}
             </if>
         </trim>
     </select>

diff --git a/SCM/frontend/src/components/common/Header.vue b/SCM/frontend/src/components/common/Header.vue
@@ -36,7 +36,7 @@ import statisticsIcon from '@/assets/statisticsIcon.svg'
         <b-nav-item-dropdown>
           <template #button-content><orderIcon class="icon" />주문관리</template>
           <b-dropdown-item href="#"><RouterLink to="/purchaseOrder" active-class="active none-decoration" replace>발주서 관리</RouterLink></b-dropdown-item>
-          <b-dropdown-item href="#">구매서 관리</b-dropdown-item>
+          <b-dropdown-item href="#"><RouterLink to="/purchase" active-class="active none-decoration" replace>구매서 관리</RouterLink></b-dropdown-item>
         </b-nav-item-dropdown>
         <b-nav-item-dropdown>
           <template #button-content><productionIcon class="icon" />생산관리</template>