diff --git a/src/main/java/com/no1/wms/stock/StockController.java b/src/main/java/com/no1/wms/stock/StockController.java index ac4ca05..0b97e4e 100644 --- a/src/main/java/com/no1/wms/stock/StockController.java +++ b/src/main/java/com/no1/wms/stock/StockController.java @@ -147,13 +147,8 @@ public class StockController { @PostMapping("/create_process") @ResponseBody public boolean createProcess(StockDto dto) { - int i = service.createStock(dto); - if (i != 0) { - service.updateWarehousePlus(dto); + service.checkandUpdateOrCreateProcess(dto); return true; - } else { - return false; - } } diff --git a/src/main/java/com/no1/wms/stock/StockMapper.java b/src/main/java/com/no1/wms/stock/StockMapper.java index 1fa0ad7..009c55a 100644 --- a/src/main/java/com/no1/wms/stock/StockMapper.java +++ b/src/main/java/com/no1/wms/stock/StockMapper.java @@ -1,5 +1,6 @@ package com.no1.wms.stock; +import com.no1.wms.in.InDto; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -43,6 +44,12 @@ public interface StockMapper { int warehouseCount(Map m);//검색 글 갯수 + + int checkIfExistsStock(StockDto dto); + int updateStockProcess(StockDto dto); + int createStockProcess(StockDto dto); + + } diff --git a/src/main/java/com/no1/wms/stock/StockService.java b/src/main/java/com/no1/wms/stock/StockService.java index c8d349b..cd8e834 100644 --- a/src/main/java/com/no1/wms/stock/StockService.java +++ b/src/main/java/com/no1/wms/stock/StockService.java @@ -1,5 +1,6 @@ package com.no1.wms.stock; +import com.no1.wms.in.InDto; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,24 +14,24 @@ import java.util.Map; public class StockService { @Autowired StockMapper mapper; - + public int count(int searchn, String search) { - - System.out.println(searchn+search); - - Map m = new HashMap(); - m.put("searchn",searchn); + + System.out.println(searchn + search); + + Map m = new HashMap(); + m.put("searchn", searchn); m.put("search", search); return mapper.count(m); } - - public List> list(int searchn, String search, int start, int perPage){ - - System.out.println(searchn+search); - + + public List> list(int searchn, String search, int start, int perPage) { + + System.out.println(searchn + search); + Map m = new HashMap(); - m.put("searchn",searchn); + m.put("searchn", searchn); m.put("search", search); m.put("start", start); m.put("perPage", perPage); @@ -38,26 +39,26 @@ public class StockService { List> result = mapper.list(m); log.debug("warehouseOne테스트 :: " + result); return result; - + } public int count2(int searchn, String search) { - System.out.println(searchn+search); + System.out.println(searchn + search); - Map m = new HashMap(); - m.put("searchn",searchn); + Map m = new HashMap(); + m.put("searchn", searchn); m.put("search", search); return mapper.count2(m); } - public List> list2(int searchn, String search, int start, int perPage){ + public List> list2(int searchn, String search, int start, int perPage) { - System.out.println(searchn+search); + System.out.println(searchn + search); Map m = new HashMap(); - m.put("searchn",searchn); + m.put("searchn", searchn); m.put("search", search); m.put("start", start); m.put("perPage", perPage); @@ -68,30 +69,30 @@ public class StockService { } - + public Map stockOne(String id) { return mapper.stockOne(id); } - - + + public int createStock(StockDto dto) { return mapper.createStock(dto); } - - + + public int updateStock(StockDto dto) { return mapper.updateStock(dto); } - public int updateWarehouse(StockDto dto){ + public int updateWarehouse(StockDto dto) { return mapper.updateWarehouse(dto); } - public int updateWarehousePlus(StockDto dto){ + public int updateWarehousePlus(StockDto dto) { return mapper.updateWarehousePlus(dto); } - public int updateWarehouseDeleteStock(StockDto dto){ + public int updateWarehouseDeleteStock(StockDto dto) { return mapper.updateWarehouseDeleteStock(dto); } @@ -100,7 +101,7 @@ public class StockService { } - public List> productSelect(int searchn, String search, int start, int perPage){ + public List> productSelect(int searchn, String search, int start, int perPage) { Map m = new HashMap(); m.put("searchn", searchn); m.put("search", search); @@ -115,13 +116,13 @@ public class StockService { public int productCount(int searchn, String search) { - Map m = new HashMap(); - m.put("searchn",searchn); + Map m = new HashMap(); + m.put("searchn", searchn); m.put("search", search); return mapper.productCount(m); } - public List> warehousesSelect(int searchn, String search, int start, int perPage){ + public List> warehousesSelect(int searchn, String search, int start, int perPage) { Map m = new HashMap(); m.put("searchn", searchn); m.put("search", search); @@ -136,8 +137,8 @@ public class StockService { public int warehouseCount(int searchn, String search) { - Map m = new HashMap(); - m.put("searchn",searchn); + Map m = new HashMap(); + m.put("searchn", searchn); m.put("search", search); return mapper.warehouseCount(m); } @@ -147,5 +148,16 @@ public class StockService { } -} + //createProcess + public boolean checkandUpdateOrCreateProcess(StockDto dto){ + int j = mapper.checkIfExistsStock(dto); + if (j == 1){ + mapper.updateStockProcess(dto); + }else{ + mapper.createStockProcess(dto); + } + mapper.updateWarehousePlus(dto); + return true; + } +} \ No newline at end of file diff --git a/src/main/resources/mappers/StockMapper.xml b/src/main/resources/mappers/StockMapper.xml index a7d73f6..de75fa7 100644 --- a/src/main/resources/mappers/StockMapper.xml +++ b/src/main/resources/mappers/StockMapper.xml @@ -210,4 +210,24 @@ where id = #{id} + + + + + + + + + UPDATE stock + SET quantity = quantity + #{quantity} + WHERE warehouse_id = #{warehouseId} AND product_id = #{productId} + + + + INSERT INTO stock (id, warehouse_id, product_id, quantity, activation) + VALUES (UUID(), #{warehouseId}, #{productId}, #{quantity}, 1) + \ No newline at end of file