diff --git a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
index 29d9831..88733f5 100644
--- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
+++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
@@ -1490,6 +1490,11 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
-- 판매 관련 필드들 (sales_registration 테이블에서 가져오기)
SR.sale_no AS SALE_NO,
COALESCE(SR.shipping_order_status, '') AS SHIPPING_ORDER_STATUS,
+
+ -- 주문수량 (PROJECT_MGMT에서 가져오기) - 잔량 계산용
+ COALESCE(T.QUANTITY::NUMERIC, 0) AS ORDER_QUANTITY,
+
+ -- 판매수량 (sales_registration에서 가져오기) - 이미 판매한 수량
COALESCE(SR.sales_quantity, 0) AS SALES_QUANTITY,
COALESCE(SR.sales_unit_price, 0) AS SALES_UNIT_PRICE,
COALESCE(SR.sales_supply_price, 0) AS SALES_SUPPLY_PRICE,
@@ -1625,7 +1630,7 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
diff --git a/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java b/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
index fb2e4b9..7d430c6 100644
--- a/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
+++ b/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
@@ -292,13 +292,14 @@ public class SalesNcollectMgmtController {
System.out.println("salesCurrency: " + paramMap.get("salesCurrency"));
System.out.println("salesExchangeRate: " + paramMap.get("salesExchangeRate"));
- saleInfo = salesNcollectMgmtService.getSaleInfo(paramMap);
- salesCurrency = CommonUtils.nullToEmpty((String)saleInfo.get("SALES_CURRENCY"));
-
- System.out.println("=== DB에서 조회한 saleInfo ===");
- System.out.println("SALES_QUANTITY: " + saleInfo.get("SALES_QUANTITY"));
- System.out.println("SALES_UNIT_PRICE: " + saleInfo.get("SALES_UNIT_PRICE"));
- System.out.println("SALES_SUPPLY_PRICE: " + saleInfo.get("SALES_SUPPLY_PRICE"));
+ saleInfo = salesNcollectMgmtService.getSaleInfo(paramMap);
+ salesCurrency = CommonUtils.nullToEmpty((String)saleInfo.get("SALES_CURRENCY"));
+
+ System.out.println("=== DB에서 조회한 saleInfo ===");
+ System.out.println("ORDER_QUANTITY: " + saleInfo.get("ORDER_QUANTITY"));
+ System.out.println("SALES_QUANTITY: " + saleInfo.get("SALES_QUANTITY"));
+ System.out.println("SALES_UNIT_PRICE: " + saleInfo.get("SALES_UNIT_PRICE"));
+ System.out.println("SALES_SUPPLY_PRICE: " + saleInfo.get("SALES_SUPPLY_PRICE"));
// URL 파라미터로 그리드 데이터가 전달된 경우 우선 사용
if(paramMap.get("salesQuantity") != null && !paramMap.get("salesQuantity").equals("")) {
@@ -359,10 +360,13 @@ public class SalesNcollectMgmtController {
int totalSoldQuantity = 0;
try {
Map totalResult = salesNcollectMgmtService.getTotalSalesQuantity(paramMap);
+ System.out.println("getTotalSalesQuantity 결과: " + totalResult);
if(totalResult != null && totalResult.get("total") != null) {
+ System.out.println("total 값: " + totalResult.get("total"));
totalSoldQuantity = Integer.parseInt(String.valueOf(totalResult.get("total")).split("\\.")[0]);
}
} catch(Exception e) {
+ System.out.println("getTotalSalesQuantity 에러 발생!");
e.printStackTrace();
}
diff --git a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
index 29d9831..88733f5 100644
--- a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
+++ b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
@@ -1490,6 +1490,11 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
-- 판매 관련 필드들 (sales_registration 테이블에서 가져오기)
SR.sale_no AS SALE_NO,
COALESCE(SR.shipping_order_status, '') AS SHIPPING_ORDER_STATUS,
+
+ -- 주문수량 (PROJECT_MGMT에서 가져오기) - 잔량 계산용
+ COALESCE(T.QUANTITY::NUMERIC, 0) AS ORDER_QUANTITY,
+
+ -- 판매수량 (sales_registration에서 가져오기) - 이미 판매한 수량
COALESCE(SR.sales_quantity, 0) AS SALES_QUANTITY,
COALESCE(SR.sales_unit_price, 0) AS SALES_UNIT_PRICE,
COALESCE(SR.sales_supply_price, 0) AS SALES_SUPPLY_PRICE,
@@ -1625,7 +1630,7 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC