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

Merge pull request 'V2025120101' (#93) from V2025120101 into main

Browse Source 
Reviewed-on: #93
This commit was merged in pull request #93.
This commit is contained in:
hjjeong
2025-12-09 08:08:25 +00:00
parent e44cdb917c 9bbe8e2155
commit 4336df1a52
3 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
WebContent/WEB-INF/view/partMng/partMngDetailPopUp.jsp
View File

@@ -83,7 +83,7 @@ $(document).ready(function(){
fn_setReadOnly();
window.resizeTo(800,690);
window.resizeTo(820,750);
});
</script>
@@ -400,6 +400,60 @@ function fn_edit(){
.input_title {border-left:1px solid #ccc;}
.input_sub_title {border-left:1px solid #ccc;}
.pmsPopupForm tr:last-child td{border-bottom:1px solid #ccc;}
/* 팝업 최소 너비 강제 - 창 줄여도 레이아웃 유지 */
html, body {
min-width: 750px !important;
min-height: auto !important;
}
body.bodyNoScroll {
overflow: auto !important;
}
section {
min-width: 730px;
}
#businessPopupFormWrap {
min-width: 720px;
}
.pmsPopupForm {
width: 100%;
min-width: 700px;
}
.pmsPopupForm input[type="text"],
.pmsPopupForm select {
width: 100%;
box-sizing: border-box;
}
/* 반응형 미디어 쿼리 오버라이드 - 이 팝업에서는 세로 쌓임 방지 */
@media (max-width: 768px) {
.pmsPopupForm td {
display: table-cell !important;
width: auto !important;
padding: 3px 10px !important;
}
.input_title {
border-right: 1px solid #ccc !important;
}
.plm_btn_wrap_center {
flex-direction: row !important;
}
.plm_btns, .btns {
width: auto !important;
}
}
/* 셀 높이 고정 - 창 줄여도 높이 변화 없음 */
.pmsPopupForm td {
height: 32px !important;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.pmsPopupForm input[type="text"],
.pmsPopupForm select {
height: 26px !important;
}
</style>
<body class="bodyNoScroll">
<form name="form1" id="form1" action="" method="post">

4
WebContent/WEB-INF/view/partMng/structurePopupLeft.jsp
View File

@@ -326,8 +326,8 @@ function fn_initGrid() {
// 행 클릭 시 선택 처리 이벤트
_tabulGrid.on("rowClick", function(e, row) {
// 라디오 버튼이나 링크 클릭 시에는 기본 동작 유지
if($(e.target).is('input[type=radio], a')) {
// 링크 클릭 시에는 기본 동작 유지 (라디오 버튼은 하이라이트 처리)
if($(e.target).is('a')) {
return;
}

10
src/com/pms/mapper/partMng.xml
View File

@@ -6706,7 +6706,8 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
<update id="changeStatusBomReportByPartNo" parameterType="map">
UPDATE PART_BOM_REPORT
SET
STATUS = 'changeDesign'
-- STATUS = 'changeDesign'
STATUS = 'N'
,EDIT_DATE = NOW()
,EDITER = #{WRITER}
WHERE OBJID IN (SELECT Q.BOM_REPORT_OBJID
@@ -6714,14 +6715,15 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
,PART_MNG P
WHERE P.PART_NO = #{PART_NO}
AND P.OBJID = Q.PART_NO)
AND STATUS != 'changeDesign'
AND STATUS != 'N'
</update>
<!-- 구조변경시 BomReport의 상태값을 변경한다. -->
<update id="changeStatusBomReportByPartObjid" parameterType="map">
UPDATE PART_BOM_REPORT
SET
STATUS = 'changeDesign'
-- STATUS = 'changeDesign'
STATUS = 'N'
,EDIT_DATE = NOW()
,EDITER = #{WRITER}
WHERE OBJID IN (SELECT Q.BOM_REPORT_OBJID
@@ -6731,7 +6733,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
WHERE P.OBJID = #{OBJID}
AND P.PART_NO = P2.PART_NO
AND P2.OBJID = Q.PART_NO)
AND STATUS != 'changeDesign'
AND STATUS != 'N'
</update>
<select id="selectBomPartQtyInfoByWorkingPartObjid" parameterType="map" resultType="com.pms.common.UpperKeyMap">