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

Merge branch 'main' into V20251023001

Browse Source
This commit is contained in:
Johngreen
2025-10-31 11:17:34 +09:00
parent a41c75c0f8 d4500e3f0b
commit 37285fbce6
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/WEB-INF/view/partMng/partMngFormPopUp.jsp
View File

@@ -357,7 +357,7 @@ function fn_overlapPartMng(){
<td class="input_title">
<label for="">공급업체</label>
</td>
<td class="input_sub_title" colspan="">
<td class="input_sub_title" colspan=2">
<input type="text" name="MAKER" id="MAKER" value="${resultMap.MAKER}">
</td>
<!-- <td class="input_sub_title" colspan="2">

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

@@ -185,7 +185,7 @@ function fn_initGrid() {
hozAlign: 'center',
width: 100,
title: '항목 수량',
field: 'QTY'
field: 'ITEM_QTY'
},
{
headerHozAlign: 'center',

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

@@ -3187,6 +3187,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
PART_NO,
LAST_PART_OBJID,
QTY,
ITEM_QTY,
QTY_TEMP,
REGDATE,
SEQ,
@@ -3207,6 +3208,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
A.PART_NO,
A.LAST_PART_OBJID,
A.QTY,
A.ITEM_QTY,
A.QTY_TEMP,
A.REGDATE,
A.SEQ,
@@ -3245,6 +3247,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
B.PART_NO,
B.LAST_PART_OBJID,
B.QTY,
B.ITEM_QTY,
B.QTY_TEMP,
B.REGDATE,
B.SEQ,
@@ -3293,6 +3296,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
)
) AS LAST_PART_OBJID
,V.QTY
,V.ITEM_QTY
,(CASE WHEN V.STATUS = 'deploy' THEN V.QTY
WHEN V.STATUS = 'beforeEdit' THEN V.QTY
WHEN V.STATUS != 'editing' AND (V.QTY_TEMP IS NULL OR V.QTY_TEMP = '') THEN V.QTY
@@ -5944,6 +5948,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
BPQ.PART_NO,
BPQ.PARENT_PART_NO,
BPQ.QTY,
BPQ.ITEM_QTY,
BPQ.SEQ,
COALESCE(BPQ.LAST_PART_OBJID, BPQ.PART_NO) AS LAST_PART_OBJID,
1 AS LEV,
@@ -5993,6 +5998,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
BPQ.PART_NO,
BPQ.PARENT_PART_NO,
BPQ.QTY,
BPQ.ITEM_QTY,
BPQ.SEQ,
COALESCE(BPQ.LAST_PART_OBJID, BPQ.PART_NO) AS LAST_PART_OBJID,
BT.LEV + 1,
@@ -6014,6 +6020,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
BT.LEV,
BT.LEV AS LEVEL,
BT.QTY,
BT.ITEM_QTY,
BT.QTY AS QTY_TEMP,
BT.SEQ,
BT.LEAF,
@@ -6064,7 +6071,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
AND COALESCE(BPQ2.STATUS, '') NOT IN ('deleting', 'deleted')
) AS LEAF,
-- 상위 품번 (P_QTY 계산용)
BT.QTY AS P_QTY,
BT.ITEM_QTY AS P_QTY,
-- ROOT 정보
(SELECT CHILD_OBJID FROM BOM_PART_QTY WHERE BOM_REPORT_OBJID = BT.BOM_REPORT_OBJID AND COALESCE(PARENT_OBJID, '') = '' LIMIT 1) AS ROOT_OBJID,
BT.PARENT_OBJID AS SUB_ROOT_OBJID,