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-27 17:12:43 +09:00
parent af1c73345d 15af60c44e
commit 01ebc04dfd
4 changed files with 344 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/com/pms/service/PartMngService.java
View File

@@ -1642,54 +1642,17 @@ public class PartMngService extends BaseService {
* @return
*/
public List getStructureAscendingList(HttpServletRequest request,Map paramMap){
List<Map<String,Object>> spareList = new ArrayList();
List<Map<String,Object>> resultList = new ArrayList();
SqlSession sqlSession = SqlMapConfig.getInstance().getSqlSession();
try{
System.out.println("paramMap :: " + paramMap);
spareList = sqlSession.selectList("partMng.selectStructureAscendingList", paramMap);
resultList = sqlSession.selectList("partMng.selectStructureAscendingList", paramMap);
resultList = CommonUtils.toUpperCaseMapKey(resultList);
spareList = CommonUtils.toUpperCaseMapKey(spareList);
// 쿼리에서 이미 MAX_LEVEL을 제공하므로 추가 처리 불필요
// LEV_X 컬럼도 JSP에서 동적으로 처리하므로 생략
int maxLevel = 0;
if(null != spareList && 0 < spareList.size()){
for(int i=0;i<spareList.size();i++){
Map resultMap = new HashMap();
resultMap = (HashMap)spareList.get(i);
int resultLevel = Integer.parseInt(CommonUtils.checkNull(resultMap.get("LEV"),"0"));
if(maxLevel < resultLevel){
maxLevel = resultLevel;
}
}
for(int i=0;i<spareList.size();i++){
Map resultMap = new HashMap();
resultMap = (HashMap)spareList.get(i);
resultMap.put("MAX_LEVEL", maxLevel);
int level = Integer.parseInt(CommonUtils.checkNull(resultMap.get("LEV"),"0"));
for(int j=0;j<maxLevel;j++){
String levelSymbol = "";
if((j+1) == level){
levelSymbol = "*";
}else{
levelSymbol = "";
}
resultMap.put("LEV_"+Integer.toString((j+1)), levelSymbol);
}
resultList.add(resultMap);
}
}
}catch(Exception e){
e.printStackTrace();
}finally{
@@ -1705,61 +1668,21 @@ public class PartMngService extends BaseService {
* @return
*/
public List getStructureDescendingList(HttpServletRequest request,Map paramMap){
List<Map<String,Object>> spareList = new ArrayList();
List<Map<String,Object>> resultList = new ArrayList();
SqlSession sqlSession = SqlMapConfig.getInstance().getSqlSession();
try{
if(paramMap != null && !paramMap.isEmpty()){
String partNo = CommonUtils.checkNull(paramMap.get("search_partNo"));
String partName = CommonUtils.checkNull(paramMap.get("search_partName"));
if(!"".equals(partNo) || !"".equals(partName)){
setPartMngCommonCD(paramMap);
spareList = sqlSession.selectList("partMng.selectStructureDescendingList", paramMap);
spareList = CommonUtils.toUpperCaseMapKey(spareList);
int maxLevel = 0;
if(null != spareList && 0 < spareList.size()){
for(int i=0;i<spareList.size();i++){
Map resultMap = new HashMap();
resultMap = (HashMap)spareList.get(i);
int resultLevel = Integer.parseInt(CommonUtils.checkNull(resultMap.get("LEV"),"0"));
if(maxLevel < resultLevel){
maxLevel = resultLevel;
}
}
for(int i=0;i<spareList.size();i++){
Map resultMap = new HashMap();
resultMap = (HashMap)spareList.get(i);
resultMap.put("MAX_LEVEL", maxLevel);
int level = Integer.parseInt(CommonUtils.checkNull(resultMap.get("LEV"),"0"));
for(int j=0;j<maxLevel;j++){
String levelSymbol = "";
if((j+1) == level){
levelSymbol = "*";
}else{
levelSymbol = "";
}
resultMap.put("LEV_"+Integer.toString((j+1)), levelSymbol);
}
resultList.add(resultMap);
}
}
resultList = sqlSession.selectList("partMng.selectStructureDescendingList", paramMap);
resultList = CommonUtils.toUpperCaseMapKey(resultList);
// 쿼리에서 이미 MAX_LEVEL을 제공하므로 추가 처리 불필요
System.out.println("resultList:"+resultList);
}
}
}catch(Exception e){
@@ -1768,7 +1691,7 @@ public class PartMngService extends BaseService {
sqlSession.close();
}
return CommonUtils.toUpperCaseMapKey(resultList);
return resultList;
}
@@ -4470,6 +4393,9 @@ public class PartMngService extends BaseService {
insertMap.put("SUPPLY_CODE", CommonUtils.checkNull((String)insertMap.get("SUP_CODE")));
insertMap.put("MAKER", CommonUtils.checkNull((String)insertMap.get("MAKER")));
insertMap.put("POST_PROCESSING", CommonUtils.checkNull((String)insertMap.get("POST_PROCESSING")));
insertMap.put("HEAT_TREATMENT_HARDNESS", CommonUtils.checkNull((String)insertMap.get("HEAT_TREATMENT_HARDNESS")));
insertMap.put("HEAT_TREATMENT_METHOD", CommonUtils.checkNull((String)insertMap.get("HEAT_TREATMENT_METHOD")));
insertMap.put("SURFACE_TREATMENT", CommonUtils.checkNull((String)insertMap.get("SURFACE_TREATMENT")));
insertMap.put("STATUS", "deploy"); // 엑셀 업로드 시 deploy 상태로 저장
insertMap.put("WRITER", CommonUtils.checkNull((String)paramMap.get("CONNECTUSERID")));