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

Merge pull request 'V20251023001' (#47) from V20251023001 into main

Browse Source 
Reviewed-on: #47
This commit was merged in pull request #47.
This commit is contained in:
geonhee
2025-10-31 02:17:31 +00:00
parent d4500e3f0b a41c75c0f8
commit e29305c1dc
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -479,7 +479,7 @@ function fn_uploadDrawingFiles(files) {
msg += '- PDF: ' + filesByType['PDF'].length + '개'; msg += '- PDF: ' + filesByType['PDF'].length + '개';
Swal.fire({ Swal.fire({
title: '도면 업로드', title: '도면 다증 업로드',
text: msg, text: msg,
icon: 'question', icon: 'question',
showCancelButton: true, showCancelButton: true,
@@ -596,7 +596,7 @@ function fn_processDrawingUpload(bomObjId, filesByType) {
</c:choose> </c:choose>
</span> </span>
<input type="button" value="Excel Download" class="plm_btns structure_btn" id="btnExcel" style="float:right;"> <input type="button" value="Excel Download" class="plm_btns structure_btn" id="btnExcel" style="float:right;">
<input type="button" value="도면 업로드" class="plm_btns structure_btn" id="btnDrawingUpload" style="float:right; margin-right:5px;"> <input type="button" value="도면 다중 업로드" class="plm_btns structure_btn" id="btnDrawingUpload" style="float:right; margin-right:5px;">
<input type="file" id="drawingFiles" multiple style="display:none;" accept=".stp,.step,.dwg,.pdf"> <input type="file" id="drawingFiles" multiple style="display:none;" accept=".stp,.step,.dwg,.pdf">
</div> </div>
<div id="structureGrid"></div> <div id="structureGrid"></div>

28
src/com/pms/controller/PartMngController.java
View File

@@ -2267,23 +2267,25 @@ public class PartMngController {
continue; continue;
} }
// 파일명에서 품번 찾기 (파일명에 품번이 포함되어 있는 경우) // 파일명에서 확장자 제거하여 품번 추출
String fileNameWithoutExt = originalFileName;
int lastDotIndex = originalFileName.lastIndexOf('.');
if(lastDotIndex > 0) {
fileNameWithoutExt = originalFileName.substring(0, lastDotIndex);
}
// 품번과 정확히 일치하는 경우만 매칭
String matchedPartNo = null; String matchedPartNo = null;
System.out.println("품번 매칭 시작 - 파일명: " + originalFileName); System.out.println("품번 매칭 시작 - 파일명(확장자 제외): " + fileNameWithoutExt);
for(String partNo : partNoMap.keySet()) {
System.out.println(" 품번 확인: " + partNo + " -> " + (originalFileName.contains(partNo) ? "매칭!" : "미매칭")); // 정확한 매칭 (품번과 파일명이 정확히 일치)
if(originalFileName.contains(partNo)) { if(partNoMap.containsKey(fileNameWithoutExt)) {
matchedPartNo = partNo; matchedPartNo = fileNameWithoutExt;
System.out.println(" ✓ 품번 매칭 성공: " + partNo); System.out.println(" ✓ 품번 정확 매칭 성공: " + matchedPartNo);
break;
}
}
if(matchedPartNo == null) {
System.out.println(" ✗ 품번 매칭 실패 - 파일명에서 품번을 찾을 수 없음");
} }
if(matchedPartNo == null) { if(matchedPartNo == null) {
System.out.println(" ✗ 품번 매칭 실패 - 파일명과 일치하는 품번이 없음");
notFoundCount++; notFoundCount++;
continue; continue;
} }

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

@@ -2020,6 +2020,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
--> -->
AND OBJID IN (SELECT NVL(LAST_PART_OBJID, PART_NO) FROM BOM_PART_QTY Q AND OBJID IN (SELECT NVL(LAST_PART_OBJID, PART_NO) FROM BOM_PART_QTY Q
WHERE BOM_REPORT_OBJID = #{SEARCH_BOM_OBJID} WHERE BOM_REPORT_OBJID = #{SEARCH_BOM_OBJID}
AND (Q.STATUS IS NULL OR Q.STATUS NOT IN ('deleted', 'deleting'))
<if test="qtyObjId != null and qtyObjId != ''"> <if test="qtyObjId != null and qtyObjId != ''">
AND Q.CHILD_OBJID = #{qtyObjId} AND Q.CHILD_OBJID = #{qtyObjId}
</if> </if>