diff --git a/src/com/pms/service/PartMngService.java b/src/com/pms/service/PartMngService.java index 56d899f..6d983d9 100644 --- a/src/com/pms/service/PartMngService.java +++ b/src/com/pms/service/PartMngService.java @@ -3344,23 +3344,38 @@ public class PartMngService extends BaseService { // PART_TYPE 코드 조회 String partTypeCode = ""; - if(!StringUtils.isBlank(partType) && rowIndex > 2) { - Map sqlParamMap = new HashMap(); - sqlParamMap.put("CODE_NAME", partType); - String partNoForCheck = CommonUtils.checkNull(partNo); - sqlParamMap.put("partNo", partNoForCheck); - Map partTypeMap = sqlSession.selectOne("partMng.parttypeInfo", sqlParamMap); - if(null != partTypeMap && !StringUtils.isBlank((String)partTypeMap.get("code_id"))){ - partTypeCode = (String)partTypeMap.get("code_id"); - } else { - noteMsg += "부품유형 확인:" + partType + ";"; + if(!StringUtils.isBlank(partType)) { + // CSV 영문 범주명을 한글로 변환 (Unassigned→조립품, Buy→구매품, Make→부품) + String partTypeForQuery = partType.trim(); + String partTypeUpper = partTypeForQuery.toUpperCase(); + + if("UNASSIGNED".equals(partTypeUpper)) { + partTypeForQuery = "조립품"; + } else if("BUY".equals(partTypeUpper)) { + partTypeForQuery = "구매품"; + } else if("MAKE".equals(partTypeUpper)) { + partTypeForQuery = "부품"; } - } else if(!StringUtils.isBlank(partType) && rowIndex <= 2) { - Map sqlParamMap = new HashMap(); - sqlParamMap.put("CODE_NAME", partType); - Map partTypeMap = sqlSession.selectOne("partMng.parttypeInfo", sqlParamMap); - if(null != partTypeMap && !StringUtils.isBlank((String)partTypeMap.get("code_id"))){ - partTypeCode = (String)partTypeMap.get("code_id"); + + // 변환된 값으로 DB 조회 (기존 방식) + if(rowIndex > 2) { + Map sqlParamMap = new HashMap(); + sqlParamMap.put("CODE_NAME", partTypeForQuery); + String partNoForCheck = CommonUtils.checkNull(partNo); + sqlParamMap.put("partNo", partNoForCheck); + Map partTypeMap = sqlSession.selectOne("partMng.parttypeInfo", sqlParamMap); + if(null != partTypeMap && !StringUtils.isBlank((String)partTypeMap.get("code_id"))){ + partTypeCode = (String)partTypeMap.get("code_id"); + } else { + noteMsg += "부품유형 확인:" + partType + ";"; + } + } else { + Map sqlParamMap = new HashMap(); + sqlParamMap.put("CODE_NAME", partTypeForQuery); + Map partTypeMap = sqlSession.selectOne("partMng.parttypeInfo", sqlParamMap); + if(null != partTypeMap && !StringUtils.isBlank((String)partTypeMap.get("code_id"))){ + partTypeCode = (String)partTypeMap.get("code_id"); + } } }