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-01-19 16:41:44 +09:00
parent 8d14504861
commit f3823dae40
7 changed files with 796 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/pms/service/PurchaseOrderService.java
View File

@@ -1839,8 +1839,9 @@ public class PurchaseOrderService {
String docType = CommonUtils.checkNull((String) salesRequestInfo.get("doc_type"));
System.out.println("docType: " + docType);
// 품의서(PROPOSAL)인 경우 VENDOR_PM 사용, 구매요청서는 PARTNER_OBJID 사용
String queryId = "PROPOSAL".equals(docType)
// 품의서(PROPOSAL, PURCHASE_REG_PROPOSAL)인 경우 VENDOR_PM 사용, 구매요청서는 PARTNER_OBJID 사용
boolean isProposal = "PROPOSAL".equals(docType) || "PURCHASE_REG_PROPOSAL".equals(docType);
String queryId = isProposal
? "purchaseOrder.getVendorListByProposalObjid"
: "purchaseOrder.grtPartnerObjidBySalesRequestObjid";
System.out.println("queryId: " + queryId);
@@ -1881,7 +1882,7 @@ public class PurchaseOrderService {
sqlSession.update("purchaseOrder.mergePurchaseOrderMasterBySalesRequest", masterParam);
// 해당 공급업체의 품목 조회
String partQueryId = "PROPOSAL".equals(docType)
String partQueryId = isProposal
? "purchaseOrder.getProposalPartsByVendor"
: "purchaseOrder.getSalesRequestPartsByVendor";
@@ -1898,16 +1899,28 @@ public class PurchaseOrderService {
partParam.put("PURCHASE_ORDER_MASTER_OBJID", purchaseOrderMasterObjid);
partParam.put("PART_OBJID", CommonUtils.checkNull((String) partMap.get("part_objid")));
// 수량 처리
String qtyStr = CommonUtils.checkNull(partMap.get("qty"), "0");
String orderQtyStr = CommonUtils.checkNull(partMap.get("order_qty"), "0");
// 수량 처리 (Object 타입 대응)
Object qtyObj = partMap.get("qty");
Object orderQtyObj = partMap.get("order_qty");
String qtyStr = (qtyObj != null) ? String.valueOf(qtyObj).trim() : "0";
if("".equals(qtyStr)) qtyStr = "0";
String orderQtyStr = (orderQtyObj != null) ? String.valueOf(orderQtyObj).trim() : "";
// ORDER_QTY가 없거나 빈값/0이면 QTY 사용
if("".equals(orderQtyStr) || "0".equals(orderQtyStr)) {
orderQtyStr = qtyStr;
}
partParam.put("QTY", qtyStr);
partParam.put("ORDER_QTY", orderQtyStr);
// 단가 정보
String partnerPrice = CommonUtils.checkNull(partMap.get("partner_price"), "0");
String totalPrice = CommonUtils.checkNull(partMap.get("total_price"), "0");
// 단가 정보 (Object 타입 대응)
Object partnerPriceObj = partMap.get("partner_price");
Object totalPriceObj = partMap.get("total_price");
String partnerPrice = (partnerPriceObj != null) ? String.valueOf(partnerPriceObj).trim() : "0";
if("".equals(partnerPrice)) partnerPrice = "0";
String totalPrice = (totalPriceObj != null) ? String.valueOf(totalPriceObj).trim() : "0";
if("".equals(totalPrice)) totalPrice = "0";
partParam.put("PARTNER_PRICE", partnerPrice);