봄 구조등록 수정. 봄 복사 개발 전
This commit is contained in:
@@ -1538,37 +1538,55 @@ public class PartMngController {
|
||||
String objid="";
|
||||
try{
|
||||
objid = CommonUtils.createObjId();
|
||||
code_map.put("customer_cd",commonService.bizMakeOptionList("", (String)paramMap.get("customer_cd"),"common.getsupplyselect"));
|
||||
code_map.put("project_name",commonService.bizMakeOptionList("", (String)paramMap.get("project_name"),"common.getProjectNameList"));
|
||||
code_map.put("unit_code",commonService.bizMakeOptionList((String)paramMap.get("unit_code"), (String)paramMap.get("unit_code"),"common.getBomCodeList"));
|
||||
//code_map.put("customer_cd",commonService.bizMakeOptionList("", (String)paramMap.get("customer_cd"),"common.getsupplyselect"));
|
||||
//code_map.put("project_name",commonService.bizMakeOptionList("", (String)paramMap.get("project_name"),"common.getProjectNameList"));
|
||||
//code_map.put("unit_code",commonService.bizMakeOptionList((String)paramMap.get("unit_code"), (String)paramMap.get("unit_code"),"common.getBomCodeList"));
|
||||
|
||||
//제품구분
|
||||
code_map.put("product_cd", commonService.bizMakeOptionList("0000001", CommonUtils.nullToEmpty((String)paramMap.get("product_cd")),"common.getCodeselect")); //제품구분
|
||||
|
||||
sqlSession = SqlMapConfig.getInstance().getSqlSession();
|
||||
Map sqlMap = new HashMap();
|
||||
String unitCode = CommonUtils.checkNull(paramMap.get("unit_code"));
|
||||
sqlMap.put("unitCode", unitCode);
|
||||
Map unitInfoMap = (HashMap)sqlSession.selectOne("common.getUnitCodeList", sqlMap);
|
||||
//String unitName = CommonUtils.checkNull(unitInfoMap.get("name")).replaceAll("\u00A0+", " ");
|
||||
String UNIT_NAME = CommonUtils.checkNull(unitInfoMap.get("name"));
|
||||
|
||||
sqlParam.put("customer_cd", CommonUtils.checkNull(paramMap.get("customer_cd")));
|
||||
//sqlParam.put("project_name", CommonUtils.checkNull(paramMap.get("project_name")));
|
||||
sqlParam.put("unit_name_eq", UNIT_NAME);
|
||||
regiestSameContractUnitNameBomList = partMngService.getBOMStandardStructureList(request, sqlParam);
|
||||
sqlSession = SqlMapConfig.getInstance().getSqlSession();
|
||||
|
||||
// 통합 템플릿으로 변경하면서 unit_code 관련 로직은 사용하지 않음
|
||||
/*
|
||||
// UNIT_NAME 조회 (unit_code가 유효한 경우에만)
|
||||
String UNIT_NAME = "";
|
||||
String unitCode = CommonUtils.checkNull(paramMap.get("unit_code"));
|
||||
if(sqlSession != null && !StringUtils.isBlank(unitCode) && !"undefined".equals(unitCode)){
|
||||
try {
|
||||
Map sqlMap = new HashMap();
|
||||
sqlMap.put("unitCode", unitCode);
|
||||
Map unitInfoMap = (HashMap)sqlSession.selectOne("common.getUnitCodeList", sqlMap);
|
||||
if(unitInfoMap != null){
|
||||
UNIT_NAME = CommonUtils.checkNull(unitInfoMap.get("name"));
|
||||
}
|
||||
} catch(Exception e) {
|
||||
// unit_code 조회 실패시 빈 문자열 사용
|
||||
System.out.println("Failed to get UNIT_NAME for unitCode: " + unitCode);
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
sqlParam.put("customer_cd", CommonUtils.checkNull(paramMap.get("customer_cd")));
|
||||
//sqlParam.put("project_name", CommonUtils.checkNull(paramMap.get("project_name")));
|
||||
sqlParam.put("unit_name_eq", UNIT_NAME);
|
||||
regiestSameContractUnitNameBomList = partMngService.getBOMStandardStructureList(request, sqlParam);
|
||||
*/
|
||||
|
||||
// unit_code 없이 BOM 구조 조회
|
||||
sqlParam.put("customer_cd", CommonUtils.checkNull(paramMap.get("customer_cd")));
|
||||
sqlParam.put("unit_name_eq", "");
|
||||
regiestSameContractUnitNameBomList = partMngService.getBOMStandardStructureList(request, sqlParam);
|
||||
|
||||
//paramMap.put("product_code",(String)paramMap.get("product_code"));
|
||||
//info = partMngService.getBOMStructureRev(request,paramMap);
|
||||
bomContractInfo = partMngService.getBOMContractinfo(request,paramMap);
|
||||
|
||||
Map param = new HashMap();
|
||||
//unit
|
||||
param.put("parentCodeId", "0000059");
|
||||
code_map.put("unit_cd", commonService.getJqGridSelectBoxJsonData("common.getCodeList2", param, "선택"));
|
||||
param.put("parentCodeId", "0000062");
|
||||
code_map.put("part_type", commonService.getJqGridSelectBoxJsonData("common.getCodeList2", param, "선택"));
|
||||
code_map.put("sup_code", commonService.getJqGridSelectBoxJsonData("common.getmatersupplyselect", param, "선택"));
|
||||
// part_type 셀렉트박스 데이터 전달
|
||||
Map param = new HashMap();
|
||||
param.put("parentCodeId", "0000062");
|
||||
code_map.put("part_type", commonService.getJqGridSelectBoxJsonData("common.getCodeList2", param, "선택"));
|
||||
code_map.put("sup_code", commonService.getJqGridSelectBoxJsonData("common.getmatersupplyselect", param, "선택"));
|
||||
|
||||
bomInfo = partMngService.getBOMStructureStandardInfo(request, paramMap);
|
||||
if(bomInfo == null) bomInfo = new HashMap();
|
||||
@@ -1586,10 +1604,10 @@ public class PartMngController {
|
||||
}else {
|
||||
//신규등록일 때만 보이게
|
||||
}
|
||||
multiMasterList = commonService.selectList("purchaseOrder.selectPurchaseOrderMasterList", request, paramMap);
|
||||
//multiMasterList = commonService.selectList("purchaseOrder.selectPurchaseOrderMasterList", request, paramMap);
|
||||
|
||||
//동시발주용 정보
|
||||
request.setAttribute("multiMasterList", multiMasterList);
|
||||
//request.setAttribute("multiMasterList", multiMasterList);
|
||||
request.setAttribute("regiestSameContractUnitNameBomList", regiestSameContractUnitNameBomList); //동일 계약에 동일유닛네임으로 저장된 bom list
|
||||
|
||||
request.setAttribute("code_map",code_map);
|
||||
@@ -1597,9 +1615,9 @@ public class PartMngController {
|
||||
request.setAttribute("resultList",resultList);
|
||||
request.setAttribute("info",bomContractInfo);
|
||||
request.setAttribute("objid",objid);
|
||||
request.setAttribute("CUSTOMER_OBJID",(String)paramMap.get("customer_cd"));
|
||||
request.setAttribute("CONTRACT_OBJID",(String)paramMap.get("project_name"));
|
||||
request.setAttribute("UNIT_CODE",(String)paramMap.get("unit_code"));
|
||||
//request.setAttribute("CUSTOMER_OBJID",(String)paramMap.get("customer_cd"));
|
||||
//request.setAttribute("CONTRACT_OBJID",(String)paramMap.get("project_name"));
|
||||
//request.setAttribute("UNIT_CODE",(String)paramMap.get("unit_code"));
|
||||
}catch(Exception e){
|
||||
e.printStackTrace();
|
||||
}finally {
|
||||
|
||||
Reference in New Issue
Block a user