|
-
+
|
|
diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/shippingDetailPopup.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/shippingDetailPopup.jsp
new file mode 100644
index 0000000..594190d
--- /dev/null
+++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/shippingDetailPopup.jsp
@@ -0,0 +1,97 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+
+
+
+
+출하일 상세 내역
+
+
+
+
+
+
+
+
+
+
+ | 출하일 |
+ 출하수량 |
+ 출하지시상태 |
+ S/N |
+
+
+
+
+
+
+ | 출하 내역이 없습니다. |
+
+
+
+
+
+ | ${item.shipping_date} |
+ ${item.shipping_quantity} |
+ ${item.shipping_order_status} |
+ ${item.serial_no} |
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/com/pms/salesmgmt/controller/ContractMgmtController.java b/src/com/pms/salesmgmt/controller/ContractMgmtController.java
index 4172e01..6b688c9 100644
--- a/src/com/pms/salesmgmt/controller/ContractMgmtController.java
+++ b/src/com/pms/salesmgmt/controller/ContractMgmtController.java
@@ -269,7 +269,24 @@ public class ContractMgmtController {
@ResponseBody
@RequestMapping("/contractMgmt/contractGridList.do")
public Map getProductKindSpecListPaging(HttpServletRequest request, @RequestParam Map paramMap){
- commonService.selectListPagingNew("contractMgmt.contractGridList", request, paramMap);
+ try {
+ // 페이징 데이터 조회
+ commonService.selectListPagingNew("contractMgmt.contractGridList", request, paramMap);
+
+ // 조회된 데이터의 전체 합계 조회
+ Map totalAmount = (Map) commonService.selectOne("contractMgmt.getContractGridTotalAmount", request, paramMap);
+
+ // 합계 데이터 추가
+ if(totalAmount != null) {
+ paramMap.put("TOTAL_AMOUNT_KRW", totalAmount.get("totalAmountKRW"));
+ } else {
+ paramMap.put("TOTAL_AMOUNT_KRW", 0);
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ paramMap.put("TOTAL_AMOUNT_KRW", 0);
+ }
+
return paramMap;
}
@@ -2359,6 +2376,41 @@ public class ContractMgmtController {
return paramMap;
}
+ /**
+ * 주문서관리 - Total 합계 조회
+ * @param request
+ * @param paramMap
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping("/contractMgmt/getOrderTotalAmount.do")
+ public Map getOrderTotalAmount(HttpServletRequest request, @RequestParam Map paramMap){
+ Map resultMap = new HashMap();
+
+ try {
+ // Total 합계 조회
+ Map totalData = contractMgmtService.getOrderTotalAmount(request, paramMap);
+
+ if(totalData != null) {
+ resultMap.put("result", "success");
+ resultMap.put("totalSupplyPrice", totalData.get("TOTAL_SUPPLY_PRICE"));
+ resultMap.put("totalVat", totalData.get("TOTAL_VAT"));
+ resultMap.put("totalAmount", totalData.get("TOTAL_AMOUNT"));
+ } else {
+ resultMap.put("result", "success");
+ resultMap.put("totalSupplyPrice", 0);
+ resultMap.put("totalVat", 0);
+ resultMap.put("totalAmount", 0);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ resultMap.put("result", "error");
+ resultMap.put("message", e.getMessage());
+ }
+
+ return resultMap;
+ }
+
/**
* 수주등록 팝업 페이지
* @param session
diff --git a/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java b/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
index d982029..734ce9c 100644
--- a/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
+++ b/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
@@ -282,11 +282,47 @@ public class SalesNcollectMgmtController {
}
// orderNo가 있으면 기존 판매 정보 조회
else if(paramMap.get("orderNo") != null && !paramMap.get("orderNo").equals("")) {
+ System.out.println("=== salesRegForm.do 파라미터 확인 ===");
+ System.out.println("orderNo: " + paramMap.get("orderNo"));
+ System.out.println("salesQuantity: " + paramMap.get("salesQuantity"));
+ System.out.println("salesUnitPrice: " + paramMap.get("salesUnitPrice"));
+ System.out.println("salesSupplyPrice: " + paramMap.get("salesSupplyPrice"));
+ System.out.println("salesVat: " + paramMap.get("salesVat"));
+ System.out.println("salesTotalAmount: " + paramMap.get("salesTotalAmount"));
+ 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"));
+
+ // URL 파라미터로 그리드 데이터가 전달된 경우 우선 사용
+ if(paramMap.get("salesQuantity") != null && !paramMap.get("salesQuantity").equals("")) {
+ System.out.println("=== URL 파라미터로 그리드 데이터 설정 ===");
+ if(saleInfo == null) saleInfo = new HashMap();
+
+ saleInfo.put("SALES_UNIT_PRICE", paramMap.get("salesUnitPrice"));
+ saleInfo.put("SALES_SUPPLY_PRICE", paramMap.get("salesSupplyPrice"));
+ saleInfo.put("SALES_VAT", paramMap.get("salesVat"));
+ saleInfo.put("SALES_TOTAL_AMOUNT", paramMap.get("salesTotalAmount"));
+ if(paramMap.get("salesCurrency") != null) {
+ saleInfo.put("SALES_CURRENCY", paramMap.get("salesCurrency"));
+ salesCurrency = CommonUtils.nullToEmpty((String)paramMap.get("salesCurrency"));
+ }
+ if(paramMap.get("salesExchangeRate") != null) {
+ saleInfo.put("SALES_EXCHANGE_RATE", paramMap.get("salesExchangeRate"));
+ }
+ System.out.println("설정 후 SALES_UNIT_PRICE: " + saleInfo.get("SALES_UNIT_PRICE"));
+ System.out.println("설정 후 SALES_SUPPLY_PRICE: " + saleInfo.get("SALES_SUPPLY_PRICE"));
+ System.out.println("설정 후 SALES_VAT: " + saleInfo.get("SALES_VAT"));
+ System.out.println("설정 후 SALES_TOTAL_AMOUNT: " + saleInfo.get("SALES_TOTAL_AMOUNT"));
+ }
// 판매 정보가 비어있거나 금액이 0이면 수주 데이터로 채우기
- if(saleInfo == null ||
+ else if(saleInfo == null ||
(saleInfo.get("SALES_SUPPLY_PRICE") == null ||
"0".equals(String.valueOf(saleInfo.get("SALES_SUPPLY_PRICE"))) ||
Integer.parseInt(String.valueOf(saleInfo.get("SALES_SUPPLY_PRICE"))) == 0)) {
@@ -310,13 +346,40 @@ public class SalesNcollectMgmtController {
saleInfo.put("SHIPPING_DATE", orderData.get("SHIPPING_DATE"));
}
salesCurrency = CommonUtils.nullToEmpty((String)orderData.get("SALES_CURRENCY"));
+ }
+ }
+
+ // 잔량 계산: ORDER_QUANTITY - 모든 분할 출하의 합계
+ if(saleInfo != null && saleInfo.get("ORDER_QUANTITY") != null) {
+ int orderQuantity = Integer.parseInt(String.valueOf(saleInfo.get("ORDER_QUANTITY")).split("\\.")[0]);
+
+ // 모든 분할 출하의 합계 조회
+ int totalSoldQuantity = 0;
+ try {
+ Map totalResult = salesNcollectMgmtService.getTotalSalesQuantity(paramMap);
+ if(totalResult != null && totalResult.get("total") != null) {
+ totalSoldQuantity = Integer.parseInt(String.valueOf(totalResult.get("total")).split("\\.")[0]);
}
+ } catch(Exception e) {
+ e.printStackTrace();
}
- request.setAttribute("saleInfo", saleInfo);
+ int remainingQuantity = orderQuantity - totalSoldQuantity;
- // orderInfo로 견적 정보 전달 (saleInfo가 이미 모든 필요한 정보를 포함)
- request.setAttribute("orderInfo", saleInfo);
+ System.out.println("=== 잔량 계산 ===");
+ System.out.println("주문수량 (ORDER_QUANTITY): " + orderQuantity);
+ System.out.println("총 판매 수량 (모든 분할 출하 합계): " + totalSoldQuantity);
+ System.out.println("잔량 (remainingQuantity): " + remainingQuantity);
+
+ // 잔량을 판매수량으로 설정 (정수)
+ saleInfo.put("SALES_QUANTITY", remainingQuantity > 0 ? remainingQuantity : orderQuantity);
+ System.out.println("설정 후 SALES_QUANTITY: " + saleInfo.get("SALES_QUANTITY"));
+ }
+
+ request.setAttribute("saleInfo", saleInfo);
+
+ // orderInfo로 견적 정보 전달 (saleInfo가 이미 모든 필요한 정보를 포함)
+ request.setAttribute("orderInfo", saleInfo);
}
// 환종(통화) - 공통코드 0001533
@@ -418,6 +481,27 @@ public class SalesNcollectMgmtController {
return resultMap;
}
+ /**
+ *
+ * 출하일 상세 내역 팝업
+ *
+ * @param request
+ * @param paramMap - projectNo
+ * @return String
+ */
+ @RequestMapping(value = "/salesMgmt/shippingDetailPopup.do", method = RequestMethod.GET)
+ public String showShippingDetailPopup(HttpServletRequest request, @RequestParam Map paramMap) {
+ try {
+ String projectNo = (String) paramMap.get("projectNo");
+ List> shippingList = salesNcollectMgmtService.getShippingDetailList(projectNo);
+ request.setAttribute("shippingList", shippingList);
+ request.setAttribute("projectNo", projectNo);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return "/salesmgmt/salesMgmt/shippingDetailPopup";
+ }
+
/**
*
* 계약관리 목록 조회
diff --git a/src/com/pms/salesmgmt/mapper/contractMgmt.xml b/src/com/pms/salesmgmt/mapper/contractMgmt.xml
index 0e5b92a..d9544f4 100644
--- a/src/com/pms/salesmgmt/mapper/contractMgmt.xml
+++ b/src/com/pms/salesmgmt/mapper/contractMgmt.xml
@@ -790,6 +790,102 @@
ORDER BY REGDATE DESC
+
+
+
+
+
+
|