From 001f38d0f328e460b91522baeea77a27b72be391 Mon Sep 17 00:00:00 2001
From: leeheejin <imleesinok@gmail.com>
Date: Tue, 30 Dec 2025 09:38:18 +0900
Subject: [PATCH] =?UTF-8?q?1=EB=B2=88=202=EB=B2=88=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classes/com/pms/mapper/productionplanning.xml |  5 ++---
 .../WEB-INF/classes/com/pms/mapper/quality.xml    |  8 ++++----
 .../rawMaterialRequirementList.jsp                | 15 ++++++++++-----
 .../semiProductRequirementList.jsp                | 15 ++++++++++-----
 src/com/pms/mapper/productionplanning.xml         |  5 ++---
 src/com/pms/mapper/quality.xml                    |  8 ++++----
 6 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml b/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml
index 39efd84..a98532c 100644
--- a/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml
+++ b/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml
@@ -3958,12 +3958,11 @@
 		ORDER BY REGDATE DESC, MBOM_NO
 	</select>
 	
-	<!-- M-BOM 목록 (bizMakeOptionList용) -->
+	<!-- M-BOM 목록 (bizMakeOptionList용) - (E-BOM) 텍스트 제거 -->
 	<select id="getMbomListForSelect2" parameterType="map" resultType="map">
 		SELECT 
 			OBJID AS CODE,
-			COALESCE(MBOM_NO, '') || 
-			CASE WHEN SOURCE_BOM_TYPE IS NOT NULL AND SOURCE_BOM_TYPE != '' THEN ' (' || SOURCE_BOM_TYPE || ')' ELSE '' END AS NAME
+			COALESCE(MBOM_NO, '') AS NAME
 		FROM MBOM_HEADER
 		WHERE STATUS = 'Y'
 		ORDER BY REGDATE DESC, MBOM_NO
diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml b/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml
index 6f35fbf..e290c55 100644
--- a/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml
+++ b/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml
@@ -1398,15 +1398,15 @@
 		</if>
 		<if test="search_inspector != null and search_inspector != ''">
 			AND (
-				UPPER(PIM.INSPECTOR_ID) LIKE UPPER('%' || #{search_inspector} || '%')
-				OR UPPER((SELECT USER_NAME FROM USER_INFO WHERE USER_ID = PIM.INSPECTOR_ID)) LIKE UPPER('%' || #{search_inspector} || '%')
+				UPPER(PID.INSPECTOR_ID) LIKE UPPER('%' || #{search_inspector} || '%')
+				OR UPPER((SELECT USER_NAME FROM USER_INFO WHERE USER_ID = PID.INSPECTOR_ID)) LIKE UPPER('%' || #{search_inspector} || '%')
 			)
 		</if>
 		<if test="search_inspection_date_from != null and search_inspection_date_from != ''">
-			AND PIM.INSPECTION_DATE <![CDATA[>=]]> #{search_inspection_date_from}
+			AND PID.INSPECTION_DATE <![CDATA[>=]]> #{search_inspection_date_from}
 		</if>
 		<if test="search_inspection_date_to != null and search_inspection_date_to != ''">
-			AND PIM.INSPECTION_DATE <![CDATA[<=]]> #{search_inspection_date_to}
+			AND PID.INSPECTION_DATE <![CDATA[<=]]> #{search_inspection_date_to}
 		</if>
 		<if test="search_inspection_result != null and search_inspection_result != ''">
 			AND PID.INSPECTION_RESULT = #{search_inspection_result}
diff --git a/WebContent/WEB-INF/view/productionplanning/rawMaterialRequirementList.jsp b/WebContent/WEB-INF/view/productionplanning/rawMaterialRequirementList.jsp
index 9aa3ab4..f1d0306 100644
--- a/WebContent/WEB-INF/view/productionplanning/rawMaterialRequirementList.jsp
+++ b/WebContent/WEB-INF/view/productionplanning/rawMaterialRequirementList.jsp
@@ -46,8 +46,9 @@ var resultGrid;
 var grid;
 // 입력 행 번호
 var rowSeq = 0;
-// M-BOM 옵션 데이터 (셀렉트박스용)
-var mbomOptionsData = {};
+// M-BOM 옵션 데이터 (셀렉트박스용) - 배열로 순서 보장
+var mbomOptionsData = [];
+var mbomOptionsMap = {};
 // M-BOM 품명 데이터 (OBJID -> PART_NAME 매핑)
 var mbomPartNameData = {};
 
@@ -81,12 +82,16 @@ $(document).ready(function(){
 
 // M-BOM 옵션 데이터 초기화
 function fn_initMbomOptions() {
-	mbomOptionsData = {"": "선택"};
+	// 배열로 순서 보장 - "선택"을 맨 위에
+	mbomOptionsData = [{label: "선택", value: ""}];
+	mbomOptionsMap = {"": "선택"};
+	
 	$("#MBOM_SELECT_HIDDEN option").each(function(){
 		var val = $(this).val();
 		var text = $(this).text();
 		if(val !== '') {
-			mbomOptionsData[val] = text;
+			mbomOptionsData.push({label: text, value: val});
+			mbomOptionsMap[val] = text;
 		}
 	});
 	
@@ -142,7 +147,7 @@ function fn_initInputGrid() {
 				},
 				formatter: function(cell) {
 					var value = cell.getValue();
-					return mbomOptionsData[value] || "";
+					return mbomOptionsMap[value] || "";
 				},
 				cellEdited: function(cell) {
 					// M-BOM 선택 시 품명 자동 입력 (MBOM_HEADER.PART_NAME 사용)
diff --git a/WebContent/WEB-INF/view/productionplanning/semiProductRequirementList.jsp b/WebContent/WEB-INF/view/productionplanning/semiProductRequirementList.jsp
index 53c0beb..ad163db 100644
--- a/WebContent/WEB-INF/view/productionplanning/semiProductRequirementList.jsp
+++ b/WebContent/WEB-INF/view/productionplanning/semiProductRequirementList.jsp
@@ -46,8 +46,9 @@ var resultGrid;
 var grid;
 // 입력 행 번호
 var rowSeq = 0;
-// M-BOM 옵션 데이터 (셀렉트박스용)
-var mbomOptionsData = {};
+// M-BOM 옵션 데이터 (셀렉트박스용) - 배열로 순서 보장
+var mbomOptionsData = [];
+var mbomOptionsMap = {};
 // M-BOM 품명 데이터 (OBJID -> PART_NAME 매핑)
 var mbomPartNameData = {};
 
@@ -81,12 +82,16 @@ $(document).ready(function(){
 
 // M-BOM 옵션 데이터 초기화
 function fn_initMbomOptions() {
-	mbomOptionsData = {"": "선택"};
+	// 배열로 순서 보장 - "선택"을 맨 위에
+	mbomOptionsData = [{label: "선택", value: ""}];
+	mbomOptionsMap = {"": "선택"};
+	
 	$("#MBOM_SELECT_HIDDEN option").each(function(){
 		var val = $(this).val();
 		var text = $(this).text();
 		if(val !== '') {
-			mbomOptionsData[val] = text;
+			mbomOptionsData.push({label: text, value: val});
+			mbomOptionsMap[val] = text;
 		}
 	});
 	
@@ -142,7 +147,7 @@ function fn_initInputGrid() {
 				},
 				formatter: function(cell) {
 					var value = cell.getValue();
-					return mbomOptionsData[value] || "";
+					return mbomOptionsMap[value] || "";
 				},
 				cellEdited: function(cell) {
 					// M-BOM 선택 시 품명 자동 입력 (MBOM_HEADER.PART_NAME 사용)
diff --git a/src/com/pms/mapper/productionplanning.xml b/src/com/pms/mapper/productionplanning.xml
index 39efd84..a98532c 100644
--- a/src/com/pms/mapper/productionplanning.xml
+++ b/src/com/pms/mapper/productionplanning.xml
@@ -3958,12 +3958,11 @@
 		ORDER BY REGDATE DESC, MBOM_NO
 	</select>
 	
-	<!-- M-BOM 목록 (bizMakeOptionList용) -->
+	<!-- M-BOM 목록 (bizMakeOptionList용) - (E-BOM) 텍스트 제거 -->
 	<select id="getMbomListForSelect2" parameterType="map" resultType="map">
 		SELECT 
 			OBJID AS CODE,
-			COALESCE(MBOM_NO, '') || 
-			CASE WHEN SOURCE_BOM_TYPE IS NOT NULL AND SOURCE_BOM_TYPE != '' THEN ' (' || SOURCE_BOM_TYPE || ')' ELSE '' END AS NAME
+			COALESCE(MBOM_NO, '') AS NAME
 		FROM MBOM_HEADER
 		WHERE STATUS = 'Y'
 		ORDER BY REGDATE DESC, MBOM_NO
diff --git a/src/com/pms/mapper/quality.xml b/src/com/pms/mapper/quality.xml
index 6f35fbf..e290c55 100644
--- a/src/com/pms/mapper/quality.xml
+++ b/src/com/pms/mapper/quality.xml
@@ -1398,15 +1398,15 @@
 		</if>
 		<if test="search_inspector != null and search_inspector != ''">
 			AND (
-				UPPER(PIM.INSPECTOR_ID) LIKE UPPER('%' || #{search_inspector} || '%')
-				OR UPPER((SELECT USER_NAME FROM USER_INFO WHERE USER_ID = PIM.INSPECTOR_ID)) LIKE UPPER('%' || #{search_inspector} || '%')
+				UPPER(PID.INSPECTOR_ID) LIKE UPPER('%' || #{search_inspector} || '%')
+				OR UPPER((SELECT USER_NAME FROM USER_INFO WHERE USER_ID = PID.INSPECTOR_ID)) LIKE UPPER('%' || #{search_inspector} || '%')
 			)
 		</if>
 		<if test="search_inspection_date_from != null and search_inspection_date_from != ''">
-			AND PIM.INSPECTION_DATE <![CDATA[>=]]> #{search_inspection_date_from}
+			AND PID.INSPECTION_DATE <![CDATA[>=]]> #{search_inspection_date_from}
 		</if>
 		<if test="search_inspection_date_to != null and search_inspection_date_to != ''">
-			AND PIM.INSPECTION_DATE <![CDATA[<=]]> #{search_inspection_date_to}
+			AND PID.INSPECTION_DATE <![CDATA[<=]]> #{search_inspection_date_to}
 		</if>
 		<if test="search_inspection_result != null and search_inspection_result != ''">
 			AND PID.INSPECTION_RESULT = #{search_inspection_result}