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

Merge origin/main - 원격 변경사항 병합

Browse Source
This commit is contained in:
hjjeong
2025-10-22 21:00:12 +09:00
parent bed767994e f524e06fe7
commit d2e495c8cd
5 changed files with 269 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
View File

@@ -261,19 +261,26 @@ public class SalesNcollectMgmtController {
}
}
Map<String, Object> codeMap = new HashMap<String, Object>();
// 담당자
codeMap.put("managerList",
salesMgmtCommonService.bizMakeOptionList("", "", "salesMgmtCommon.getSalesmanList"));
// 기존 판매 정보 조회
if(paramMap.get("orderNo") != null && !paramMap.get("orderNo").equals("")) {
Map<String, Object> saleInfo = salesNcollectMgmtService.getSaleInfo(paramMap);
request.setAttribute("saleInfo", saleInfo);
}
request.setAttribute("codeMap", codeMap);
Map<String, Object> codeMap = new HashMap<String, Object>();
// 담당자
codeMap.put("managerList",
salesMgmtCommonService.bizMakeOptionList("", "", "salesMgmtCommon.getSalesmanList"));
// 기존 판매 정보 조회 후 환종(통화) 공통코드 세팅
Map<String, Object> saleInfo = null;
String salesCurrency = "";
if(paramMap.get("orderNo") != null && !paramMap.get("orderNo").equals("")) {
saleInfo = salesNcollectMgmtService.getSaleInfo(paramMap);
salesCurrency = CommonUtils.nullToEmpty((String)saleInfo.get("SALES_CURRENCY"));
request.setAttribute("saleInfo", saleInfo);
}
// 환종(통화) - 공통코드 0001533
codeMap.put("salesCurrency",
commonService.bizMakeOptionList("0001533", salesCurrency, "common.getCodeselect"));
request.setAttribute("codeMap", codeMap);
} catch (Exception e) {
e.printStackTrace();
}