From 7b4d23e5bac6277dd85bd6664d9242d62f445808 Mon Sep 17 00:00:00 2001 From: shoqying Date: Thu, 19 Dec 2024 19:06:29 +0900 Subject: [PATCH] sadf --- .../com/stockm8/controller/ReceivingController.java | 4 ++-- .../java/com/stockm8/service/ReceivingService.java | 8 ++------ .../com/stockm8/service/ReceivingServiceImpl.java | 11 +++++------ .../src/main/resources/mappers/receivingMapper.xml | 5 ++--- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java b/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java index 2a190cd..b16de2a 100644 --- a/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java +++ b/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java @@ -274,11 +274,11 @@ public Map scanPOST(@RequestBody Map payload, // OrderService에 해당 메소드 추가 필요 int orderId = orderService.getOrderIdByOrderItemId(orderItemId); - rService.ReceivingStatusToComplete(businessId, barcode, receivingShipmentNo, orderId, completedItems); + rService.ReceivingStatusToComplete(businessId, barcode, receivingShipmentNo, orderItemId); int remainingStock = rService.increseStockByBarcode(businessId, barcode, receivingShipmentNo, orderItemId); - int reservedQuantity = rService.decreaseReservedQuantity(businessId, barcode, receivingShipmentNo, orderItemId); + int reservedQuantity = rService.decreaseReservedQuantity(businessId, barcode, receivingShipmentNo, orderItemId, orderId, completedItems); ProductVO product = rService.productNameBarcode(businessId, barcode, receivingShipmentNo); if (reservedQuantity >= 0) { diff --git a/stockMate/src/main/java/com/stockm8/service/ReceivingService.java b/stockMate/src/main/java/com/stockm8/service/ReceivingService.java index 2d8a5e1..906ad5b 100644 --- a/stockMate/src/main/java/com/stockm8/service/ReceivingService.java +++ b/stockMate/src/main/java/com/stockm8/service/ReceivingService.java @@ -41,18 +41,14 @@ public interface ReceivingService { public int increseStockByBarcode(int businessId, String barcode, Integer receivingShipmentNo, Integer orderItemId) throws Exception; // 바코드 찍은 후 발주 수량 감소 - public int decreaseReservedQuantity(int businessId, String barcode, Integer receivingShipmentNo, Integer orderItemId) throws Exception; + public int decreaseReservedQuantity(int businessId, String barcode, Integer receivingShipmentNo, Integer orderItemIdint, int orderId, List completedItems) throws Exception; // 바코드 찍은 후 제품 이름 추출 public ProductVO productNameBarcode(int businessId, String barcode, Integer receivingShipmentNo) throws Exception; // 수량 없을시 완료상태로 변경 - - public void ReceivingStatusToComplete(int businessId, String barcode, Integer receivingShipmentNo,int orderId, List completedItems) throws Exception; + public void ReceivingStatusToComplete(int businessId, String barcode, Integer receivingShipmentNo, int orderId) 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 45bf84a..3f7223b 100644 --- a/stockMate/src/main/java/com/stockm8/service/ReceivingServiceImpl.java +++ b/stockMate/src/main/java/com/stockm8/service/ReceivingServiceImpl.java @@ -108,9 +108,9 @@ public int increseStockByBarcode(int businessId, String barcode, Integer receivi } @Override - public int decreaseReservedQuantity(int businessId, String barcode, Integer receivingShipmentNo, Integer orderItemId) throws Exception { + public int decreaseReservedQuantity(int businessId, String barcode, Integer receivingShipmentNo, Integer orderItemId, int orderId, List completedItems) throws Exception { logger.info("decreaseReservedQuantity() 호출"); - + opService.processInboundAfterInspection(orderId, completedItems); return rdao.selectReservedQuantity(businessId, barcode, receivingShipmentNo, orderItemId); } @@ -122,12 +122,11 @@ public ProductVO productNameBarcode(int businessId, String barcode, Integer rece } @Override - public void ReceivingStatusToComplete(int businessId, String barcode, Integer receivingShipmentNo,int orderId, List completedItems) { + public void ReceivingStatusToComplete(int businessId, String barcode, Integer receivingShipmentNo, int orderId) { try { // MyBatis 매퍼 호출 - rdao.updateReceivingStatusToComplete(businessId, barcode, receivingShipmentNo); - opService.processInboundAfterInspection(orderId, completedItems); - + rdao.updateReceivingStatusToComplete(businessId, barcode, receivingShipmentNo, orderId); + } catch (Exception e) { // 예외 처리 logger.error("입고 상태 업데이트 오류: " + e.getMessage()); diff --git a/stockMate/src/main/resources/mappers/receivingMapper.xml b/stockMate/src/main/resources/mappers/receivingMapper.xml index daa8e6c..e362b98 100644 --- a/stockMate/src/main/resources/mappers/receivingMapper.xml +++ b/stockMate/src/main/resources/mappers/receivingMapper.xml @@ -47,7 +47,7 @@ SELECT DISTINCT o.order_item_id, s.stock_id, o.warehouse_id, - u.created_by + #{createdBy} FROM products p JOIN order_items o ON o.product_id = p.product_id JOIN stocks s ON s.product_id = p.product_id @@ -290,12 +290,11 @@ AND r.order_item_id = #{orderItemId} SET r.status = 'COMPLETED', s.reserved_quantity = s.reserved_quantity - o.quantity WHERE p.product_barcode = #{barcode} - AND o.change_quantity = 0 + AND o.change_quantity = 1 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;