분할 출하 기능 완료 - 잔량 계산 수정

This commit is contained in:
leeheejin
2025-11-12 15:40:51 +09:00
parent c366b71174
commit 6b3a2c1cf1
13 changed files with 1430 additions and 191 deletions

View File

@@ -269,7 +269,24 @@ public class ContractMgmtController {
@ResponseBody
@RequestMapping("/contractMgmt/contractGridList.do")
public Map getProductKindSpecListPaging(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
commonService.selectListPagingNew("contractMgmt.contractGridList", request, paramMap);
try {
// 페이징 데이터 조회
commonService.selectListPagingNew("contractMgmt.contractGridList", request, paramMap);
// 조회된 데이터의 전체 합계 조회
Map<String, Object> totalAmount = (Map<String, Object>) 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<String, Object> paramMap){
Map<String, Object> resultMap = new HashMap<String, Object>();
try {
// Total 합계 조회
Map<String, Object> 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