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

1번 2번 수정 완료

Browse Source
This commit is contained in:
leeheejin
2025-12-30 09:38:18 +09:00
parent 451b16f051
commit 001f38d0f3
6 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml
View File

@@ -3958,12 +3958,11 @@
ORDER BY REGDATE DESC, MBOM_NO ORDER BY REGDATE DESC, MBOM_NO
</select> </select>
<!-- M-BOM 목록 (bizMakeOptionList용) --> <!-- M-BOM 목록 (bizMakeOptionList용) - (E-BOM) 텍스트 제거 -->
<select id="getMbomListForSelect2" parameterType="map" resultType="map"> <select id="getMbomListForSelect2" parameterType="map" resultType="map">
SELECT SELECT
OBJID AS CODE, OBJID AS CODE,
COALESCE(MBOM_NO, '') || COALESCE(MBOM_NO, '') AS NAME
CASE WHEN SOURCE_BOM_TYPE IS NOT NULL AND SOURCE_BOM_TYPE != '' THEN ' (' || SOURCE_BOM_TYPE || ')' ELSE '' END AS NAME
FROM MBOM_HEADER FROM MBOM_HEADER
WHERE STATUS = 'Y' WHERE STATUS = 'Y'
ORDER BY REGDATE DESC, MBOM_NO ORDER BY REGDATE DESC, MBOM_NO

8
WebContent/WEB-INF/classes/com/pms/mapper/quality.xml
View File

@@ -1398,15 +1398,15 @@
</if> </if>
<if test="search_inspector != null and search_inspector != ''"> <if test="search_inspector != null and search_inspector != ''">
AND ( AND (
UPPER(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 = PIM.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>
<if test="search_inspection_date_from != null and search_inspection_date_from != ''"> <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>
<if test="search_inspection_date_to != null and search_inspection_date_to != ''"> <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>
<if test="search_inspection_result != null and search_inspection_result != ''"> <if test="search_inspection_result != null and search_inspection_result != ''">
AND PID.INSPECTION_RESULT = #{search_inspection_result} AND PID.INSPECTION_RESULT = #{search_inspection_result}

15
WebContent/WEB-INF/view/productionplanning/rawMaterialRequirementList.jsp
View File

@@ -46,8 +46,9 @@ var resultGrid;
var grid; var grid;
// 입력 행 번호 // 입력 행 번호
var rowSeq = 0; var rowSeq = 0;
// M-BOM 옵션 데이터 (셀렉트박스용) // M-BOM 옵션 데이터 (셀렉트박스용) - 배열로 순서 보장
var mbomOptionsData = {}; var mbomOptionsData = [];
var mbomOptionsMap = {};
// M-BOM 품명 데이터 (OBJID -> PART_NAME 매핑) // M-BOM 품명 데이터 (OBJID -> PART_NAME 매핑)
var mbomPartNameData = {}; var mbomPartNameData = {};
@@ -81,12 +82,16 @@ $(document).ready(function(){
// M-BOM 옵션 데이터 초기화 // M-BOM 옵션 데이터 초기화
function fn_initMbomOptions() { function fn_initMbomOptions() {
mbomOptionsData = {"": "선택"}; // 배열로 순서 보장 - "선택"을 맨 위에
mbomOptionsData = [{label: "선택", value: ""}];
mbomOptionsMap = {"": "선택"};
$("#MBOM_SELECT_HIDDEN option").each(function(){ $("#MBOM_SELECT_HIDDEN option").each(function(){
var val = $(this).val(); var val = $(this).val();
var text = $(this).text(); var text = $(this).text();
if(val !== '') { if(val !== '') {
mbomOptionsData[val] = text; mbomOptionsData.push({label: text, value: val});
mbomOptionsMap[val] = text;
} }
}); });
@@ -142,7 +147,7 @@ function fn_initInputGrid() {
}, },
formatter: function(cell) { formatter: function(cell) {
var value = cell.getValue(); var value = cell.getValue();
return mbomOptionsData[value] || ""; return mbomOptionsMap[value] || "";
}, },
cellEdited: function(cell) { cellEdited: function(cell) {
// M-BOM 선택 시 품명 자동 입력 (MBOM_HEADER.PART_NAME 사용) // M-BOM 선택 시 품명 자동 입력 (MBOM_HEADER.PART_NAME 사용)

15
WebContent/WEB-INF/view/productionplanning/semiProductRequirementList.jsp
View File

@@ -46,8 +46,9 @@ var resultGrid;
var grid; var grid;
// 입력 행 번호 // 입력 행 번호
var rowSeq = 0; var rowSeq = 0;
// M-BOM 옵션 데이터 (셀렉트박스용) // M-BOM 옵션 데이터 (셀렉트박스용) - 배열로 순서 보장
var mbomOptionsData = {}; var mbomOptionsData = [];
var mbomOptionsMap = {};
// M-BOM 품명 데이터 (OBJID -> PART_NAME 매핑) // M-BOM 품명 데이터 (OBJID -> PART_NAME 매핑)
var mbomPartNameData = {}; var mbomPartNameData = {};
@@ -81,12 +82,16 @@ $(document).ready(function(){
// M-BOM 옵션 데이터 초기화 // M-BOM 옵션 데이터 초기화
function fn_initMbomOptions() { function fn_initMbomOptions() {
mbomOptionsData = {"": "선택"}; // 배열로 순서 보장 - "선택"을 맨 위에
mbomOptionsData = [{label: "선택", value: ""}];
mbomOptionsMap = {"": "선택"};
$("#MBOM_SELECT_HIDDEN option").each(function(){ $("#MBOM_SELECT_HIDDEN option").each(function(){
var val = $(this).val(); var val = $(this).val();
var text = $(this).text(); var text = $(this).text();
if(val !== '') { if(val !== '') {
mbomOptionsData[val] = text; mbomOptionsData.push({label: text, value: val});
mbomOptionsMap[val] = text;
} }
}); });
@@ -142,7 +147,7 @@ function fn_initInputGrid() {
}, },
formatter: function(cell) { formatter: function(cell) {
var value = cell.getValue(); var value = cell.getValue();
return mbomOptionsData[value] || ""; return mbomOptionsMap[value] || "";
}, },
cellEdited: function(cell) { cellEdited: function(cell) {
// M-BOM 선택 시 품명 자동 입력 (MBOM_HEADER.PART_NAME 사용) // M-BOM 선택 시 품명 자동 입력 (MBOM_HEADER.PART_NAME 사용)

5
src/com/pms/mapper/productionplanning.xml
View File

@@ -3958,12 +3958,11 @@
ORDER BY REGDATE DESC, MBOM_NO ORDER BY REGDATE DESC, MBOM_NO
</select> </select>
<!-- M-BOM 목록 (bizMakeOptionList용) --> <!-- M-BOM 목록 (bizMakeOptionList용) - (E-BOM) 텍스트 제거 -->
<select id="getMbomListForSelect2" parameterType="map" resultType="map"> <select id="getMbomListForSelect2" parameterType="map" resultType="map">
SELECT SELECT
OBJID AS CODE, OBJID AS CODE,
COALESCE(MBOM_NO, '') || COALESCE(MBOM_NO, '') AS NAME
CASE WHEN SOURCE_BOM_TYPE IS NOT NULL AND SOURCE_BOM_TYPE != '' THEN ' (' || SOURCE_BOM_TYPE || ')' ELSE '' END AS NAME
FROM MBOM_HEADER FROM MBOM_HEADER
WHERE STATUS = 'Y' WHERE STATUS = 'Y'
ORDER BY REGDATE DESC, MBOM_NO ORDER BY REGDATE DESC, MBOM_NO

8
src/com/pms/mapper/quality.xml
View File

@@ -1398,15 +1398,15 @@
</if> </if>
<if test="search_inspector != null and search_inspector != ''"> <if test="search_inspector != null and search_inspector != ''">
AND ( AND (
UPPER(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 = PIM.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>
<if test="search_inspection_date_from != null and search_inspection_date_from != ''"> <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>
<if test="search_inspection_date_to != null and search_inspection_date_to != ''"> <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>
<if test="search_inspection_result != null and search_inspection_result != ''"> <if test="search_inspection_result != null and search_inspection_result != ''">
AND PID.INSPECTION_RESULT = #{search_inspection_result} AND PID.INSPECTION_RESULT = #{search_inspection_result}