asf

in27sung · Dec 24, 2024 · 2ed552b · 2ed552b
1 parent 06c0835
commit 2ed552b
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>