From 9563c8eec252ed9abe13d62763c560f0a5bacb6c Mon Sep 17 00:00:00 2001 From: leeheejin Date: Thu, 20 Nov 2025 11:47:09 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B0=BD=EA=B3=A0=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/classes/com/pms/mapper/admin.xml | 2 + .../warehouseList/warehouseHistoryList.jsp | 2 + .../warehouseList/warehouseListFormPopUp.jsp | 42 +- .../admin/warehouseList/warehouseMngList.jsp | 489 +++++------------- src/com/pms/controller/AdminController.java | 50 +- src/com/pms/mapper/admin.xml | 2 + 6 files changed, 184 insertions(+), 403 deletions(-) diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml b/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml index f7357a1..eb291e3 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml @@ -8534,6 +8534,7 @@ FROM ( "> - +
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
위치코드위치코드
위치명위치명
위치설명위치설명
가출고코드가출고코드
가출고거래처명가출고거래처명
적합여부적합여부
가용재고여부가용재고여부
사용여부사용여부
BASELOC_CDBASELOC_CD
CO_CDCO_CD
LOC_NMKLOC_NMK
INSERT_IDINSERT_ID
INSERT_IPINSERT_IP
INSERT_DTINSERT_DT
MODIFY_IDMODIFY_ID
MODIFY_IPMODIFY_IP
MODIFY_DTMODIFY_DT
ATTR_NMKATTR_NMK
diff --git a/WebContent/WEB-INF/view/admin/warehouseList/warehouseMngList.jsp b/WebContent/WEB-INF/view/admin/warehouseList/warehouseMngList.jsp index a4b84b2..b15ad20 100644 --- a/WebContent/WEB-INF/view/admin/warehouseList/warehouseMngList.jsp +++ b/WebContent/WEB-INF/view/admin/warehouseList/warehouseMngList.jsp @@ -3,393 +3,164 @@ <%@ page import="java.util.*" %> <%@include file= "/init.jsp" %> <% - ArrayList warehouseList = new ArrayList(); - warehouseList = (ArrayList)request.getAttribute("warehouseList"); - if(null == warehouseList){ - warehouseList = new ArrayList(); - } - - // 검색 조건 - String searchCode = CommonUtils.checkNull(request.getParameter("searchCode")); String searchLocationCode = CommonUtils.checkNull(request.getParameter("searchLocationCode")); String searchLocationName = CommonUtils.checkNull(request.getParameter("searchLocationName")); - String searchLocationDescription = CommonUtils.checkNull(request.getParameter("searchLocationDescription")); - String searchOutCode = CommonUtils.checkNull(request.getParameter("searchOutCode")); - String searchOutCoName = CommonUtils.checkNull(request.getParameter("searchOutCoName")); - String searchFitStatus = CommonUtils.checkNull(request.getParameter("searchFitStatus")); - String searchAvailableStatus = CommonUtils.checkNull(request.getParameter("searchAvailableStatus")); - String searchUseStatus = CommonUtils.checkNull(request.getParameter("searchUseStatus")); - String searchBaseLocCd = CommonUtils.checkNull(request.getParameter("searchBaseLocCd")); - String searchCoCd = CommonUtils.checkNull(request.getParameter("searchCoCd")); - String searchLocNmk = CommonUtils.checkNull(request.getParameter("searchLocNmk")); - String searchInsertId = CommonUtils.checkNull(request.getParameter("searchInsertId")); - String searchInsertIp = CommonUtils.checkNull(request.getParameter("searchInsertIp")); - String searchInsertDt = CommonUtils.checkNull(request.getParameter("searchInsertDt")); - String searchModifyId = CommonUtils.checkNull(request.getParameter("searchModifyId")); - String searchModifyIp = CommonUtils.checkNull(request.getParameter("searchModifyIp")); - String searchModifyDt = CommonUtils.checkNull(request.getParameter("searchModifyDt")); - String searchAttrNmk = CommonUtils.checkNull(request.getParameter("searchAttrNmk")); %> - <%=Constants.SYSTEM_NAME%> - - $("#searchCode").val(code); - form.action="/admin/warehouseList.do"; - form.submit(); - } - - //프로젝트에 해당하는 WBS Task 목록 PopUp을 호출한다. - function fn_openCodeHistory(objId){ - if(null != objId){ - window.open("/admin/warehouseHistoryList.do?objId="+objId, "", "width=1600, height=600"); - }else{ - Swal.fire("잘못된 접근입니다."); + - - -
- - - -
-
- -
-
-

창고 관리

-
- -
- - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
위치코드위치명위치설명가출고코드가출고거래처명적합여부가용재고여부사용여부BASELOC_CDCO_CDLOC_NMKINSERT_IDINSERT_IPINSERT_DTMODIFY_IDMODIFY_IPMODIFY_DTATTR_NMK기능
-
- - - - - - - - - - - - - - - - - - - - - - - - <% - if(0 < warehouseList.size()){ - for(int i=0;i - - - - - - - - - - - - - - - - - - - - - - - <% - } - }else{ - %> - - - - <% - } - %> -
- <%=LOCATION_CODE%> - - <%=LOCATION_NAME%><%=LOCATION_DESCRIPTION %><%=OUT_CODE %><%=OUT_CO_NAME %><%=FIT_STATUS %><%=AVAILABLE_STATUS %><%=USE_STATUS %><%=BASE_LOC_CD %><%=CO_CD %><%=LOC_NMK %><%=INSERT_ID %><%=INSERT_IP %><%=INSERT_DT %><%=MODIFY_ID %><%=MODIFY_IP %><%=MODIFY_DT %><%=ATTR_NMK %>
해당하는 데이터가 없습니다.
-
+ + + + + +
+ +
+
+
+

+ 창고 관리 +

+
+ + + +
+
+
+ + + + + + + + + +
+
+ + <%@include file="/WEB-INF/view/common/common_gridArea.jsp" %> +
-
\ No newline at end of file diff --git a/src/com/pms/controller/AdminController.java b/src/com/pms/controller/AdminController.java index da517c2..5c4b987 100644 --- a/src/com/pms/controller/AdminController.java +++ b/src/com/pms/controller/AdminController.java @@ -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 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 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 paramMap){ - List> 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 paramMap){ + // List> 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일 이희진 diff --git a/src/com/pms/mapper/admin.xml b/src/com/pms/mapper/admin.xml index f7357a1..eb291e3 100644 --- a/src/com/pms/mapper/admin.xml +++ b/src/com/pms/mapper/admin.xml @@ -8534,6 +8534,7 @@ FROM (