github-mirrors/No1WMS
1
0
Fork 0
mirror of https://github.com/suhf/No1WMS.git synced 2026-02-05 04:03:45 +09:00
Code Issues Packages Projects Releases Wiki Activity

#수정

Browse Source 
stock/create.jsp
stock/list.jsp
stock/read.jsp
stock/update.jsp
WarehouseController.java
WarehouseMapper.xml
This commit is contained in:
sungsu
2024-01-19 16:02:36 +09:00
parent 54d3b16003
commit 58a6166d21
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/no1/wms/stock/StockController.java
View File

@@ -172,7 +172,7 @@ public class StockController {
@PostMapping("/show_modal") @PostMapping("/show_modal")
public ModelAndView showModal(@RequestParam(name = "searchn", defaultValue = "0") int searchn, public ModelAndView showModal(@RequestParam(name = "searchn", defaultValue = "0") int searchn,
@RequestParam(name = "search", defaultValue = "") String search, @RequestParam(name = "search", defaultValue = "") String search,
@RequestParam(name = "p", defaultValue = "1") int page, @RequestParam(name = "p", defaultValue = "1") int page, String product_id,
@RequestParam String name, ModelAndView mav){ @RequestParam String name, ModelAndView mav){
int perPage = 5; // 한 페이지에 보일 글의 갯수 int perPage = 5; // 한 페이지에 보일 글의 갯수
@@ -193,8 +193,8 @@ public class StockController {
list = service.productSelect(searchn, search, startRow, perPage); list = service.productSelect(searchn, search, startRow, perPage);
count = service.productCount(searchn, search); count = service.productCount(searchn, search);
}else if(name.equals("warehouse_capacity_currentCapacity")) { }else if(name.equals("warehouse_capacity_currentCapacity")) {
list = service.warehousesSelect(searchn, search, startRow, perPage); list = service.warehousesSelect(searchn, search, startRow, perPage ,product_id);
count = service.warehouseCount(searchn, search); count = service.warehouseCount(searchn, search ,product_id);
} }
mav.addObject("list", list); mav.addObject("list", list);
@@ -227,8 +227,10 @@ public class StockController {
//테스트 //테스트
return mav; return mav;
} }
// 엑셀다운로드테스트
@GetMapping("/stock/downlodeExcelList")
// 리스트 다운로드
@GetMapping("/stock/downloadExcelList")
public void downlodeExcelList(HttpServletResponse response) { public void downlodeExcelList(HttpServletResponse response) {
List<Map<String, Object>> dto = service.selectAll(); List<Map<String, Object>> dto = service.selectAll();
String excelFileName = "재고 파일"; String excelFileName = "재고 파일";
@@ -239,10 +241,10 @@ public class StockController {
}; };
//서식 다운로드 //서식 다운로드
@GetMapping("/vendor/downlodeVendorForm") @GetMapping("/stock/downloadStockForm")
public void downlodeVendorForm (HttpServletResponse response) throws IOException { public void downlodeStockForm (HttpServletResponse response) throws IOException {
String vendorFormName = "재고 데이터 입력 서식.xlsx"; String stockFormName = "재고 데이터 입력 서식.xlsx";
excelDownlodeUtils.downlodeExcelForm(response, vendorFormName); excelDownlodeUtils.downlodeExcelForm(response, stockFormName);
}; };
} }

6
src/main/java/com/no1/wms/stock/StockService.java
View File

@@ -121,24 +121,26 @@ public class StockService {
return mapper.productCount(m); return mapper.productCount(m);
} }
public List<Map<String, Object>> warehousesSelect(int searchn, String search, int start, int perPage){ public List<Map<String, Object>> warehousesSelect(int searchn, String search, int start, int perPage, String product_id){
Map<String, Object> m = new HashMap<String, Object>(); Map<String, Object> m = new HashMap<String, Object>();
m.put("searchn", searchn); m.put("searchn", searchn);
m.put("search", search); m.put("search", search);
m.put("start", start); m.put("start", start);
m.put("perPage", perPage); m.put("perPage", perPage);
m.put("product_id", product_id);
List<Map<String, Object>> warehouseresult = mapper.warehouseSelect(m); List<Map<String, Object>> warehouseresult = mapper.warehouseSelect(m);
return warehouseresult; return warehouseresult;
} }
public int warehouseCount(int searchn, String search) { public int warehouseCount(int searchn, String search, String product_id) {
Map<String,Object> m = new HashMap<String, Object>(); Map<String,Object> m = new HashMap<String, Object>();
m.put("searchn",searchn); m.put("searchn",searchn);
m.put("search", search); m.put("search", search);
m.put("product_id", product_id);
return mapper.warehouseCount(m); return mapper.warehouseCount(m);
} }