objidList = Arrays.asList(originalObjids.split(","));
+
Map partParam = new HashMap();
- partParam.put("OBJID", partObjid);
- Map partInfo = (Map)sqlSession.selectOne("salesMng.getSalesRequestPartInfo", partParam);
+ partParam.put("OBJID_LIST", objidList);
+ Map partInfo = (Map)sqlSession.selectOne("salesMng.getGroupedSalesRequestPartInfo", partParam);
if(partInfo != null) {
Map detailParam = new HashMap();
detailParam.put("OBJID", CommonUtils.createObjId());
detailParam.put("QUOTATION_REQUEST_MASTER_OBJID", quotationMasterObjid);
- detailParam.put("SALES_REQUEST_PART_OBJID", partObjid); // MBOM_DETAIL.OBJID
+ detailParam.put("SALES_REQUEST_PART_OBJID", partInfo.get("OBJID"));
detailParam.put("PART_OBJID", partInfo.get("PART_OBJID"));
- // 업체유형에 따라 다른 정보 저장 (단가는 0으로, 견적 수신 후 입력)
if("PROCESSING".equals(vendorType)) {
- // 가공업체: 품번, 품명, 제작수량
detailParam.put("PART_NO", partInfo.get("PART_NO"));
detailParam.put("PART_NAME", partInfo.get("PART_NAME"));
detailParam.put("RAW_MATERIAL", "");
detailParam.put("SIZE", "");
detailParam.put("QTY", partInfo.get("PRODUCTION_QTY"));
- } else {
- // 공급업체: 소재품번 유무에 따라 분기
- String rawMaterialNo = CommonUtils.checkNull(partInfo.get("RAW_MATERIAL_NO"));
-
- if(!rawMaterialNo.isEmpty()) {
- // 소재품번이 있는 경우: 소재품번, 소재재질, 규격, 발주수량
- detailParam.put("PART_NO", partInfo.get("RAW_MATERIAL_NO"));
- detailParam.put("PART_NAME", partInfo.get("RAW_MATERIAL"));
- detailParam.put("RAW_MATERIAL", partInfo.get("RAW_MATERIAL"));
- detailParam.put("SIZE", partInfo.get("SIZE"));
- detailParam.put("QTY", partInfo.get("PO_QTY"));
} else {
- // 소재품번이 없는 경우: 부품품번, 부품명, 제작수량
- detailParam.put("PART_NO", partInfo.get("PART_NO"));
- detailParam.put("PART_NAME", partInfo.get("PART_NAME"));
- detailParam.put("RAW_MATERIAL", "");
- detailParam.put("SIZE", "");
- detailParam.put("QTY", partInfo.get("PRODUCTION_QTY"));
+ String rawMaterialNo = CommonUtils.checkNull(partInfo.get("RAW_MATERIAL_NO"));
+
+ if(!rawMaterialNo.isEmpty()) {
+ detailParam.put("PART_NO", partInfo.get("RAW_MATERIAL_NO"));
+ detailParam.put("PART_NAME", partInfo.get("RAW_MATERIAL"));
+ detailParam.put("RAW_MATERIAL", partInfo.get("RAW_MATERIAL"));
+ detailParam.put("SIZE", partInfo.get("SIZE"));
+ detailParam.put("QTY", partInfo.get("PO_QTY"));
+ } else {
+ detailParam.put("PART_NO", partInfo.get("PART_NO"));
+ detailParam.put("PART_NAME", partInfo.get("PART_NAME"));
+ detailParam.put("RAW_MATERIAL", "");
+ detailParam.put("SIZE", "");
+ detailParam.put("QTY", partInfo.get("PRODUCTION_QTY"));
+ }
}
- }
- detailParam.put("UNIT_PRICE", 0); // 단가는 견적 수신 후 입력
+ detailParam.put("UNIT_PRICE", 0);
detailParam.put("REMARK", "");
sqlSession.insert("salesMng.insertQuotationRequestDetail", detailParam);
diff --git a/src/com/pms/salesmgmt/service/SalesNcollectMgmtService.java b/src/com/pms/salesmgmt/service/SalesNcollectMgmtService.java
index 895f547..7d5966e 100644
--- a/src/com/pms/salesmgmt/service/SalesNcollectMgmtService.java
+++ b/src/com/pms/salesmgmt/service/SalesNcollectMgmtService.java
@@ -29,6 +29,7 @@ import com.pms.common.SqlMapConfig;
import com.pms.common.bean.PersonBean;
import com.pms.common.utils.CommonUtils;
import com.pms.common.utils.Constants;
+import com.pms.api.SalesSlipApiClient;
/**
*
@@ -983,74 +984,341 @@ public Map saveSaleRegistration(HttpServletRequest request, Map<
* @param paramMap
* @return
*/
- public Map salesDeadlineConfirm(HttpServletRequest request,Map paramMap){
+ public Map salesDeadlineConfirm(HttpServletRequest request, Map paramMap) {
Map resultMap = new HashMap();
- SqlSession sqlSession = SqlMapConfig.getInstance().getSqlSession(false);
- try{
- System.out.println("===== 매출마감 처리 시작 =====");
- System.out.println("paramMap: " + paramMap);
-
+ SqlSession sqlSession = null;
+ try {
+ System.out.println("===== 매출마감 + 아마란스 전표연동 시작 =====");
+
String objIdListStr = CommonUtils.checkNull(paramMap.get("objIdList"));
String deadlineDate = CommonUtils.checkNull(paramMap.get("deadlineDate"));
-
- System.out.println("objIdListStr: " + objIdListStr);
- System.out.println("deadlineDate: " + deadlineDate);
-
- if(objIdListStr == null || objIdListStr.isEmpty()){
+
+ if (objIdListStr == null || objIdListStr.isEmpty()) {
resultMap.put("result", false);
resultMap.put("msg", "선택된 항목이 없습니다.");
- System.out.println("에러: 선택된 항목 없음");
return resultMap;
}
-
- if(deadlineDate == null || deadlineDate.isEmpty()){
+ if (deadlineDate == null || deadlineDate.isEmpty()) {
resultMap.put("result", false);
resultMap.put("msg", "매출마감일을 입력해주세요.");
- System.out.println("에러: 매출마감일 없음");
return resultMap;
}
-
+
String[] targetObjIdList = objIdListStr.split(",");
- System.out.println("targetObjIdList 길이: " + targetObjIdList.length);
-
- if(null != targetObjIdList && 0 < targetObjIdList.length){
- HttpSession session = request.getSession();
- sqlSession = SqlMapConfig.getInstance().getSqlSession();
- PersonBean person = (PersonBean)session.getAttribute(Constants.PERSON_BEAN);
-
- String userId = person.getUserId();
- System.out.println("userId: " + userId);
-
- for(int i=0; i> slipDataList = new ArrayList>();
+ for (int i = 0; i < targetObjIdList.length; i++) {
+ String objId = CommonUtils.checkNull(targetObjIdList[i]);
+ if (objId.isEmpty()) continue;
+
+ HashMap queryParam = new HashMap();
+ queryParam.put("OBJID", objId);
+ Map slipData = sqlSession.selectOne("salesNcollectMgmt.getSlipDataForDeadline", queryParam);
+
+ if (slipData == null) {
+ resultMap.put("result", false);
+ resultMap.put("msg", "프로젝트 정보를 찾을 수 없습니다. (OBJID: " + objId + ")");
+ return resultMap;
+ }
+
+ // 이미 마감 완료된 건 체크
+ String salesStatus = CommonUtils.checkNull(slipData.get("SALES_STATUS"));
+ if ("완료".equals(salesStatus)) {
+ resultMap.put("result", false);
+ resultMap.put("msg", "이미 매출마감 완료된 건이 포함되어 있습니다. (" + slipData.get("PROJECT_NO") + ")");
+ return resultMap;
+ }
+
+ // 마감정보 등록 여부 체크
+ String taxType = CommonUtils.checkNull(slipData.get("TAX_TYPE"));
+ if (taxType.isEmpty()) {
+ resultMap.put("result", false);
+ resultMap.put("msg", "마감정보를 먼저 등록해주세요. (" + slipData.get("PROJECT_NO") + ")");
+ return resultMap;
+ }
+
+ // ERP 거래처코드 체크
+ String erpClientCd = CommonUtils.checkNull(slipData.get("ERP_CLIENT_CD"));
+ if (erpClientCd.isEmpty()) {
+ resultMap.put("result", false);
+ resultMap.put("msg", "ERP 연동 거래처가 아닙니다. 거래처 정보를 확인해주세요. (" + slipData.get("CUSTOMER_NAME") + ")");
+ return resultMap;
+ }
+
+ slipDataList.add(slipData);
+ }
+
+ if (slipDataList.isEmpty()) {
+ resultMap.put("result", false);
+ resultMap.put("msg", "처리할 데이터가 없습니다.");
+ return resultMap;
+ }
+
+ // 2) 동일 거래처별 그룹핑 + 금액 합산
+ Map>> groupByCustomer = new HashMap>>();
+ for (Map data : slipDataList) {
+ String customerKey = CommonUtils.checkNull(data.get("CUSTOMER_OBJID"));
+ if (!groupByCustomer.containsKey(customerKey)) {
+ groupByCustomer.put(customerKey, new ArrayList>());
+ }
+ groupByCustomer.get(customerKey).add(data);
+ }
+
+ // 3) DB에서 계정과목 코드 조회 (erp_acct_code → api11A02로 동기화된 값)
+ SalesSlipApiClient slipApiClient = new SalesSlipApiClient();
+ String erpBaseUrl = "https://erp.rps-korea.com";
+
+ HashMap acctParam = new HashMap();
+ acctParam.put("coCd", SalesSlipApiClient.CO_CD);
+
+ acctParam.put("acctNm", "외상매출금");
+ Map arAcct = sqlSession.selectOne("salesNcollectMgmt.getErpAccountCode", acctParam);
+ acctParam.put("acctNm", "부가세예수금");
+ Map vatAcct = sqlSession.selectOne("salesNcollectMgmt.getErpAccountCode", acctParam);
+ acctParam.put("acctNm", "제품매출");
+ Map salesAcct = sqlSession.selectOne("salesNcollectMgmt.getErpAccountCode", acctParam);
+
+ slipApiClient.setAccountCodes(
+ arAcct != null ? CommonUtils.checkNull(arAcct.get("ACCT_CD")) : null,
+ vatAcct != null ? CommonUtils.checkNull(vatAcct.get("ACCT_CD")) : null,
+ salesAcct != null ? CommonUtils.checkNull(salesAcct.get("ACCT_CD")) : null
+ );
+
+ int successCount = 0;
+
+ for (Map.Entry>> entry : groupByCustomer.entrySet()) {
+ List> customerItems = entry.getValue();
+ Map firstItem = customerItems.get(0);
+
+ String erpClientCd = CommonUtils.checkNull(firstItem.get("ERP_CLIENT_CD"));
+ String customerName = CommonUtils.checkNull(firstItem.get("CUSTOMER_NAME"));
+ String areaCd = CommonUtils.checkNull(firstItem.get("AREA_CD"));
+ String taxType = CommonUtils.checkNull(firstItem.get("TAX_TYPE"));
+ // 국내/해외는 프로젝트의 AREA_CD로 판단, 세무구분(taxFg)은 과세구분(TAX_TYPE)으로 전달
+ boolean isDomestic = "0001220".equals(areaCd);
+
+ // 금액 합산
+ long totalSupplyPrice = 0;
+ long totalVat = 0;
+ long totalAmount = 0;
+ double totalForeignAmount = 0;
+ StringBuilder itemNames = new StringBuilder();
+
+ for (Map item : customerItems) {
+ totalSupplyPrice += toLong(item.get("SALES_SUPPLY_PRICE"));
+ totalVat += toLong(item.get("SALES_VAT"));
+ totalAmount += toLong(item.get("SALES_TOTAL_AMOUNT"));
+ totalForeignAmount += toDouble(item.get("FOREIGN_AMOUNT"));
+
+ if (itemNames.length() > 0) itemNames.append(", ");
+ itemNames.append(CommonUtils.checkNull(item.get("PART_NAME")));
+ }
+
+ // 적요: 다건이면 "품명 외 N건"
+ String itemSummary;
+ if (customerItems.size() == 1) {
+ itemSummary = CommonUtils.checkNull(firstItem.get("PART_NAME"));
+ } else {
+ itemSummary = CommonUtils.checkNull(firstItem.get("PART_NAME")) + " 외 " + (customerItems.size() - 1) + "건";
+ }
+
+ // 전표 JSON 생성
+ String slipJson;
+ String slipDate;
+ String taxFg = SalesSlipApiClient.convertTaxType(taxType);
+
+ if (isDomestic) {
+ // 국내: 세금계산서발행일 기준
+ String taxInvoiceDate = CommonUtils.checkNull(firstItem.get("TAX_INVOICE_DATE"));
+ slipDate = taxInvoiceDate.replace("-", "");
+ if (slipDate.isEmpty()) {
+ resultMap.put("result", false);
+ resultMap.put("msg", "세금계산서 발행일이 없습니다. (" + customerName + ")");
+ return resultMap;
+ }
+
+ String slipTitle = customerName + "_" + itemSummary;
+
+ // 작성번호는 타임스탬프 기반으로 유니크하게 생성
+ int menuSq = generateMenuSq();
+
+ slipJson = slipApiClient.buildDomesticSlipJson(
+ slipDate, menuSq, slipTitle,
+ erpClientCd, customerName,
+ totalAmount, totalVat, totalSupplyPrice,
+ itemSummary, taxFg
+ );
+
+ // API 호출
+ String apiResponse = slipApiClient.registerSalesSlip(erpBaseUrl, slipJson);
+ System.out.println("[매출마감] 국내 전표 API 응답: " + apiResponse);
+
+ // 응답 검증
+ validateApiResponse(apiResponse, customerName);
+
+ // DB 업데이트: 각 항목에 전표 정보 저장
+ for (Map item : customerItems) {
+ HashMap updateParam = new HashMap();
+ updateParam.put("OBJID", CommonUtils.checkNull(item.get("OBJID")));
+ updateParam.put("deadlineDate", deadlineDate);
+ updateParam.put("slipDate", slipDate);
+ updateParam.put("slipMenuSq", menuSq);
+ sqlSession.update("salesNcollectMgmt.updateSlipInfo", updateParam);
+ }
+
+ } else {
+ // 해외: 선적일자 기준
+ String loadingDate = CommonUtils.checkNull(firstItem.get("LOADING_DATE"));
+ slipDate = loadingDate.replace("-", "");
+ if (slipDate.isEmpty()) {
+ resultMap.put("result", false);
+ resultMap.put("msg", "선적일자가 없습니다. (" + customerName + ")");
+ return resultMap;
+ }
+
+ String salesCurrency = CommonUtils.checkNull(firstItem.get("SALES_CURRENCY"));
+ double exchangeRate = toDouble(firstItem.get("SALES_EXCHANGE_RATE"));
+ String exportDeclNo = CommonUtils.checkNull(firstItem.get("EXPORT_DECL_NO"));
+ String exchCd = SalesSlipApiClient.convertCurrencyCode(salesCurrency);
+
+ String slipTitle = customerName + "_" + itemSummary
+ + "_" + String.format("%.2f", totalForeignAmount)
+ + "_@" + String.format("%.2f", exchangeRate);
+
+ int menuSq = generateMenuSq();
+
+ slipJson = slipApiClient.buildOverseasSlipJson(
+ slipDate, menuSq, slipTitle,
+ erpClientCd, customerName,
+ totalAmount,
+ exchCd, exchangeRate, totalForeignAmount,
+ exportDeclNo, slipDate,
+ customerName + "_" + itemSummary + "_" + String.format("%.2f", totalForeignAmount) + "_@" + String.format("%.2f", exchangeRate),
+ taxFg
+ );
+
+ String apiResponse = slipApiClient.registerSalesSlip(erpBaseUrl, slipJson);
+ System.out.println("[매출마감] 해외 전표 API 응답: " + apiResponse);
+
+ validateApiResponse(apiResponse, customerName);
+
+ for (Map item : customerItems) {
+ HashMap updateParam = new HashMap();
+ updateParam.put("OBJID", CommonUtils.checkNull(item.get("OBJID")));
+ updateParam.put("deadlineDate", deadlineDate);
+ updateParam.put("slipDate", slipDate);
+ updateParam.put("slipMenuSq", menuSq);
+ sqlSession.update("salesNcollectMgmt.updateSlipInfo", updateParam);
+ }
+ }
+
+ successCount += customerItems.size();
+ }
+
+ sqlSession.commit();
+ resultMap.put("result", true);
+ resultMap.put("msg", successCount + "건의 매출마감이 완료되었습니다. (전표 " + groupByCustomer.size() + "건 등록)");
+ System.out.println("===== 매출마감 + 아마란스 전표연동 완료 =====");
+
+ } catch (Exception e) {
resultMap.put("result", false);
- resultMap.put("msg", "매출마감 처리 중 오류가 발생했습니다.");
- sqlSession.rollback();
+ String errorMsg = e.getMessage();
+ if (errorMsg != null && errorMsg.startsWith("[전표오류]")) {
+ resultMap.put("msg", errorMsg);
+ } else {
+ resultMap.put("msg", "매출마감 처리 중 오류가 발생했습니다: " + errorMsg);
+ }
+ if (sqlSession != null) sqlSession.rollback();
System.out.println("===== 매출마감 처리 중 예외 발생 =====");
e.printStackTrace();
- }finally{
- sqlSession.close();
+ } finally {
+ if (sqlSession != null) sqlSession.close();
}
return resultMap;
}
+
+ /**
+ * 아마란스 API 응답 검증
+ * resultCode가 0이 아니면 예외 발생
+ */
+ private void validateApiResponse(String apiResponse, String customerName) throws Exception {
+ if (apiResponse == null || apiResponse.isEmpty()) {
+ throw new Exception("[전표오류] 아마란스 API 응답이 없습니다. (" + customerName + ")");
+ }
+ // resultCode 추출 (간이 JSON 파싱)
+ String resultCode = extractJsonField(apiResponse, "resultCode");
+ if (resultCode != null && !"0".equals(resultCode.trim())) {
+ String resultMsg = extractJsonField(apiResponse, "resultMsg");
+ String errorDetail = extractJsonField(apiResponse, "errorMsg");
+ StringBuilder errMsg = new StringBuilder("[전표오류] 아마란스 전표 등록 실패 (");
+ errMsg.append(customerName).append("): ");
+ if (resultMsg != null) errMsg.append(resultMsg);
+ if (errorDetail != null) errMsg.append(" - ").append(errorDetail);
+ throw new Exception(errMsg.toString());
+ }
+ }
+
+ /**
+ * JSON 문자열에서 특정 필드 값 추출 (간이 파서)
+ */
+ private String extractJsonField(String json, String fieldName) {
+ String searchKey = "\"" + fieldName + "\"";
+ int keyIdx = json.indexOf(searchKey);
+ if (keyIdx < 0) return null;
+ int colonIdx = json.indexOf(":", keyIdx + searchKey.length());
+ if (colonIdx < 0) return null;
+ int valueStart = colonIdx + 1;
+ // 공백 스킵
+ while (valueStart < json.length() && json.charAt(valueStart) == ' ') valueStart++;
+ if (valueStart >= json.length()) return null;
+ char firstChar = json.charAt(valueStart);
+ if (firstChar == '"') {
+ int valueEnd = json.indexOf("\"", valueStart + 1);
+ if (valueEnd < 0) return null;
+ return json.substring(valueStart + 1, valueEnd);
+ } else {
+ int valueEnd = valueStart;
+ while (valueEnd < json.length() && json.charAt(valueEnd) != ','
+ && json.charAt(valueEnd) != '}' && json.charAt(valueEnd) != ']') {
+ valueEnd++;
+ }
+ return json.substring(valueStart, valueEnd).trim();
+ }
+ }
+
+ /**
+ * 전표 작성번호 생성 (타임스탬프 기반, 밀리초 하위 5자리)
+ */
+ private int generateMenuSq() {
+ long timestamp = System.currentTimeMillis();
+ return (int) (timestamp % 100000);
+ }
+
+ private long toLong(Object value) {
+ if (value == null) return 0;
+ try {
+ return new BigDecimal(value.toString()).longValue();
+ } catch (Exception e) {
+ return 0;
+ }
+ }
+
+ private double toDouble(Object value) {
+ if (value == null) return 0.0;
+ try {
+ return new BigDecimal(value.toString()).doubleValue();
+ } catch (Exception e) {
+ return 0.0;
+ }
+ }
/**
* 모든 분할 출하의 총 판매 수량 조회