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

판매관리 출하지시/판매등록 수정기능 추가

Browse Source
This commit is contained in:
hjjeong
2026-03-06 12:04:23 +09:00
parent 2cc8350f6c
commit 13de84a1e3
5 changed files with 154 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -352,25 +352,25 @@ public class SalesNcollectMgmtController {
return "/salesmgmt/salesMgmt/projectDetailView";
}
}
// saleNo가 있지만 "detail"이 아니면 프로젝트 기본 정보 조회 모드
// saleNo가 있지만 "detail"이 아니면 판매등록 수정 모드 - getSaleInfo로 S/N 포함 조회
else if(paramMap.get("saleNo") != null && !paramMap.get("saleNo").equals("")) {
System.out.println("=== 프로젝트 기본 정보 조회 모드 ===");
Map<String, Object> orderDataParam = new HashMap<String, Object>();
orderDataParam.put("orderNo", paramMap.get("orderNo"));
saleInfo = salesNcollectMgmtService.getOrderDataByOrderNo(orderDataParam);
System.out.println("=== 판매등록 수정 모드 ===");
Map<String, Object> saleInfoParam = new HashMap<String, Object>();
saleInfoParam.put("orderNo", paramMap.get("orderNo"));
saleInfoParam.put("saleNo", paramMap.get("saleNo"));
saleInfo = salesNcollectMgmtService.getSaleInfo(saleInfoParam);
if(saleInfo != null) {
salesCurrency = CommonUtils.nullToEmpty((String)saleInfo.get("SALES_CURRENCY"));
saleInfo.put("ORDER_QUANTITY", saleInfo.get("SALES_QUANTITY"));
Map<String, Object> shipmentParam = new HashMap<String, Object>();
shipmentParam.put("projectNo", paramMap.get("orderNo"));
Integer totalShipped = salesNcollectMgmtService.getTotalShippedQuantity(shipmentParam);
saleInfo.put("SALES_QUANTITY", totalShipped != null ? totalShipped : 0);
System.out.println("=== 프로젝트 기본 정보 조회 완료 ===");
System.out.println("ORDER_QUANTITY (수주수량): " + saleInfo.get("ORDER_QUANTITY"));
System.out.println("SALES_QUANTITY (총 판매수량): " + saleInfo.get("SALES_QUANTITY"));
System.out.println("=== 판매등록 수정 모드 조회 완료 ===");
System.out.println("SALE_NO: " + saleInfo.get("SALE_NO"));
System.out.println("ORDER_QUANTITY: " + saleInfo.get("ORDER_QUANTITY"));
System.out.println("SALES_QUANTITY: " + saleInfo.get("SALES_QUANTITY"));
System.out.println("SERIAL_NO: " + saleInfo.get("SERIAL_NO"));
System.out.println("MANAGER: " + saleInfo.get("MANAGER"));
System.out.println("INCOTERMS: " + saleInfo.get("INCOTERMS"));
System.out.println("SHIPPING_METHOD: " + saleInfo.get("SHIPPING_METHOD"));
}
}
// saleNo가 없으면 신규 판매 등록 모드 -> 수주 데이터만 조회
@@ -430,6 +430,20 @@ public class SalesNcollectMgmtController {
request.setAttribute("orderInfo", saleInfo);
}
// 수정 모드: saleInfo에서 담당자 선택값 반영
if(saleInfo != null && saleInfo.get("MANAGER") != null) {
String selectedManager = saleInfo.get("MANAGER").toString();
System.out.println("=== 담당자 선택값 반영 ===");
System.out.println("selectedManager: [" + selectedManager + "]");
codeMap.put("managerList", commonService.bizMakeOptionList("", selectedManager, "common.getUserselect"));
} else {
System.out.println("=== 담당자 선택값 없음 ===");
System.out.println("saleInfo null: " + (saleInfo == null));
if(saleInfo != null) {
System.out.println("MANAGER value: " + saleInfo.get("MANAGER"));
}
}
// 환종(통화) - 공통코드 0001533
codeMap.put("salesCurrency",
commonService.bizMakeOptionList("0001533", salesCurrency, "common.getCodeselect"));