From 2ed552b4b4e754d04bc20ead39270b99faca31be Mon Sep 17 00:00:00 2001
From: shoqying <shoqying@gmail.com>
Date: Tue, 24 Dec 2024 11:00:09 +0900
Subject: [PATCH] asf

---
 stockMate/src/main/resources/mappers/receivingMapper.xml  | 5 +----
 stockMate/src/main/resources/mappers/shipmentMapper.xml   | 3 ---
 .../src/main/webapp/WEB-INF/views/receiving/history.jsp   | 8 ++++----
 .../src/main/webapp/WEB-INF/views/receiving/main.jsp      | 8 ++++----
 .../src/main/webapp/WEB-INF/views/receiving/scan.jsp      | 8 ++++----
 .../src/main/webapp/WEB-INF/views/receiving/search.jsp    | 8 ++++----
 .../src/main/webapp/WEB-INF/views/shipment/history.jsp    | 8 ++++----
 stockMate/src/main/webapp/WEB-INF/views/shipment/main.jsp | 8 ++++----
 .../src/main/webapp/WEB-INF/views/shipment/search.jsp     | 8 ++++----
 9 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/stockMate/src/main/resources/mappers/receivingMapper.xml b/stockMate/src/main/resources/mappers/receivingMapper.xml
index ab05f5e..db85088 100644
--- a/stockMate/src/main/resources/mappers/receivingMapper.xml
+++ b/stockMate/src/main/resources/mappers/receivingMapper.xml
@@ -31,8 +31,7 @@
 <!-- 테이블에 입고 데이터 입력 -->
 <insert id="insertReceiving" parameterType="com.stockm8.domain.vo.ReceivingShipmentVO">
 INSERT INTO receiving_shipment (
-    transaction_type, 
-    status, 
+    transaction_type,  
     product_id, 
     change_quantity, 
     order_item_id,
@@ -43,7 +42,6 @@ INSERT INTO receiving_shipment (
 )
 SELECT DISTINCT 
     ord.order_type, 
-    'PENDING',
     p.product_id, 
     o.quantity, 
     o.order_item_id,
@@ -60,7 +58,6 @@ WHERE NOT EXISTS (
     SELECT 1
     FROM receiving_shipment rs
     WHERE rs.transaction_type = ord.order_type
-    AND rs.status = 'PENDING'
     AND rs.product_id = p.product_id
     AND rs.order_item_id = o.order_item_id
     AND rs.stock_id = s.stock_id
diff --git a/stockMate/src/main/resources/mappers/shipmentMapper.xml b/stockMate/src/main/resources/mappers/shipmentMapper.xml
index 10ec859..3006f1b 100644
--- a/stockMate/src/main/resources/mappers/shipmentMapper.xml
+++ b/stockMate/src/main/resources/mappers/shipmentMapper.xml
@@ -12,7 +12,6 @@
 <insert id="insertShipment" parameterType="com.stockm8.domain.vo.ReceivingShipmentVO">
 INSERT INTO receiving_shipment (
     transaction_type, 
-    status, 
     product_id, 
     change_quantity, 
     order_item_id,
@@ -23,7 +22,6 @@ INSERT INTO receiving_shipment (
 )
 SELECT DISTINCT 
     ord.order_type, 
-    'PENDING',
     p.product_id, 
     o.quantity, 
     o.order_item_id,
@@ -40,7 +38,6 @@ WHERE NOT EXISTS (
     SELECT 1
     FROM receiving_shipment rs
     WHERE rs.transaction_type = ord.order_type
-    AND rs.status = 'PENDING'
     AND rs.product_id = p.product_id
     AND rs.order_item_id = o.order_item_id
     AND rs.stock_id = s.stock_id
diff --git a/stockMate/src/main/webapp/WEB-INF/views/receiving/history.jsp b/stockMate/src/main/webapp/WEB-INF/views/receiving/history.jsp
index 50471e0..4906b72 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/receiving/history.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/receiving/history.jsp
@@ -54,12 +54,12 @@
 				<th>입고 출고</th>
 				<th>입고 일자</th>
 				<th>입고 상태</th>
-				<th>제품 번호</th>
+<!-- 				<th>제품 번호</th> -->
 				<th>제품명</th>
 				<th>옵션명</th>
 				<th>입고 수량</th>
 				<th>제품 단가</th>
-				<th>창고 위치</th>
+<!-- 				<th>창고 위치</th> -->
 				<th>작업 메모</th>
 			</tr>
 			<c:forEach var="vo" items="${ReceivingList }">
@@ -91,12 +91,12 @@
 			                </c:otherwise>
 			            </c:choose>
 			        </td>
-					<td>${vo.productId }</td>
+<%-- 					<td>${vo.productId }</td> --%>
 					<td>${vo.productName }</td>
 					<td>${vo.productDescription }</td>
 					<td>${vo.changeQuantity }</td>
 					<td>${vo.productPrice }</td>
-					<td>${vo.warehouseId }</td>
+<%-- 					<td>${vo.warehouseId }</td> --%>
 					<td>${vo.memo }</td>
 				</tr>
 			</c:forEach>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/receiving/main.jsp b/stockMate/src/main/webapp/WEB-INF/views/receiving/main.jsp
index 62ee387..e5ad02d 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/receiving/main.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/receiving/main.jsp
@@ -32,7 +32,7 @@
         <th>입고 출고</th>
         <th>입고 일자</th>
         <th>입고 상태</th>
-        <th>제품 번호</th>
+<!--         <th>제품 번호</th> -->
         <th>제품명</th>
         <th>옵션명</th>
         <th>입고 수량</th>
@@ -56,7 +56,7 @@
                     <c:otherwise>${vo.status}</c:otherwise>
                 </c:choose>
             </td>
-            <td>${vo.productId}</td>
+<%--             <td>${vo.productId}</td> --%>
             <td>${vo.productName}</td>
             <td>${vo.productDescription}</td>
             <td>${vo.changeQuantity}</td>
@@ -73,7 +73,7 @@
         <th>입고 출고</th>
         <th>입고 일자</th>
         <th>입고 상태</th>
-        <th>제품 번호</th>
+<!--         <th>제품 번호</th> -->
         <th>제품명</th>
         <th>옵션명</th>
         <th>입고 수량</th>
@@ -97,7 +97,7 @@
                     <c:otherwise>${vo.status}</c:otherwise>
                 </c:choose>
             </td>
-            <td>${vo.productId}</td>
+<%--             <td>${vo.productId}</td> --%>
             <td>${vo.productName}</td>
             <td>${vo.productDescription}</td>
             <td>${vo.changeQuantity}</td>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/receiving/scan.jsp b/stockMate/src/main/webapp/WEB-INF/views/receiving/scan.jsp
index d3c4ab5..51fb28a 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/receiving/scan.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/receiving/scan.jsp
@@ -105,12 +105,12 @@ $(document).ready(function () {
 				<th>입고 출고</th>
 				<th>입고 일자</th>
 				<th>입고 상태</th>
-				<th>제품 번호</th>
+<!-- 				<th>제품 번호</th> -->
 				<th>제품명</th>
 				<th>옵션명</th>
 				<th>입고 수량</th>
 				<th>제품 단가</th>
-				<th>창고 위치</th>
+<!-- 				<th>창고 위치</th> -->
 				<th>작업 메모</th>
 			</tr>
 			<c:forEach var="vo" items="${rsn }">
@@ -138,12 +138,12 @@ $(document).ready(function () {
 			                </c:otherwise>
 			            </c:choose>
 			        </td>
-					<td>${vo.productId }</td>
+<%-- 					<td>${vo.productId }</td> --%>
 					<td>${vo.productName }</td>
 					<td>${vo.productDescription }</td>
 					<td>${vo.changeQuantity }</td>
 					<td>${vo.productPrice }</td>
-					<td>${vo.warehouseId }</td>
+<%-- 					<td>${vo.warehouseId }</td> --%>
 					<td>${vo.memo }</td>
 				</tr>
 				</c:forEach>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/receiving/search.jsp b/stockMate/src/main/webapp/WEB-INF/views/receiving/search.jsp
index 98dd5c6..081b8f9 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/receiving/search.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/receiving/search.jsp
@@ -51,12 +51,12 @@
 				<th>입고 출고</th>
 				<th>입고 일자</th>
 				<th>입고 상태</th>
-				<th>제품 번호</th>
+<!-- 				<th>제품 번호</th> -->
 				<th>제품명</th>
 				<th>옵션명</th>
 				<th>입고 수량</th>
 				<th>제품 단가</th>
-				<th>창고 위치</th>
+<!-- 				<th>창고 위치</th> -->
 				<th>작업 메모</th>
 			</tr>
 			<c:forEach var="vo" items="${ReceivingList }">
@@ -86,12 +86,12 @@
 			                </c:otherwise>
 			            </c:choose>
 			        </td>
-					<td>${vo.productId }</td>
+<%-- 					<td>${vo.productId }</td> --%>
 					<td>${vo.productName }</td>
 					<td>${vo.productDescription }</td>
 					<td>${vo.changeQuantity }</td>
 					<td>${vo.productPrice }</td>
-					<td>${vo.warehouseId }</td>
+<%-- 					<td>${vo.warehouseId }</td> --%>
 					<td>${vo.memo }</td>
 				</tr>
 			</c:forEach>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/shipment/history.jsp b/stockMate/src/main/webapp/WEB-INF/views/shipment/history.jsp
index f15a73e..bb0ea47 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/shipment/history.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/shipment/history.jsp
@@ -54,12 +54,12 @@
 				<th>입고 출고</th>
 				<th>출고 일자</th>
 				<th>출고 상태</th>
-				<th>제품 번호</th>
+<!-- 				<th>제품 번호</th> -->
 				<th>제품명</th>
 				<th>옵션명</th>
 				<th>출고 수량</th>
 				<th>제품 단가</th>
-				<th>창고 위치</th>
+<!-- 				<th>창고 위치</th> -->
 				<th>작업 메모</th>
 			</tr>
 			<c:forEach var="vo" items="${ShipmentList }">
@@ -91,12 +91,12 @@
 			                </c:otherwise>
 			            </c:choose>
 			        </td>
-					<td>${vo.productId }</td>
+<%-- 					<td>${vo.productId }</td> --%>
 					<td>${vo.productName }</td>
 					<td>${vo.productDescription }</td>
 					<td>${vo.changeQuantity }</td>
 					<td>${vo.productPrice }</td>
-					<td>${vo.warehouseId }</td>
+<%-- 					<td>${vo.warehouseId }</td> --%>
 					<td>${vo.memo }</td>
 				</tr>
 			</c:forEach>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/shipment/main.jsp b/stockMate/src/main/webapp/WEB-INF/views/shipment/main.jsp
index 7c5d293..9ba1ab9 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/shipment/main.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/shipment/main.jsp
@@ -32,7 +32,7 @@
         <th>입고 출고</th>
         <th>출고 일자</th>
         <th>출고 상태</th>
-        <th>제품 번호</th>
+<!--         <th>제품 번호</th> -->
         <th>제품명</th>
         <th>옵션명</th>
         <th>출고 수량</th>
@@ -56,7 +56,7 @@
                     <c:otherwise>${vo.status}</c:otherwise>
                 </c:choose>
             </td>
-            <td>${vo.productId}</td>
+<%--             <td>${vo.productId}</td> --%>
             <td>${vo.productName}</td>
             <td>${vo.productDescription}</td>
             <td>${vo.changeQuantity}</td>
@@ -73,7 +73,7 @@
         <th>입고 출고</th>
         <th>출고 일자</th>
         <th>출고 상태</th>
-        <th>제품 번호</th>
+<!--         <th>제품 번호</th> -->
         <th>제품명</th>
         <th>옵션명</th>
         <th>출고 수량</th>
@@ -97,7 +97,7 @@
                     <c:otherwise>${vo.status}</c:otherwise>
                 </c:choose>
             </td>
-            <td>${vo.productId}</td>
+<%--             <td>${vo.productId}</td> --%>
             <td>${vo.productName}</td>
             <td>${vo.productDescription}</td>
             <td>${vo.changeQuantity}</td>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/shipment/search.jsp b/stockMate/src/main/webapp/WEB-INF/views/shipment/search.jsp
index 3c15f07..c34055c 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/shipment/search.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/shipment/search.jsp
@@ -51,12 +51,12 @@
 				<th>입고 출고</th>
 				<th>출고 일자</th>
 				<th>출고 상태</th>
-				<th>제품 번호</th>
+<!-- 				<th>제품 번호</th> -->
 				<th>제품명</th>
 				<th>옵션명</th>
 				<th>출고 수량</th>
 				<th>제품 단가</th>
-				<th>창고 위치</th>
+<!-- 				<th>창고 위치</th> -->
 				<th>작업 메모</th>
 			</tr>
 			<c:forEach var="vo" items="${ShipmentList }">
@@ -86,12 +86,12 @@
 			                </c:otherwise>
 			            </c:choose>
 			        </td>
-					<td>${vo.productId }</td>
+<%-- 					<td>${vo.productId }</td> --%>
 					<td>${vo.productName }</td>
 					<td>${vo.productDescription }</td>
 					<td>${vo.changeQuantity }</td>
 					<td>${vo.productPrice }</td>
-					<td>${vo.warehouseId }</td>
+<%-- 					<td>${vo.warehouseId }</td> --%>
 					<td>${vo.memo }</td>
 				</tr>
 			</c:forEach>