chpark/wace_plm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

잔량 거래명세서데이터베이스저장완료 출하일눌렀을대 보임

Browse Source
This commit is contained in:
leeheejin
2025-11-13 10:58:12 +09:00
parent f9a6dd145a
commit 76aeae96fc
6 changed files with 412 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
View File

@@ -1510,6 +1510,9 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
COALESCE(SR.incoterms, '') AS INCOTERMS
FROM PROJECT_MGMT AS T
LEFT JOIN sales_registration SR ON T.PROJECT_NO = SR.project_no
<if test="saleNo != null and saleNo != ''">
AND SR.sale_no = #{saleNo}
</if>
LEFT JOIN CONTRACT_MGMT CM ON CM.OBJID::VARCHAR = T.CONTRACT_OBJID
WHERE T.PROJECT_NO = #{orderNo}
</select>
@@ -1727,35 +1730,12 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
</choose>
#{shippingMethod}, #{salesUnitPrice}::numeric, #{salesSupplyPrice}::numeric,
#{salesVat}::numeric, #{salesTotalAmount}::numeric, #{salesCurrency},
#{salesExchangeRate}::numeric, #{manager}, #{incoterms}, #{serialNo},
#{salesExchangeRate}::numeric, #{managerUserId}, #{incoterms}, #{serialNo},
#{parentSaleNo}::integer, #{cretEmpNo}
)
</insert>
<!-- PROJECT_MGMT의 OBJID 조회 (shipment_log의 target_objid로 사용) -->
<select id="getProjectObjid" parameterType="map" resultType="map">
/* salesNcollectMgmt.getProjectObjid - PROJECT_MGMT의 OBJID 조회 */
SELECT OBJID FROM PROJECT_MGMT WHERE PROJECT_NO = #{orderNo}
</select>
<!-- 출하일 상세 내역 조회 (shipment_log에서 조회) -->
<select id="getShippingDetailList" parameterType="map" resultType="map">
/* salesNcollectMgmt.getShippingDetailList - shipment_log에서 모든 분할 출하 조회 */
SELECT
COALESCE(TO_CHAR(SL.shipping_date, 'YYYY-MM-DD'), '미등록') AS shipping_date,
COALESCE(SL.split_quantity, 0) AS shipping_quantity,
COALESCE(SL.shipping_status, '미등록') AS shipping_order_status,
COALESCE(SL.serial_no, '-') AS serial_no,
SL.target_objid AS project_no,
'분할 출하 ' || SL.log_id AS source,
TO_CHAR(SL.reg_date, 'YYYY-MM-DD HH24:MI:SS') AS reg_date
FROM shipment_log SL
WHERE SL.target_objid = #{projectNo}
ORDER BY SL.shipping_date DESC, SL.log_id DESC
</select>
<!-- sales_registration의 sales_quantity를 shipment_log 합계로 업데이트 -->
<!-- sales_registration의 수량을 shipment_log 합계로 업데이트 -->
<update id="updateSalesQuantityFromShipmentLog" parameterType="map">
/* salesNcollectMgmt.updateSalesQuantityFromShipmentLog - shipment_log 합계로 sales_quantity 업데이트 */
UPDATE sales_registration
@@ -1782,6 +1762,28 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
WHERE sale_no = #{saleNo}
</update>
<!-- PROJECT_MGMT의 OBJID 조회 (shipment_log의 target_objid로 사용) -->
<select id="getProjectObjid" parameterType="map" resultType="map">
/* salesNcollectMgmt.getProjectObjid - PROJECT_MGMT의 OBJID 조회 */
SELECT OBJID FROM PROJECT_MGMT WHERE PROJECT_NO = #{orderNo}
</select>
<!-- 출하일 상세 내역 조회 (모든 분할 출하 포함) -->
<select id="getShippingDetailList" parameterType="map" resultType="map">
/* salesNcollectMgmt.getShippingDetailList - shipment_log에서 모든 분할 출하 조회 */
SELECT
COALESCE(TO_CHAR(SL.shipping_date, 'YYYY-MM-DD'), '미등록') AS shipping_date,
COALESCE(SL.split_quantity, 0) AS shipping_quantity,
COALESCE(SL.shipping_status, '미등록') AS shipping_order_status,
COALESCE(SL.serial_no, '-') AS serial_no,
SL.target_objid AS project_no,
'분할 출하 ' || SL.log_id AS source,
TO_CHAR(SL.reg_date, 'YYYY-MM-DD HH24:MI:SS') AS reg_date
FROM shipment_log SL
WHERE SL.target_objid = #{projectNo}
ORDER BY SL.shipping_date DESC, SL.log_id DESC
</select>
<!-- 거래명세서 - 고객 정보 조회 -->
<select id="getCustomerInfoByProjectNo" parameterType="map" resultType="map">
/* salesNcollectMgmt.getCustomerInfoByProjectNo - 프로젝트 번호로 고객 정보 조회 */
@@ -1812,5 +1814,64 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
WHERE PM.PROJECT_NO = #{projectNo}
</select>
<!-- 거래명세서 저장 - NSWOS100_TBL 테이블 사용 -->
<insert id="saveTransactionStatement" parameterType="map">
/* salesNcollectMgmt.saveTransactionStatement - 거래명세서 저장 */
INSERT INTO NSWOS100_TBL (
SuVndCd /* 업체코드 */
,IssueDt /* 작성일자 */
,IssueNo /* 거래명세서번호 */
,IsNo /* 순번 */
,ProdCd /* 기종코드 */
,OdOrderNo /* 발주번호 */
,ImItemId /* 품번 */
,RmDueDt /* 납기일자 */
,RmOrderQty /* 발주수량 */
,RmRcptQty /* 입고처리수량 */
,RmRemQty /* 잔량 */
,IsDt /* 납기일자 */
,IsQty /* 납품수량 */
,IsPrice /* 납품단가 */
,IsAmount /* 납품금액 */
) VALUES (
#{suVndCd} /* 업체코드 */
,#{issueDt} /* 작성일자 */
,#{issueNo}::integer /* 거래명세서번호 */
,#{isNo}::integer /* 순번 */
,COALESCE(#{prodCd}, '') /* 기종코드 */
,COALESCE(#{odOrderNo}, '') /* 발주번호 */
,COALESCE(#{imItemId}, '') /* 품번 */
,COALESCE(#{rmDueDt}, '') /* 납기일자 */
,COALESCE(#{rmOrderQty}, 0)::integer /* 발주수량 */
,COALESCE(#{rmRcptQty}, 0)::integer /* 입고처리수량 */
,COALESCE(#{rmRemQty}, 0)::integer /* 잔량 */
,COALESCE(#{isDt}, '') /* 납기일자 */
,COALESCE(#{isQty}, 0)::integer /* 납품수량 */
,COALESCE(#{isPrice}, 0)::numeric /* 납품단가 */
,COALESCE(#{isAmount}, 0)::numeric /* 납품금액 */
) ON CONFLICT (SuVndCd, IssueDt, IssueNo, IsNo) DO
UPDATE SET
ProdCd = COALESCE(#{prodCd}, '')
,OdOrderNo = COALESCE(#{odOrderNo}, '')
,ImItemId = COALESCE(#{imItemId}, '')
,RmDueDt = COALESCE(#{rmDueDt}, '')
,RmOrderQty = COALESCE(#{rmOrderQty}, 0)::integer
,RmRcptQty = COALESCE(#{rmRcptQty}, 0)::integer
,RmRemQty = COALESCE(#{rmRemQty}, 0)::integer
,IsDt = COALESCE(#{isDt}, '')
,IsQty = COALESCE(#{isQty}, 0)::integer
,IsPrice = COALESCE(#{isPrice}, 0)::numeric
,IsAmount = COALESCE(#{isAmount}, 0)::numeric
</insert>
<!-- 거래명세서 번호 생성 -->
<select id="getNextTransactionStatementNo" parameterType="map" resultType="int">
/* salesNcollectMgmt.getNextTransactionStatementNo - 거래명세서 번호 생성 */
SELECT COALESCE(MAX(IssueNo), 0) + 1 AS nextNo
FROM NSWOS100_TBL
WHERE SuVndCd = #{suVndCd}
AND IssueDt = #{issueDt}
</select>
</mapper>

5
WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
View File

@@ -174,6 +174,11 @@
}
}
// 그리드 데이터를 localStorage에 저장
console.log("=== 거래명세서 출력 - 선택된 데이터 ===");
console.log(selectedData);
localStorage.setItem('transactionStatementData', JSON.stringify(selectedData));
// 프로젝트 번호들을 수집
var projectNos = selectedData.map(function(row) {
return row.PROJECT_NO;

74
WebContent/WEB-INF/view/salesmgmt/salesMgmt/transactionStatementForm.jsp
View File

@@ -329,42 +329,54 @@ $(document).ready(function(){
});
function fn_loadData() {
var projectNos = "${param.projectNos}";
console.log("=== 거래명세서 데이터 로드 ===");
console.log("프로젝트 번호:", projectNos);
if(!projectNos || projectNos === "") {
alert("프로젝트 번호가 없습니다.");
// localStorage에서 그리드 데이터 가져오기
var gridDataJson = localStorage.getItem('transactionStatementData');
if(!gridDataJson) {
alert("선택된 데이터가 없습니다.");
return;
}
$.ajax({
url: "/salesMgmt/getTransactionStatementData.do",
type: "POST",
data: { projectNos: projectNos },
dataType: "json",
success: function(data) {
console.log("=== 서버 응답 데이터 ===");
console.log("전체 데이터:", JSON.stringify(data, null, 2));
console.log("success:", data.success);
console.log("customerName:", data.customerName);
console.log("items:", data.items);
console.log("supplierName:", data.supplierName);
if(data && data.success) {
fn_fillData(data);
} else {
alert("데이터 조회 실패: " + (data.message || "알 수 없는 오류"));
}
},
error: function(xhr, status, error) {
console.log("=== AJAX 에러 ===");
console.log("status:", status);
console.log("error:", error);
console.log("responseText:", xhr.responseText);
alert("데이터 조회 중 오류 발생");
}
});
var gridData = JSON.parse(gridDataJson);
console.log("그리드 데이터:", gridData);
// 그리드 데이터를 거래명세서 형식으로 변환
var firstItem = gridData[0];
var statementData = {
success: true,
customerName: firstItem.CUSTOMER,
supplierName: "㈜압피에스",
supplierRegNo: "314-81-75146",
supplierAddress: "대전광역시 유성구 국제과학10로 8",
supplierBusiness: "제조",
supplierType: "금속절삭가공기계의",
supplierContact: "TEL:042-602-3300/FAX:042-672",
note: "아래와 같이 공급합니다.",
items: []
};
// 각 그리드 행을 품목으로 변환
for(var i = 0; i < gridData.length; i++) {
var row = gridData[i];
statementData.items.push({
productName: row.PRODUCT_NAME,
spec: row.PRODUCT_NO,
quantity: row.SALES_QUANTITY || 0,
unitPrice: row.SALES_UNIT_PRICE || 0,
supplyPrice: row.SALES_SUPPLY_PRICE || 0,
vat: row.SALES_VAT || 0
});
}
console.log("=== 변환된 거래명세서 데이터 ===");
console.log(statementData);
// 데이터 채우기
fn_fillData(statementData);
// localStorage 정리
localStorage.removeItem('transactionStatementData');
}
function fn_fillData(data) {