chpark/wace_plm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

창고관리 완료

Browse Source
This commit is contained in:
leeheejin
2025-11-20 11:47:09 +09:00
parent 735ea9e048
commit 9563c8eec2
6 changed files with 184 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/com/pms/controller/AdminController.java
View File

@@ -1365,7 +1365,7 @@ public class AdminController extends BaseService {
/**
* 창고 관리 조회 11월 18일 이희진
* 창고 관리 조회 (JSP 페이지 로딩) 11월 18일 이희진
*
* @param request
* @param paramMap
@@ -1373,15 +1373,21 @@ public class AdminController extends BaseService {
*/
@RequestMapping("/admin/warehouseList.do")
public String getwarehouseList(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
ArrayList warehouseList = new ArrayList();
try{
warehouseList = (ArrayList)adminService.getWarehouseList(request, paramMap);
}catch(Exception e){
e.printStackTrace();
}
request.setAttribute("warehouseList",warehouseList);
return "/admin/warehouseList/warehouseMngList";
}
/**
* 창고 관리 조회 (Tabulator Grid용 JSON) 11월 20일 이희진
*
* @param request
* @param paramMap
* @return
*/
@RequestMapping(value="/admin/warehouseListPagingGridList.do", produces="application/json")
@ResponseBody
public Map getwarehouseListPagingGrid(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
commonService.selectListPagingNew("admin.getWarehouseList", request, paramMap);
return paramMap;
}
/**
@@ -1430,21 +1436,19 @@ public class AdminController extends BaseService {
/**
* 창고 관리 변경이력 11월 18일 이희진
* @param request
* @param paramMap
* @return
*
*/
@RequestMapping("/admin/warehouseHistoryList.do")
public String warehouseHistoryList(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
List<Map<String,Object>> list = new ArrayList();
try{
list = adminService.warehouseHistoryList(request, paramMap);
}catch(Exception e){
e.printStackTrace();
}
request.setAttribute("LIST", CommonUtils.toUpperCaseMapKey(list));
return "/admin/warehouseList/warehouseHistoryList";
}
// @RequestMapping("/admin/warehouseHistoryList.do")
// public String warehouseHistoryList(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
// List<Map<String,Object>> list = new ArrayList();
// try{
// list = adminService.warehouseHistoryList(request, paramMap);
// }catch(Exception e){
// e.printStackTrace();
// }
// request.setAttribute("LIST", CommonUtils.toUpperCaseMapKey(list));
// return "/admin/warehouseList/warehouseHistoryList";
// }
/**
* 창고 관리 데이터를 저장한다. 11월 19일 이희진

2
src/com/pms/mapper/admin.xml
View File

@@ -8534,6 +8534,7 @@ FROM (
<select id="getWarehouseList" parameterType="map" resultType="map">
SELECT
ROW_NUMBER() OVER (ORDER BY LOCATION_CODE) AS RNUM,
OBJID,
LOCATION_CODE,
LOCATION_NAME,
@@ -8670,6 +8671,7 @@ FROM (
)
ON CONFLICT (OBJID) DO UPDATE
SET
LOCATION_CODE = #{location_code},
LOCATION_NAME = #{location_name},
LOCATION_DESCRIPTION = #{location_description},
OUT_CODE = #{out_code},