diff --git a/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java b/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java index 041e586..2a190cd 100644 --- a/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java +++ b/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java @@ -1,5 +1,6 @@ package com.stockm8.controller; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.stockm8.domain.vo.Criteria; +import com.stockm8.domain.vo.OrderItemVO; import com.stockm8.domain.vo.OrderVO; import com.stockm8.domain.vo.PageVO; import com.stockm8.domain.vo.ProductVO; @@ -30,6 +32,7 @@ import com.stockm8.service.OrderService; import com.stockm8.service.ReceivingService; import com.stockm8.service.UserService; +import com.stockm8.domain.vo.OrderItemVO; @Controller @RequestMapping(value = "/receiving/*") @@ -43,6 +46,9 @@ public class ReceivingController { @Inject private UserService uService; + @Inject + private OrderService orderService; + // http://localhost:8088/receiving/main @RequestMapping(value = "/main", method = RequestMethod.GET) public void mainGET(Model model, HttpServletRequest request) throws Exception { @@ -249,7 +255,6 @@ public Map scanPOST(@RequestBody Map payload, model.addAttribute("receivingShipmentNo", receivingShipmentNo); model.addAttribute("orderItemId", orderItemId); - Map response = new HashMap<>(); if (userId == null) { response.put("success", false); @@ -258,7 +263,20 @@ public Map scanPOST(@RequestBody Map payload, } try { - rService.ReceivingStatusToComplete(businessId, barcode, receivingShipmentNo); + + // OrderItemVO 리스트 생성 + List completedItems = new ArrayList<>(); + OrderItemVO item = new OrderItemVO(); + item.setOrderItemId(orderItemId); + completedItems.add(item); + + // OrderService를 통해 orderId 가져오기 + // OrderService에 해당 메소드 추가 필요 + int orderId = orderService.getOrderIdByOrderItemId(orderItemId); + + rService.ReceivingStatusToComplete(businessId, barcode, receivingShipmentNo, orderId, completedItems); + + int remainingStock = rService.increseStockByBarcode(businessId, barcode, receivingShipmentNo, orderItemId); int reservedQuantity = rService.decreaseReservedQuantity(businessId, barcode, receivingShipmentNo, orderItemId); ProductVO product = rService.productNameBarcode(businessId, barcode, receivingShipmentNo); diff --git a/stockMate/src/main/java/com/stockm8/persistence/OrderDAO.java b/stockMate/src/main/java/com/stockm8/persistence/OrderDAO.java index 4354601..33a2926 100644 --- a/stockMate/src/main/java/com/stockm8/persistence/OrderDAO.java +++ b/stockMate/src/main/java/com/stockm8/persistence/OrderDAO.java @@ -41,6 +41,8 @@ public interface OrderDAO { // 전체 주문 개수 조회 (페이징 계산) public int getTotalOrderCount(int businessId); + // 오더아이디 + public int getOrderIdByOrderItemId(Integer orderItemId) throws Exception; } // OrderDAO diff --git a/stockMate/src/main/java/com/stockm8/persistence/OrderDAOImpl.java b/stockMate/src/main/java/com/stockm8/persistence/OrderDAOImpl.java index d2d1270..597ace8 100644 --- a/stockMate/src/main/java/com/stockm8/persistence/OrderDAOImpl.java +++ b/stockMate/src/main/java/com/stockm8/persistence/OrderDAOImpl.java @@ -139,7 +139,10 @@ public List getOrderItemsByOrderId(int orderId) throws Exception { public int getTotalOrderCount(int businessId) { return sqlSession.selectOne(NAMESPACE + "getTotalOrderCount", businessId); } - + @Override + public int getOrderIdByOrderItemId(Integer orderItemId) throws Exception { + return sqlSession.selectOne(NAMESPACE + "getOrderIdByOrderItemId", orderItemId); + } } // OrderImpl \ No newline at end of file diff --git a/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAO.java b/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAO.java index dfe9788..231c7cf 100644 --- a/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAO.java +++ b/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAO.java @@ -49,7 +49,7 @@ public interface ReceivingDAO { public ProductVO selectProductNameBarcode(int businessId, String barcode, Integer receivingShipmentNo) throws Exception; // 수량 없을시 완료상태로 변경 - public void updateReceivingStatusToComplete(int businessId, String barcode, Integer receivingShipmentNo) throws Exception; + public void updateReceivingStatusToComplete(int businessId, String barcode, Integer receivingShipmentNo, int orderItemId) throws Exception; // 입출고 번호를 누를시 스캔으로가서 특정 리스트 보여주기 public List selectReceivingShipmentNo(int businessId, Integer receivingShipmentNo, int orderItemId) throws Exception; diff --git a/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAOImpl.java b/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAOImpl.java index 72d8215..3b2458d 100644 --- a/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAOImpl.java +++ b/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAOImpl.java @@ -161,12 +161,13 @@ public ProductVO selectProductNameBarcode(int businessId, String barcode, Intege } @Override - public void updateReceivingStatusToComplete(int businessId, String barcode, Integer receivingShipmentNo) throws Exception { + public void updateReceivingStatusToComplete(int businessId, String barcode, Integer receivingShipmentNo, int orderItemId) throws Exception { logger.info("updateReceivingStatusToComplete() 호출"); Map params = new HashMap<>(); params.put("businessId", businessId); params.put("barcode", barcode); params.put("receivingShipmentNo", receivingShipmentNo); + params.put("orderItemId", orderItemId); sqlSession.update(NAMESPACE + "updateReceivingStatusToComplete", params); } diff --git a/stockMate/src/main/java/com/stockm8/service/OrderService.java b/stockMate/src/main/java/com/stockm8/service/OrderService.java index 85038b9..a7cafe6 100644 --- a/stockMate/src/main/java/com/stockm8/service/OrderService.java +++ b/stockMate/src/main/java/com/stockm8/service/OrderService.java @@ -38,5 +38,8 @@ public interface OrderService { // 전체 주문 개수 조회 (페이징 계산) public int getTotalOrderCount(int businessId); + // 오더 아이디 가져가는 메소드 + + public int getOrderIdByOrderItemId(Integer orderItemId) throws Exception; } //OrderService diff --git a/stockMate/src/main/java/com/stockm8/service/OrderServiceImpl.java b/stockMate/src/main/java/com/stockm8/service/OrderServiceImpl.java index 1cf4973..f80e211 100644 --- a/stockMate/src/main/java/com/stockm8/service/OrderServiceImpl.java +++ b/stockMate/src/main/java/com/stockm8/service/OrderServiceImpl.java @@ -123,7 +123,10 @@ public int getTotalOrderCount(int businessId) { } - + @Override + public int getOrderIdByOrderItemId(Integer orderItemId) throws Exception { + return odao.getOrderIdByOrderItemId(orderItemId); + } } //OrderServiceImpl \ No newline at end of file diff --git a/stockMate/src/main/java/com/stockm8/service/ReceivingService.java b/stockMate/src/main/java/com/stockm8/service/ReceivingService.java index 8a0ce75..2d8a5e1 100644 --- a/stockMate/src/main/java/com/stockm8/service/ReceivingService.java +++ b/stockMate/src/main/java/com/stockm8/service/ReceivingService.java @@ -47,7 +47,11 @@ public interface ReceivingService { public ProductVO productNameBarcode(int businessId, String barcode, Integer receivingShipmentNo) throws Exception; // 수량 없을시 완료상태로 변경 - public void ReceivingStatusToComplete(int businessId, String barcode, Integer receivingShipmentNo) throws Exception; + + public void ReceivingStatusToComplete(int businessId, String barcode, Integer receivingShipmentNo,int orderId, List completedItems) throws Exception; + + + // 입출고 번호를 누를시 스캔으로가서 특정 리스트 보여주기 public List getReceivingShipmentNo(int businessId, Integer receivingShipmentNo, int rderItemId) throws Exception; diff --git a/stockMate/src/main/java/com/stockm8/service/ReceivingServiceImpl.java b/stockMate/src/main/java/com/stockm8/service/ReceivingServiceImpl.java index 1ec1560..45bf84a 100644 --- a/stockMate/src/main/java/com/stockm8/service/ReceivingServiceImpl.java +++ b/stockMate/src/main/java/com/stockm8/service/ReceivingServiceImpl.java @@ -24,8 +24,8 @@ public class ReceivingServiceImpl implements ReceivingService { @Inject private ReceivingDAO rdao; -// @Inject -// private OrderProcessor opService; + @Inject + private OrderProcessor opService; // 메인 입고 리스트 @@ -122,11 +122,12 @@ public ProductVO productNameBarcode(int businessId, String barcode, Integer rece } @Override - public void ReceivingStatusToComplete(int businessId, String barcode, Integer receivingShipmentNo) { + public void ReceivingStatusToComplete(int businessId, String barcode, Integer receivingShipmentNo,int orderId, List completedItems) { try { // MyBatis 매퍼 호출 rdao.updateReceivingStatusToComplete(businessId, barcode, receivingShipmentNo); -// opService.processInboundAfterInspection(orderId, completedItems); + opService.processInboundAfterInspection(orderId, completedItems); + } catch (Exception e) { // 예외 처리 logger.error("입고 상태 업데이트 오류: " + e.getMessage()); diff --git a/stockMate/src/main/resources/mappers/OrderMapper.xml b/stockMate/src/main/resources/mappers/OrderMapper.xml index b4caf7e..13afe40 100644 --- a/stockMate/src/main/resources/mappers/OrderMapper.xml +++ b/stockMate/src/main/resources/mappers/OrderMapper.xml @@ -120,7 +120,7 @@ #{productId}, #{warehouseId}, #{quantity}, - #{quantity} + #{quantity}, #{unitPrice}, #{remarks}, NOW() @@ -231,5 +231,11 @@ JOIN users u ON o.created_by = u.user_id WHERE u.business_id = #{businessId} - + + + \ No newline at end of file diff --git a/stockMate/src/main/resources/mappers/receivingMapper.xml b/stockMate/src/main/resources/mappers/receivingMapper.xml index d2bc114..daa8e6c 100644 --- a/stockMate/src/main/resources/mappers/receivingMapper.xml +++ b/stockMate/src/main/resources/mappers/receivingMapper.xml @@ -238,7 +238,6 @@ WHERE r.transaction_type = 'INBOUND' JOIN stocks s on o.product_id = s.product_id JOIN receiving_shipment r on r.stock_id = s.stock_id AND r.order_item_id = o.order_item_id SET s.total_quantity = s.total_quantity + 1, - s.reserved_quantity = s.reserved_quantity -1, o.change_quantity = o.change_quantity -1 WHERE p.product_barcode = #{barcode} AND s.business_id = #{businessId} @@ -288,12 +287,15 @@ AND r.order_item_id = #{orderItemId} JOIN products p ON r.product_id = p.product_id JOIN stocks s ON s.product_id = p.product_id JOIN order_items o ON s.product_id = o.product_id - SET r.status = 'COMPLETED' + SET r.status = 'COMPLETED', + s.reserved_quantity = s.reserved_quantity - o.quantity WHERE p.product_barcode = #{barcode} AND o.change_quantity = 0 AND r.status = 'PENDING' AND s.business_id = #{businessId} AND r.receiving_shipment_no = #{receivingShipmentNo} + AND r.order_item_id = #{orderItemId} + AND o.order_item_id = r.order_item_id; diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/signin.jsp b/stockMate/src/main/webapp/WEB-INF/views/user/signin.jsp index 721ae3e..2d5373c 100644 --- a/stockMate/src/main/webapp/WEB-INF/views/user/signin.jsp +++ b/stockMate/src/main/webapp/WEB-INF/views/user/signin.jsp @@ -95,6 +95,7 @@ body {