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

V2025111703 #70

Merged
leeheejin merged 6 commits from V2025111703 into main 2025-11-20 08:03:16 +00:00
Conversation 0 Commits 6 Files Changed 14 +36 -31
5 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 735ea9e048 - Show all commits

9
WebContent/WEB-INF/classes/com/pms/mapper/admin.xml
View File

@@ -8747,15 +8747,12 @@ SELECT
</select>
<update id="deleteWarehouse" parameterType="map">
UPDATE
<delete id="deleteWarehouse" parameterType="map">
DELETE FROM
WAREHOUSE_LOCATION
SET
USE_STATUS = 'N',
MODIFY_DT = NOW()
WHERE
OBJID = #{OBJID}::numeric
</update>
</delete>
<!-- 11월 19일 추가한 창고관리 매퍼 -->

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

@@ -70,13 +70,16 @@ function convertToDBFormat(dateStr) {
</script>
</head>
<body>
<form name="warehouseForm" id="warehouseForm">
<input type="hidden" name="objid" value="${info.OBJID}">
<input type="hidden" name="writer" value="<%=session.getAttribute("USER_ID")%>">
<h2>창고 등록/수정</h2>
<table>
<section id="commonSection" class="admin_option_min">
<div class="admin_title">
<h2>창고 등록/수정</h2>
</div>
<div id="adminPopupFormWrap">
<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">
<tr>
<td>위치코드</td>
<td><input type="text" name="location_code" value="${info.LOCATION_CODE}" required></td>
@@ -166,9 +169,12 @@ function convertToDBFormat(dateStr) {
<td>ATTR_NMK</td>
<td><input type="text" name="attr_nmk" value="${info.ATTR_NMK}"></td>
</tr>
</table>
<button type="button" onclick="saveWarehouse()">저장</button>
</form>
</table>
</form>
</div>
<div id="adminPopupBtnWrap">
<button type="button" class="btns" onclick="saveWarehouse()">저장</button>
</div>
</section>
</body>
</html>

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

@@ -34,6 +34,7 @@
<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">
@@ -48,7 +49,7 @@
//카테고리 분류의 상세 내용을 보여주는 팝업을 호출한다.
function openwarehouseListInfoPopUp(objid){
var form = document.hiddenForm;
window.open("","openwarehouseListInfoPopUp","width=500 height=200 menubar=no status=no");
window.open("","openwarehouseListInfoPopUp","width=500 height=800 menubar=no status=no");
form.objid.value = objid;
form.target = "openwarehouseListInfoPopUp";
form.action = "/admin/warehouseListFormPopUp.do";
@@ -74,7 +75,7 @@
//프로젝트에 해당하는 WBS Task 목록 PopUp을 호출한다.
function fn_openCodeHistory(objId){
if(null != objId){
window.open("/admin/warehouseHistoryList.do?objId="+objId, "", "width=950, height=500");
window.open("/admin/warehouseHistoryList.do?objId="+objId, "", "width=1600, height=600");
}else{
Swal.fire("잘못된 접근입니다.");
}
@@ -275,7 +276,7 @@
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="40px" />
</colgroup>
<tr>
<td>위치코드</td>
@@ -296,6 +297,7 @@
<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;">
@@ -319,6 +321,8 @@
<col width="12%" />
<col width="12%" />
<col width="12%" />
<col width="40px" />
<col width="40px" />
</colgroup>
<%
if(0 < warehouseList.size()){
@@ -348,8 +352,8 @@
<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;">
<!-- <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>
@@ -368,6 +372,8 @@
<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>
<%
}

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

@@ -8747,15 +8747,12 @@ SELECT
</select>
<update id="deleteWarehouse" parameterType="map">
UPDATE
<delete id="deleteWarehouse" parameterType="map">
DELETE FROM
WAREHOUSE_LOCATION
SET
USE_STATUS = 'N',
MODIFY_DT = NOW()
WHERE
OBJID = #{OBJID}::numeric
</update>
</delete>
<!-- 11월 19일 추가한 창고관리 매퍼 -->

5
src/com/pms/service/AdminService.java
View File

@@ -2489,9 +2489,8 @@ public class AdminService extends BaseService {
public void deleteWarehouse(HttpServletRequest request,Map paramMap){
SqlSession sqlSession = SqlMapConfig.getInstance().getSqlSession();
try{
String objid = CommonUtils.checkNull(request.getParameter("objid"));
paramMap.put("OBJID", objid);
sqlSession.update("admin.deleteWarehouse",paramMap);
// paramMap에 이미 OBJID가 들어있음 (AJAX에서 보낸 값)
sqlSession.delete("admin.deleteWarehouse",paramMap);
}catch(Exception e){
throw e;
}finally{