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

2
WebContent/WEB-INF/classes/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},

2
WebContent/WEB-INF/view/admin/warehouseList/warehouseHistoryList.jsp
View File

@@ -1,3 +1,5 @@
<!-- 혹시나해서 남겨두는 파일 사실상 필요는 없습니다 -->
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ page import="com.pms.common.utils.*"%>
<%@ page import="java.util.*" %>

42
WebContent/WEB-INF/view/admin/warehouseList/warehouseListFormPopUp.jsp
View File

@@ -29,7 +29,7 @@ function saveWarehouse(){
success: function(result){
alert(result.message);
if(result.resultFlag == "true"){
opener.searchList();
opener.fn_search();
self.close();
}
}
@@ -74,34 +74,34 @@ function convertToDBFormat(dateStr) {
<div class="admin_title">
<h2>창고 등록/수정</h2>
</div>
<div id="adminPopupFormWrap">
<div id="businessPopupFormWrap">
<form name="warehouseForm" id="warehouseForm">
<input type="hidden" name="objid" value="${info.OBJID}">
<input type="hidden" name="writer" value="<%=session.getAttribute("USER_ID")%>">
<table id="adminPopupForm">
<table class="pmsPopupForm"">
<tr>
<td>위치코드</td>
<td class="input_title"><label for=""></label>위치코드<label></td>
<td><input type="text" name="location_code" value="${info.LOCATION_CODE}" required></td>
</tr>
<tr>
<td>위치명</td>
<td class="input_title"><label for=""></label>위치명<label></td>
<td><input type="text" name="location_name" value="${info.LOCATION_NAME}" required></td>
</tr>
<tr>
<td>위치설명</td>
<td class="input_title"><label for=""></label>위치설명<label></td>
<td><input type="text" name="location_description" value="${info.LOCATION_DESCRIPTION}"></td>
</tr>
<tr>
<td>가출고코드</td>
<td class="input_title"><label for=""></label>가출고코드<label></td>
<td><input type="text" name="out_code" value="${info.OUT_CODE}"></td>
</tr>
<tr>
<td>가출고거래처명</td>
<td class="input_title"><label for=""></label>가출고거래처명<label></td>
<td><input type="text" name="out_co_name" value="${info.OUT_CO_NAME}"></td>
</tr>
<tr>
<td>적합여부</td>
<td class="input_title"><label for=""></label>적합여부<label></td>
<td>
<select name="fit_status">
<option value="">선택</option>
@@ -111,7 +111,7 @@ function convertToDBFormat(dateStr) {
</td>
</tr>
<tr>
<td>가용재고여부</td>
<td class="input_title"><label for=""></label>가용재고여부<label></td>
<td>
<select name="available_status">
<option value="">선택</option>
@@ -121,7 +121,7 @@ function convertToDBFormat(dateStr) {
</td>
</tr>
<tr>
<td>사용여부</td>
<td class="input_title"><label for=""></label>사용여부<label></td>
<td>
<select name="use_status">
<option value="Y" ${empty info.USE_STATUS or info.USE_STATUS eq 'Y' ? 'selected' : ''}>사용</option>
@@ -130,43 +130,43 @@ function convertToDBFormat(dateStr) {
</td>
</tr>
<tr>
<td>BASELOC_CD</td>
<td class="input_title"><label for=""></label>BASELOC_CD<label></td>
<td><input type="text" name="base_loc_cd" value="${info.BASE_LOC_CD}"></td>
</tr>
<tr>
<td>CO_CD</td>
<td class="input_title"><label for=""></label>CO_CD<label></td>
<td><input type="text" name="co_cd" value="${info.CO_CD}"></td>
</tr>
<tr>
<td>LOC_NMK</td>
<td class="input_title"><label for=""></label>LOC_NMK<label></td>
<td><input type="text" name="loc_nmk" value="${info.LOC_NMK}"></td>
</tr>
<tr>
<td>INSERT_ID</td>
<td class="input_title"><label for=""></label>INSERT_ID<label></td>
<td><input type="text" name="insert_id" value="${info.INSERT_ID}"></td>
</tr>
<tr>
<td>INSERT_IP</td>
<td class="input_title"><label for=""></label>INSERT_IP<label></td>
<td><input type="text" name="insert_ip" value="${info.INSERT_IP}"></td>
</tr>
<tr>
<td>INSERT_DT</td>
<td class="input_title"><label for=""></label>INSERT_DT<label></td>
<td><input type="text" name="insert_dt" value="${info.INSERT_DT}" placeholder="YYYY-MM-DD HH:MM:SS"></td>
</tr>
<tr>
<td>MODIFY_ID</td>
<td class="input_title"><label for=""></label>MODIFY_ID<label></td>
<td><input type="text" name="modify_id" value="${info.MODIFY_ID}"></td>
</tr>
<tr>
<td>MODIFY_IP</td>
<td class="input_title"><label for=""></label>MODIFY_IP<label></td>
<td><input type="text" name="modify_ip" value="${info.MODIFY_IP}"></td>
</tr>
<tr>
<td>MODIFY_DT</td>
<td class="input_title"><label for=""></label>MODIFY_DT<label></td>
<td><input type="text" name="modify_dt" value="${info.MODIFY_DT}" placeholder="YYYY-MM-DD HH:MM:SS"></td>
</tr>
<tr>
<td>ATTR_NMK</td>
<td class="input_title"><label for=""></label>ATTR_NMK<label></td>
<td><input type="text" name="attr_nmk" value="${info.ATTR_NMK}"></td>
</tr>
</table>

489
WebContent/WEB-INF/view/admin/warehouseList/warehouseMngList.jsp
View File

@@ -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"));
%>
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<!-- <link rel="stylesheet" href="css/basic.css"> -->
<title><%=Constants.SYSTEM_NAME%></title>
<script type="text/javascript">
<script>
$(document).ready(function(){
$('.select2').select2();
fnc_datepick();
});
//카테고리 분류의 상세 내용을 보여주는 팝업을 호출한다.
function openwarehouseListInfoPopUp(objid){
var form = document.hiddenForm;
window.open("","openwarehouseListInfoPopUp","width=500 height=800 menubar=no status=no");
form.objid.value = objid;
form.target = "openwarehouseListInfoPopUp";
form.action = "/admin/warehouseListFormPopUp.do";
form.submit();
}
function searchList(){
var form = document.warehouseListForm;
var selectCnt= $("#LevOption select").length;
var code = "";
$("select[name^=code] option:selected").each(function(i, selected){
if($(selected).val()!=""){
code = $(selected).val();
}
//엔터키로 조회
$("input").keyup(function(e){
if(e.keyCode == 13){
$("#page").val("1");
fn_search();
}
});
$("#btnSearch").click(function(){
$("#page").val("1");
fn_search();
});
//삭제
$("#btnDelete").click(function(){
fn_delete();
});
fn_search();
});
</script>
$("#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("잘못된 접근입니다.");
<script type="text/javascript">
var columns = [
{title:'OBJID', field:'OBJID', visible:false},
{headerHozAlign:'center', hozAlign:'center', width:'50', title:'NO', field:'RNUM'},
{headerHozAlign:'center', hozAlign:'center', width:'120', title:'위치코드', field:'LOCATION_CODE',
formatter: fnc_createGridAnchorTag,
cellClick: function(e, cell) {
var objid = fnc_checkNull(cell.getData().OBJID);
openwarehouseListInfoPopUp(objid);
}
}
},
{headerHozAlign:'center', hozAlign:'left', width:'150', title:'위치명', field:'LOCATION_NAME'},
{headerHozAlign:'center', hozAlign:'left', width:'200', title:'위치설명', field:'LOCATION_DESCRIPTION'},
{headerHozAlign:'center', hozAlign:'center', width:'120', title:'가출고코드', field:'OUT_CODE'},
{headerHozAlign:'center', hozAlign:'left', width:'150', title:'가출고거래처명', field:'OUT_CO_NAME'},
{headerHozAlign:'center', hozAlign:'center', width:'80', title:'적합여부', field:'FIT_STATUS'},
{headerHozAlign:'center', hozAlign:'center', width:'100', title:'가용재고여부', field:'AVAILABLE_STATUS'},
{headerHozAlign:'center', hozAlign:'center', width:'80', title:'사용여부', field:'USE_STATUS'},
{headerHozAlign:'center', hozAlign:'center', width:'100', title:'BASELOC_CD', field:'BASE_LOC_CD'},
{headerHozAlign:'center', hozAlign:'center', width:'80', title:'CO_CD', field:'CO_CD'},
{headerHozAlign:'center', hozAlign:'left', width:'150', title:'LOC_NMK', field:'LOC_NMK'},
{headerHozAlign:'center', hozAlign:'center', width:'100', title:'INSERT_ID', field:'INSERT_ID'},
{headerHozAlign:'center', hozAlign:'center', width:'120', title:'INSERT_IP', field:'INSERT_IP'},
{headerHozAlign:'center', hozAlign:'center', width:'150', title:'INSERT_DT', field:'INSERT_DT'},
{headerHozAlign:'center', hozAlign:'center', width:'100', title:'MODIFY_ID', field:'MODIFY_ID'},
{headerHozAlign:'center', hozAlign:'center', width:'120', title:'MODIFY_IP', field:'MODIFY_IP'},
{headerHozAlign:'center', hozAlign:'center', width:'150', title:'MODIFY_DT', field:'MODIFY_DT'},
{headerHozAlign:'center', hozAlign:'left', width:'150', title:'ATTR_NMK', field:'ATTR_NMK'}
];
function fn_search(){
_tabulGrid = fnc_tabul_search(_tabul_layout_fitColumns, _tabulGrid, "/admin/warehouseListPagingGridList.do", columns, true);
}
function fn_delete(){
var checkedObj = _tabulGrid.getSelectedData();
//프로젝트에 해당하는 WBS Task 목록 PopUp을 호출한다.
function fn_delete(objId){
if("" != objId){
if(confirm("삭제하시겠습니까?")){
if(0 < checkedObj.length){
var objId = fnc_checkNull(checkedObj[0].OBJID);
Swal.fire({
title: '선택한 창고정보를 삭제하시겠습니까?',
text: '',
icon: 'warning',
showCancelButton: true,
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: '확인',
cancelButtonText: '취소',
reverseButtons: false
}).then(result => {
if (result.isConfirmed) {
$.ajax({
url:"/admin/deleteWarehouse.do",
type:"POST",
data:{"OBJID":objId},
type: "POST",
url: "/admin/deleteWarehouse.do",
data: {"OBJID":objId},
dataType:"json",
async:false,
success:function(data){
Swal.fire(data.msg);
if(data.result){
searchList();
if(data.result == 'true'){
Swal.fire("삭제되었습니다.");
fn_search();
}
},
error: function(jqxhr, status, error){
}
}
});
}
}
});
}else{
Swal.fire("선택한 항목이 없습니다.");
}
}
function openwarehouseListInfoPopUp(objid){
var popup_width = 400;
var popup_height = 800;
var target = "openwarehouseListInfoPopUp";
var url = "/admin/warehouseListFormPopUp.do";
fn_centerPopup(popup_width, popup_height, url, target);
var hiddenForm = document.hiddenForm;
hiddenForm.objid.value = objid;
hiddenForm.target = "openwarehouseListInfoPopUp";
hiddenForm.action = "/admin/warehouseListFormPopUp.do";
hiddenForm.submit();
}
</script>
</head>
<body>
<form name="hiddenForm" id="hiddenForm" method="POST">
<input type="hidden" name="actionType" id="actionType">
<input type="hidden" name="objid" id="objid">
<input type="hidden" name="status" id="status">
</form>
<form name="warehouseListForm" id="warehouseListForm" action="" method="post">
<input type="hidden" name="searchCode" id="searchCode" value="<%=searchCode%>" >
<section id="commonSection" class="admin1">
<div class="admin_title">
<h2>창고 관리</h2>
</div>
<!-- <div id="adminFormWrap">
<table id="adminForm">
<tbody>
<tr>
<td class="label"><label for="">위치코드</label></td>
<td>
<input type="text" name="searchLocationCode" id="searchLocationCode" value="<%=searchLocationCode%>">
</td>
</tr>
<tr>
<td class="label"><label for="">위치명</label></td>
<td>
<input type="text" name="searchLocationName" id="searchLocationName" value="<%=searchLocationName%>">
</td>
</tr>
<tr>
<td class="label"><label for="">위치설명</label></td>
<td>
<input type="text" name="searchLocationDescription" id="searchLocationDescription" value="<%=searchLocationDescription%>">
</td>
</tr>
<tr>
<td class="label"><label for="">가출고코드</label></td>
<td>
<input type="text" name="searchOutCode" id="searchOutCode" value="<%=searchOutCode%>">
</td>
</tr>
<tr>
<td class="label"><label for="">가출고거래처명</label></td>
<td>
<input type="text" name="searchOutCoName" id="searchOutCoName" value="<%=searchOutCoName%>">
</td>
</tr>
<tr>
<td class="label"><label for="">적합여부</label></td>
<td>
<input type="text" name="searchFitStatus" id="searchFitStatus" value="<%=searchFitStatus%>">
</td>
</tr>
<tr>
<td class="label"><label for="">가용재고여부</label></td>
<td>
<input type="text" name="searchAvailableStatus" id="searchAvailableStatus" value="<%=searchAvailableStatus%>">
</td>
</tr>
<tr>
<td class="label"><label for="">사용여부</label></td>
<td>
<input type="text" name="searchUseStatus" id="searchUseStatus" value="<%=searchUseStatus%>">
</td>
</tr>
<tr>
<td class="label"><label for="">BASELOC_CD</label></td>
<td>
<input type="text" name="searchBaseLocCd" id="searchBaseLocCd" value="<%=searchBaseLocCd%>">
</td>
</tr>
<tr>
<td class="label"><label for="">CO_CD</label></td>
<td>
<input type="text" name="searchCoCd" id="searchCoCd" value="<%=searchCoCd%>">
</td>
</tr>
<tr>
<td class="label"><label for="">LOC_NMK</label></td>
<td>
<input type="text" name="searchLocNmk" id="searchLocNmk" value="<%=searchLocNmk%>">
</td>
</tr>
<tr>
<td class="label"><label for="">INSERT_ID</label></td>
<td>
<input type="text" name="searchInsertId" id="searchInsertId" value="<%=searchInsertId%>">
</td>
</tr>
<tr>
<td class="label"><label for="">INSERT_IP</label></td>
<td>
<input type="text" name="searchInsertIp" id="searchInsertIp" value="<%=searchInsertIp%>">
</td>
</tr>
<tr>
<td class="label"><label for="">INSERT_DT</label></td>
<td>
<input type="text" name="searchInsertDt" id="searchInsertDt" value="<%=searchInsertDt%>">
</td>
</tr>
<tr>
<td class="label"><label for="">MODIFY_ID</label></td>
<td>
<input type="text" name="searchModifyId" id="searchModifyId" value="<%=searchModifyId%>">
</td>
</tr>
<tr>
<td class="label"><label for="">MODIFY_IP</label></td>
<td>
<input type="text" name="searchModifyIp" id="searchModifyIp" value="<%=searchModifyIp%>">
</td>
</tr>
<tr>
<td class="label"><label for="">MODIFY_DT</label></td>
<td>
<input type="text" name="searchModifyDt" id="searchModifyDt" value="<%=searchModifyDt%>">
</td>
</tr>
<tr>
<td class="label"><label for="">ATTR_NMK</label></td>
<td>
<input type="text" name="searchAttrNmk" id="searchAttrNmk" value="<%=searchAttrNmk%>">
</td>
</tr>
</tbody>
</table>
</div> -->
<div id="adminBtnWrap">
<input type="button" value="조회" class="btns" onclick="javascript:searchList();">
<input type="button" value="창고등록" class="btns" onclick="javascript:openwarehouseListInfoPopUp('');">
</div>
<div id="adminTableWrap">
<div id="tableWrap">
<table id="adminTable" >
<colgroup>
<col width="13%" />
<col width="16%" />
<col width="16%" />
<col width="16%" />
<col width="18%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="40px" />
</colgroup>
<tr>
<td>위치코드</td>
<td>위치명</td>
<td>위치설명</td>
<td>가출고코드</td>
<td>가출고거래처명</td>
<td>적합여부</td>
<td>가용재고여부</td>
<td>사용여부</td>
<td>BASELOC_CD</td>
<td>CO_CD</td>
<td>LOC_NMK</td>
<td>INSERT_ID</td>
<td>INSERT_IP</td>
<td>INSERT_DT</td>
<td>MODIFY_ID</td>
<td>MODIFY_IP</td>
<td>MODIFY_DT</td>
<td>ATTR_NMK</td>
<td colspan="8">기능</td>
</tr>
</table>
<div style="width:101%; height:600px; overflow-y:scroll; border-bottom: 2px solid #000;">
<table id="adminTable" style="border: 1px solid #b9c5d6;">
<colgroup>
<col width="13%" />
<col width="16%" />
<col width="16%" />
<col width="16%" />
<col width="18%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="40px" />
<col width="40px" />
</colgroup>
<%
if(0 < warehouseList.size()){
for(int i=0;i<warehouseList.size();i++){
HashMap warehouseMap = (HashMap)warehouseList.get(i);
String OBJID = CommonUtils.checkNull(warehouseMap.get("OBJID"));
String LOCATION_CODE = CommonUtils.checkNull(warehouseMap.get("LOCATION_CODE"));
String LOCATION_NAME = CommonUtils.checkNull(warehouseMap.get("LOCATION_NAME"));
String LOCATION_DESCRIPTION = CommonUtils.checkNull(warehouseMap.get("LOCATION_DESCRIPTION"));
String OUT_CODE = CommonUtils.checkNull(warehouseMap.get("OUT_CODE"));
String OUT_CO_NAME = CommonUtils.checkNull(warehouseMap.get("OUT_CO_NAME"));
String FIT_STATUS = CommonUtils.checkNull(warehouseMap.get("FIT_STATUS"));
String AVAILABLE_STATUS = CommonUtils.checkNull(warehouseMap.get("AVAILABLE_STATUS"));
String USE_STATUS = CommonUtils.checkNull(warehouseMap.get("USE_STATUS"));
String BASE_LOC_CD = CommonUtils.checkNull(warehouseMap.get("BASE_LOC_CD"));
String CO_CD = CommonUtils.checkNull(warehouseMap.get("CO_CD"));
String LOC_NMK = CommonUtils.checkNull(warehouseMap.get("LOC_NMK"));
String INSERT_ID = CommonUtils.checkNull(warehouseMap.get("INSERT_ID"));
String INSERT_IP = CommonUtils.checkNull(warehouseMap.get("INSERT_IP"));
String INSERT_DT = CommonUtils.checkNull(warehouseMap.get("INSERT_DT"));
String MODIFY_ID = CommonUtils.checkNull(warehouseMap.get("MODIFY_ID"));
String MODIFY_IP = CommonUtils.checkNull(warehouseMap.get("MODIFY_IP"));
String MODIFY_DT = CommonUtils.checkNull(warehouseMap.get("MODIFY_DT"));
String ATTR_NMK = CommonUtils.checkNull(warehouseMap.get("ATTR_NMK"));
%>
<tr>
<td>
<a href="#" onclick="javascript:openwarehouseListInfoPopUp('<%=OBJID %>')"><%=LOCATION_CODE%></a>
<!-- <input type="button" class="blue_btn" value="이력" onclick="fn_openCodeHistory('<%=OBJID%>');" style="float:none;">
<input type="button" class="blue_btn" value="삭제" onclick="fn_delete('<%=OBJID%>');" style="float:none;"> -->
</td>
<td><%=LOCATION_NAME%></td>
<td><%=LOCATION_DESCRIPTION %></td>
<td><%=OUT_CODE %></td>
<td><%=OUT_CO_NAME %></td>
<td><%=FIT_STATUS %></td>
<td><%=AVAILABLE_STATUS %></td>
<td><%=USE_STATUS %></td>
<td><%=BASE_LOC_CD %></td>
<td><%=CO_CD %></td>
<td><%=LOC_NMK %></td>
<td><%=INSERT_ID %></td>
<td><%=INSERT_IP %></td>
<td><%=INSERT_DT %></td>
<td><%=MODIFY_ID %></td>
<td><%=MODIFY_IP %></td>
<td><%=MODIFY_DT %></td>
<td><%=ATTR_NMK %></td>
<td><input type="button" class="blue_btn" value="이력" onclick="fn_openCodeHistory('<%=OBJID%>');" style="float:none;"></td>
<td><input type="button" class="blue_btn" value="삭제" onclick="fn_delete('<%=OBJID%>');" style="float:none;"></td>
</tr>
<%
}
}else{
%>
<tr>
<td colspan="18">해당하는 데이터가 없습니다.</td>
</tr>
<%
}
%>
</table>
</div>
</head>
<body style="overflow-y: hidden;">
<form name="hiddenForm" id="hiddenForm">
<input type="hidden" name="objid">
</form>
<form name="form1" id="form1" method="post">
<input type="hidden" name="status" id="status">
<div class="content-box">
<div class="content-box-s">
<div class="plm_menu_name_gdnsi">
<h2>
<span>창고 관리</span>
</h2>
<div class="btnArea">
<input type="button" value="조회" class="plm_btns" id="btnSearch">
<input type="button" value="창고등록" class="plm_btns" onclick="javascript:openwarehouseListInfoPopUp('');">
<input type="button" value="삭제" class="plm_btns" id="btnDelete">
</div>
</div>
<div id="plmSearchZon">
<table>
<tbody>
<tr>
<td class="label"><label>위치코드</label></td>
<td><input type="text" name="searchLocationCode" id="searchLocationCode" value="<%=searchLocationCode%>"></td>
<td class="label"><label>위치명</label></td>
<td><input type="text" name="searchLocationName" id="searchLocationName" value="<%=searchLocationName%>"></td>
</tr>
</tbody>
</table>
</div>
<%@include file="/WEB-INF/view/common/common_gridArea.jsp" %>
</div>
</div>
</section>
</form>
</body>
</html>

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},