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

2025-11-12 15:40:51 +09:00
parent c366b71174
commit 6b3a2c1cf1
13 changed files with 1430 additions and 191 deletions
--- a/WebContent/WEB-INF/classes/com/pms/mapper/common.xml
+++ b/WebContent/WEB-INF/classes/com/pms/mapper/common.xml
@@ -3205,4 +3205,32 @@ SELECT  option_objid::VARCHAR 	AS CODE
 		WHERE USER_ID = #{userId} 
 		AND MASTER_OBJID::varchar = #{masterObjid}
 	</select>
+	
+	<!-- 고객사 정보 조회 -->
+	<select id="getSupplyInfo" parameterType="map" resultType="map">
+		SELECT 
+			OBJID,
+			SUPPLY_CODE,
+			SUPPLY_NAME,
+			REG_NO,
+			SUPPLY_ADDRESS,
+			SUPPLY_BUSNAME,
+			SUPPLY_STOCKNAME,
+			SUPPLY_TEL_NO,
+			SUPPLY_FAX_NO,
+			CHARGE_USER_NAME,
+			PAYMENT_METHOD,
+			MANAGER1_NAME,
+			MANAGER1_EMAIL,
+			MANAGER2_NAME,
+			MANAGER2_EMAIL,
+			MANAGER3_NAME,
+			MANAGER3_EMAIL,
+			MANAGER4_NAME,
+			MANAGER4_EMAIL,
+			MANAGER5_NAME,
+			MANAGER5_EMAIL
+		FROM SUPPLY_MNG
+		WHERE OBJID = #{objId}::numeric
+	</select>
 </mapper>
--- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml
+++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml
@@ -790,6 +790,102 @@
 	ORDER BY REGDATE DESC				
 </select>

+<!-- 주문서관리 Total 합계 조회 (조회된 데이터 전체 합계) -->
+<select id="getContractGridTotalAmount" parameterType="map" resultType="map">
+	/* contractMgmt.getContractGridTotalAmount */
+	SELECT
+		COALESCE(SUM(COALESCE(T.ORDER_TOTAL_AMOUNT_KRW, 0)), 0) AS "totalAmountKRW"
+	FROM 
+		<include refid="contractBase"/> T
+	WHERE 1=1
+	<if test="Year !=null and Year != '' ">
+		AND SUBSTR(CONTRACT_DATE,0,5) = #{Year}
+	</if>
+	
+	<if test="category_cd !=null and category_cd != '' ">
+		AND category_cd = #{category_cd}
+	</if>
+	
+	<if test="customer_objid !=null and customer_objid != '' ">
+		AND customer_objid = #{customer_objid}
+	</if>
+	
+	<if test="product != null and product !='' ">
+		AND product = #{product}
+	</if>
+	
+	<if test="status_cd !=null and status_cd !=''">
+		AND status_cd = #{status_cd}
+	</if>
+	
+	<if test="result_cd !=null and result_cd !=''">
+		AND result_cd = #{result_cd}
+	</if>
+	<if test="contract_result !=null and contract_result !=''">
+		AND contract_result = #{contract_result}
+	</if>
+	
+	<if test="contract_start_date != null and !''.equals(contract_start_date)">
+	  	AND TO_DATE(CONTRACT_DATE,'YYYY-MM-DD') <![CDATA[ >= ]]> TO_DATE(#{contract_start_date}, 'YYYY-MM-DD')				  	
+	</if>
+	<if test="contract_end_date != null and !''.equals(contract_end_date)">
+	  	AND TO_DATE(CONTRACT_DATE,'YYYY-MM-DD') <![CDATA[ <= ]]> TO_DATE(#{contract_end_date}, 'YYYY-MM-DD')
+	</if>
+
+	<if test="pm_user_id !=null and pm_user_id !=''">
+		AND pm_user_id = #{pm_user_id}
+	</if> 	
+	<if test="contract_month != null and !''.equals(contract_month)">
+	  	AND TO_DATE(TO_CHAR(TO_DATE(CONTRACT_DATE,'YYYY-MM-DD'),'YYYY-MM-DD'),'YYYY-MM') <![CDATA[ = ]]> TO_DATE(SUBSTRING(#{contract_month} FROM 1 FOR 4) || '-' || SUBSTRING(#{contract_month} FROM 5 FOR 2), 'YYYY-MM')
+	</if>
+	
+	<!-- 견적관리 추가 검색조건 -->
+	<if test="appr_status !=null and appr_status != '' ">
+		AND APPR_STATUS = #{appr_status}
+	</if>
+	
+	<if test="area_cd != null and area_cd !='' ">
+		AND AREA_CD = #{area_cd}
+	</if>
+	
+	<if test="paid_type != null and paid_type !='' ">
+		AND PAID_TYPE = #{paid_type}
+	</if>
+	
+	<!-- 품번/품명 검색: PART_OBJID로 정확하게 검색 -->
+	<if test="search_partObjId != null and search_partObjId != ''">
+		AND EXISTS (
+			SELECT 1 
+			FROM CONTRACT_ITEM CI
+			WHERE CI.CONTRACT_OBJID = T.OBJID
+			AND CI.STATUS = 'ACTIVE'
+			AND CI.PART_OBJID = #{search_partObjId}
+		)
+	</if>
+	
+	<if test="search_serialNo != null and search_serialNo != ''">
+		AND UPPER(SERIAL_NO) LIKE UPPER('%${search_serialNo}%')
+	</if>
+	
+	<if test="search_poNo != null and search_poNo != ''">
+		AND UPPER(PO_NO) LIKE UPPER('%${search_poNo}%')
+	</if>
+	
+	<if test="order_start_date != null and !''.equals(order_start_date)">
+		AND TO_DATE(ORDER_DATE,'YYYY-MM-DD') <![CDATA[ >= ]]> TO_DATE(#{order_start_date}, 'YYYY-MM-DD')				  	
+	</if>
+	<if test="order_end_date != null and !''.equals(order_end_date)">
+		AND TO_DATE(ORDER_DATE,'YYYY-MM-DD') <![CDATA[ <= ]]> TO_DATE(#{order_end_date}, 'YYYY-MM-DD')
+	</if>
+
+	<if test="due_start_date != null and !''.equals(due_start_date)">
+		AND TO_DATE(DUE_DATE,'YYYY-MM-DD') <![CDATA[ >= ]]> TO_DATE(#{due_start_date}, 'YYYY-MM-DD')				  	
+	</if>
+	<if test="due_end_date != null and !''.equals(due_end_date)">
+		AND TO_DATE(DUE_DATE,'YYYY-MM-DD') <![CDATA[ <= ]]> TO_DATE(#{due_end_date}, 'YYYY-MM-DD')
+	</if>
+</select>
+
 <select id="contractList_bak" parameterType="map" resultType="map">
 		SELECT * 
 		FROM (
@@ -3870,7 +3966,14 @@ ORDER BY ASM.SUPPLY_NAME
 	FROM
 		CONTRACT_MGMT AS T
 	WHERE
-		OBJID::VARCHAR = #{objId}
+		<choose>
+			<when test="templateObjId != null and templateObjId != '' and templateObjId != '-1' and (objId == null or objId == '' or objId == '-1')">
+				OBJID::VARCHAR = (SELECT CONTRACT_OBJID FROM ESTIMATE_TEMPLATE WHERE OBJID = #{templateObjId})
+			</when>
+			<otherwise>
+				OBJID::VARCHAR = #{objId}
+			</otherwise>
+		</choose>
 </select>

 <!-- 견적서 템플릿 목록 조회 (CONTRACT_OBJID 기준) -->
@@ -3935,6 +4038,12 @@ ORDER BY ASM.SUPPLY_NAME
 		ET.TOTAL_AMOUNT_KRW,
 		ET.MANAGER_NAME,
 		ET.MANAGER_CONTACT,
+		ET.PART_NAME,
+		ET.PART_OBJID,
+		ET.NOTES_CONTENT,
+		ET.VALIDITY_PERIOD,
+		ET.CATEGORIES_JSON,
+		ET.GROUP1_SUBTOTAL,
 		ET.WRITER,
 		ET.REGDATE,
 		ET.CHG_USER_ID,
@@ -3960,12 +4069,19 @@ ORDER BY ASM.SUPPLY_NAME
 		ESTIMATE_TEMPLATE ET
 	LEFT JOIN CONTRACT_MGMT CM ON ET.CONTRACT_OBJID = CM.OBJID
 	WHERE
-		ET.CONTRACT_OBJID = #{objId}
-			<if test="template_type != null and template_type != ''">
-				AND ET.TEMPLATE_TYPE = #{template_type}
-			</if>
-		ORDER BY ET.REGDATE DESC
-		LIMIT 1
+		<choose>
+			<when test="templateObjId != null and templateObjId != '' and templateObjId != '-1'">
+				ET.OBJID = #{templateObjId}
+			</when>
+			<otherwise>
+				ET.CONTRACT_OBJID = #{objId}
+				<if test="template_type != null and template_type != ''">
+					AND ET.TEMPLATE_TYPE = #{template_type}
+				</if>
+				ORDER BY ET.REGDATE DESC
+				LIMIT 1
+			</otherwise>
+		</choose>
 </select>

 <!-- 견적서 템플릿 데이터 조회 (OBJID 기준) -->
@@ -3991,6 +4107,13 @@ ORDER BY ASM.SUPPLY_NAME
 		ET.TOTAL_AMOUNT_KRW,
 		ET.MANAGER_NAME,
 		ET.MANAGER_CONTACT,
+		ET.SHOW_TOTAL_ROW,
+		ET.PART_NAME,
+		ET.PART_OBJID,
+		ET.NOTES_CONTENT,
+		ET.VALIDITY_PERIOD,
+		ET.CATEGORIES_JSON,
+		ET.GROUP1_SUBTOTAL,
 		ET.WRITER,
 		TO_CHAR(ET.REGDATE, 'YYYY-MM-DD HH24:MI') AS REGDATE,
 		ET.CHG_USER_ID,
@@ -4069,6 +4192,30 @@ ORDER BY ASM.SUPPLY_NAME
 	ORDER BY SEQ
 </select>

+<!-- 견적서 템플릿 품목 조회 (PART_OBJID로) -->
+<select id="getEstimateTemplateItemByPartObjId" parameterType="map" resultType="map">
+	SELECT
+		OBJID,
+		TEMPLATE_OBJID,
+		SEQ,
+		CATEGORY,
+		PART_OBJID,
+		DESCRIPTION,
+		SPECIFICATION,
+		QUANTITY,
+		UNIT,
+		UNIT_PRICE,
+		AMOUNT,
+		NOTE,
+		REMARK
+	FROM
+		ESTIMATE_TEMPLATE_ITEM
+	WHERE
+		TEMPLATE_OBJID = #{templateObjId}
+		AND PART_OBJID = #{partObjId}
+	LIMIT 1
+</select>
+
 <!-- 견적서 템플릿 저장 -->
 <insert id="insertEstimateTemplate" parameterType="map">
 	INSERT INTO ESTIMATE_TEMPLATE (
@@ -4092,6 +4239,7 @@ ORDER BY ASM.SUPPLY_NAME
 	TOTAL_AMOUNT_KRW,
 	MANAGER_NAME,
 	MANAGER_CONTACT,
+	SHOW_TOTAL_ROW,
 	WRITER,
 	REGDATE,
 	CHG_USER_ID,
@@ -4117,6 +4265,7 @@ ORDER BY ASM.SUPPLY_NAME
 	#{total_amount_krw},
 	#{manager_name},
 	#{manager_contact},
+	#{show_total_row},
 	#{writer},
 	NOW(),
 	#{chg_user_id},
@@ -4145,6 +4294,7 @@ ORDER BY ASM.SUPPLY_NAME
 	TOTAL_AMOUNT_KRW = #{total_amount_krw},
 	MANAGER_NAME = #{manager_name},
 	MANAGER_CONTACT = #{manager_contact},
+	SHOW_TOTAL_ROW = #{show_total_row},
 	CHG_USER_ID = #{chg_user_id},
 	CHGDATE = NOW()
 WHERE
@@ -4202,6 +4352,67 @@ WHERE
 		OBJID = #{template_objid}
 </update>

+<!-- 장비 견적서 템플릿 신규 저장 (Template 2) -->
+<insert id="insertEstimateTemplate2" parameterType="map">
+	INSERT INTO ESTIMATE_TEMPLATE (
+		OBJID,
+		CONTRACT_OBJID,
+		TEMPLATE_TYPE,
+		EXECUTOR_DATE,
+		RECIPIENT,
+		PART_NAME,
+		PART_OBJID,
+		NOTES_CONTENT,
+		VALIDITY_PERIOD,
+		CATEGORIES_JSON,
+		GROUP1_SUBTOTAL,
+		TOTAL_AMOUNT,
+		TOTAL_AMOUNT_KRW,
+		WRITER,
+		REGDATE,
+		CHG_USER_ID,
+		CHGDATE
+	) VALUES (
+		#{template_objid},
+		#{contract_objid},
+		'2',
+		#{executor_date},
+		#{recipient},
+		#{part_name},
+		#{part_objid},
+		#{notes_content},
+		#{validity_period},
+		#{categories_json},
+		#{group1_subtotal},
+		#{total_amount},
+		#{total_amount_krw},
+		#{writer},
+		NOW(),
+		#{chg_user_id},
+		NOW()
+	)
+</insert>
+
+<!-- 장비 견적서 템플릿 수정 (Template 2) -->
+<update id="updateEstimateTemplate2" parameterType="map">
+	UPDATE ESTIMATE_TEMPLATE
+	SET
+		EXECUTOR_DATE = #{executor_date},
+		RECIPIENT = #{recipient},
+		PART_NAME = #{part_name},
+		PART_OBJID = #{part_objid},
+		NOTES_CONTENT = #{notes_content},
+		VALIDITY_PERIOD = #{validity_period},
+		CATEGORIES_JSON = #{categories_json},
+		GROUP1_SUBTOTAL = #{group1_subtotal},
+		TOTAL_AMOUNT = #{total_amount},
+		TOTAL_AMOUNT_KRW = #{total_amount_krw},
+		CHG_USER_ID = #{chg_user_id},
+		CHGDATE = NOW()
+	WHERE
+		OBJID = #{template_objid}
+</update>
+
 <!-- 최종 차수 견적서 조회 (메일 발송용) -->
 <select id="getLatestEstimateTemplate" parameterType="map" resultType="map">
 	SELECT
@@ -4359,14 +4570,112 @@ WHERE
 	</if>
 	ORDER BY REGDATE DESC				
 </select>
+
+	<!-- 주문서관리 Total 합계 조회 -->
+	<select id="getOrderTotalAmount" parameterType="map" resultType="map">
+		SELECT
+			COALESCE(SUM(COALESCE(T.ORDER_SUPPLY_PRICE_SUM, 0)), 0) AS TOTAL_SUPPLY_PRICE,
+			COALESCE(SUM(COALESCE(T.ORDER_VAT_SUM, 0)), 0) AS TOTAL_VAT,
+			COALESCE(SUM(COALESCE(T.ORDER_TOTAL_AMOUNT_SUM, 0)), 0) AS TOTAL_AMOUNT
+		FROM 
+			<include refid="contractBase"/> T
+		WHERE 1=1
+		<if test="Year !=null and Year != '' ">
+			AND SUBSTR(CONTRACT_DATE,0,5) = #{Year}
+		</if>
+		
+		<if test="category_cd !=null and category_cd != '' ">
+			AND category_cd = #{category_cd}
+		</if>
+		
+		<if test="customer_objid !=null and customer_objid != '' ">
+			AND customer_objid = #{customer_objid}
+		</if>
+		
+		<if test="product != null and product !='' ">
+			AND product = #{product}
+		</if>
+		
+		<if test="status_cd !=null and status_cd !=''">
+			AND status_cd = #{status_cd}
+		</if>
+				
+		<if test="result_cd !=null and result_cd !=''">
+			AND result_cd = #{result_cd}
+		</if>
+		<if test="contract_result !=null and contract_result !=''">
+			AND contract_result = #{contract_result}
+		</if>
+		
+		<if test="contract_start_date != null and !''.equals(contract_start_date)">
+		  	AND TO_DATE(CONTRACT_DATE,'YYYY-MM-DD') <![CDATA[ >= ]]> TO_DATE(#{contract_start_date}, 'YYYY-MM-DD')				  	
+		</if>
+		<if test="contract_end_date != null and !''.equals(contract_end_date)">
+		  	AND TO_DATE(CONTRACT_DATE,'YYYY-MM-DD') <![CDATA[ <= ]]> TO_DATE(#{contract_end_date}, 'YYYY-MM-DD')
+		</if>
+
+		<if test="pm_user_id !=null and pm_user_id !=''">
+			AND pm_user_id = #{pm_user_id}
+		</if> 	
+		<if test="contract_month != null and !''.equals(contract_month)">
+		  	AND TO_DATE(TO_CHAR(TO_DATE(CONTRACT_DATE,'YYYY-MM-DD'),'YYYY-MM-DD'),'YYYY-MM') <![CDATA[ = ]]> TO_DATE(SUBSTRING(#{contract_month} FROM 1 FOR 4) || '-' || SUBSTRING(#{contract_month} FROM 5 FOR 2), 'YYYY-MM')
+		</if>
+		
+		<!-- 견적관리 추가 검색조건 -->
+		<if test="appr_status !=null and appr_status != '' ">
+			AND APPR_STATUS = #{appr_status}
+		</if>
+		
+		<if test="area_cd != null and area_cd !='' ">
+			AND AREA_CD = #{area_cd}
+		</if>
+		
+		<if test="paid_type != null and paid_type !='' ">
+			AND PAID_TYPE = #{paid_type}
+		</if>
+		
+		<!-- 품번/품명 검색: PART_OBJID로 정확하게 검색 -->
+		<if test="search_partObjId != null and search_partObjId != ''">
+			AND EXISTS (
+				SELECT 1 
+				FROM CONTRACT_ITEM CI
+				WHERE CI.CONTRACT_OBJID = T.OBJID
+				AND CI.STATUS = 'ACTIVE'
+				AND CI.PART_OBJID = #{search_partObjId}
+			)
+		</if>
+		
+		<if test="search_serialNo != null and search_serialNo != ''">
+			AND UPPER(SERIAL_NO) LIKE UPPER('%${search_serialNo}%')
+		</if>
+		
+		<if test="search_poNo != null and search_poNo != ''">
+			AND UPPER(PO_NO) LIKE UPPER('%${search_poNo}%')
+		</if>
+		
+		<if test="order_start_date != null and !''.equals(order_start_date)">
+			AND TO_DATE(ORDER_DATE,'YYYY-MM-DD') <![CDATA[ >= ]]> TO_DATE(#{order_start_date}, 'YYYY-MM-DD')				  	
+		</if>
+		<if test="order_end_date != null and !''.equals(order_end_date)">
+			AND TO_DATE(ORDER_DATE,'YYYY-MM-DD') <![CDATA[ <= ]]> TO_DATE(#{order_end_date}, 'YYYY-MM-DD')
+		</if>
+
+		<if test="due_start_date != null and !''.equals(due_start_date)">
+			AND TO_DATE(DUE_DATE,'YYYY-MM-DD') <![CDATA[ >= ]]> TO_DATE(#{due_start_date}, 'YYYY-MM-DD')				  	
+		</if>
+		<if test="due_end_date != null and !''.equals(due_end_date)">
+			AND TO_DATE(DUE_DATE,'YYYY-MM-DD') <![CDATA[ <= ]]> TO_DATE(#{due_end_date}, 'YYYY-MM-DD')
+		</if>
+	</select>
 	
 	<!-- 영업정보 조회 (수주등록용) -->
 	<select id="getContractInfo" parameterType="map" resultType="map">
 		SELECT 
 			OBJID,
 			CONTRACT_NO,
+			CUSTOMER_OBJID,
 			CONTRACT_CURRENCY,
-			(SELECT CODE_NAME FROM TB_CODE WHERE CODE_ID = CONTRACT_CURRENCY) AS CONTRACT_CURRENCY_NAME,
+			(SELECT CODE_NAME FROM COMM_CODE WHERE CODE_ID = CONTRACT_CURRENCY) AS CONTRACT_CURRENCY_NAME,
 			EXCHANGE_RATE,
 			QUANTITY,
 			PART_NO,
@@ -4592,8 +4901,8 @@ WHERE
 		CI.CONTRACT_OBJID,
 		CI.SEQ,
 		CI.PART_OBJID,
-		CI.PART_NO,
-		CI.PART_NAME,
+		COALESCE(NULLIF(CI.PART_NO, ''), PM.PART_NO) AS PART_NO,
+		COALESCE(NULLIF(CI.PART_NAME, ''), PM.PART_NAME) AS PART_NAME,
 		CI.QUANTITY,
 		CI.DUE_DATE,
 		CI.CUSTOMER_REQUEST,
@@ -4607,6 +4916,8 @@ WHERE
 		LEFT JOIN CONTRACT_ITEM_SERIAL CIS 
 			ON CI.OBJID = CIS.ITEM_OBJID 
 			AND CIS.STATUS = 'ACTIVE'
+		LEFT JOIN PART_MNG PM
+			ON CI.PART_OBJID = PM.OBJID
 	WHERE 
 		CI.CONTRACT_OBJID = #{contractObjId}
 		AND CI.STATUS = 'ACTIVE'
@@ -4616,7 +4927,9 @@ WHERE
 		CI.SEQ,
 		CI.PART_OBJID,
 		CI.PART_NO, 
-		CI.PART_NAME, 
+		CI.PART_NAME,
+		PM.PART_NO,
+		PM.PART_NAME,
 		CI.QUANTITY, 
 		CI.DUE_DATE, 
 		CI.CUSTOMER_REQUEST,
--- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
+++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
@@ -875,16 +875,32 @@
 		(SELECT CM.PRODUCTION_STATUS FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) AS PRODUCTION_STATUS,
 	-- 판매 관련 필드들 (sales_registration 테이블에서 한 번에 가져오기)
 	COALESCE(SR.shipping_order_status, '') AS SHIPPING_ORDER_STATUS,
-	COALESCE(SR.sales_quantity, 0) AS SALES_QUANTITY,
+	-- 판매수량: 모든 분할 출하의 합계
+	COALESCE(
+		(SELECT SUM(sales_quantity) 
+		 FROM sales_registration 
+		 WHERE project_no LIKE T.PROJECT_NO || '%'), 
+		0
+	) AS SALES_QUANTITY,
 	COALESCE(SR.sales_unit_price, 0) AS SALES_UNIT_PRICE,
 	COALESCE(SR.sales_supply_price, 0) AS SALES_SUPPLY_PRICE,
 	COALESCE(SR.sales_vat, 0) AS SALES_VAT,
 	COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT,
 	COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT_KRW,
-	-- 잔량 계산: 수주수량 - 판매수량
-	COALESCE(T.QUANTITY::numeric, 0) - COALESCE(SR.sales_quantity, 0) AS REMAINING_QUANTITY,
-	-- 잔량원화총액 계산: (수주수량 - 판매수량) * 판매단가
-	(COALESCE(T.QUANTITY::numeric, 0) - COALESCE(SR.sales_quantity, 0)) * COALESCE(SR.sales_unit_price, 0) AS REMAINING_AMOUNT_KRW,
+	-- 잔량 계산: 수주수량 - 모든 분할 출하의 합계
+	COALESCE(T.QUANTITY::numeric, 0) - COALESCE(
+		(SELECT SUM(sales_quantity) 
+		 FROM sales_registration 
+		 WHERE project_no LIKE T.PROJECT_NO || '%'), 
+		0
+	) AS REMAINING_QUANTITY,
+	-- 잔량원화총액 계산: (수주수량 - 모든 분할 출하 합계) * 판매단가
+	(COALESCE(T.QUANTITY::numeric, 0) - COALESCE(
+		(SELECT SUM(sales_quantity) 
+		 FROM sales_registration 
+		 WHERE project_no LIKE T.PROJECT_NO || '%'), 
+		0
+	)) * COALESCE(SR.sales_unit_price, 0) AS REMAINING_AMOUNT_KRW,
 	COALESCE(SR.sales_currency, T.CONTRACT_CURRENCY) AS SALES_CURRENCY,
 	CODE_NAME(COALESCE(SR.sales_currency, T.CONTRACT_CURRENCY)) AS SALES_CURRENCY_NAME,
 	COALESCE(SR.sales_exchange_rate, T.CONTRACT_PRICE_CURRENCY::numeric, 0) AS SALES_EXCHANGE_RATE,
@@ -1397,29 +1413,12 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
 					NULL,
 				</otherwise>
 			</choose>
-			#{shippingMethod},
-			#{manager},
-			#{incoterms},
-			#{cretEmpNo}
-		)
-		ON CONFLICT (project_no) 
-		DO UPDATE SET
-			shipping_order_status = EXCLUDED.shipping_order_status,
-			serial_no = EXCLUDED.serial_no,
-			sales_quantity = EXCLUDED.sales_quantity,
-			sales_unit_price = EXCLUDED.sales_unit_price,
-			sales_supply_price = EXCLUDED.sales_supply_price,
-			sales_vat = EXCLUDED.sales_vat,
-			sales_total_amount = EXCLUDED.sales_total_amount,
-			sales_currency = EXCLUDED.sales_currency,
-			sales_exchange_rate = EXCLUDED.sales_exchange_rate,
-			shipping_date = EXCLUDED.shipping_date,
-			shipping_method = EXCLUDED.shipping_method,
-			manager_user_id = EXCLUDED.manager_user_id,
-			incoterms = EXCLUDED.incoterms,
-			upd_date = NOW(),
-			upd_user_id = EXCLUDED.reg_user_id
-	</insert>
+		#{shippingMethod},
+		#{manager},
+		#{incoterms},
+		#{cretEmpNo}
+	)
+</insert>
 	
 	<!-- 
 	/**
@@ -1488,9 +1487,10 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
 				AND UPPER(STATUS) = 'ACTIVE'
 			) THEN 'Y' ELSE 'N' END AS ORDER_ATTACH,
 			(SELECT CM.PRODUCTION_STATUS FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) AS PRODUCTION_STATUS,
-		-- 판매 관련 필드들 (sales_registration 테이블에서 가져오기)
-		COALESCE(SR.shipping_order_status, '') AS SHIPPING_ORDER_STATUS,
-		COALESCE(SR.sales_quantity, 0) AS SALES_QUANTITY,
+	-- 판매 관련 필드들 (sales_registration 테이블에서 가져오기)
+	SR.sale_no AS SALE_NO,
+	COALESCE(SR.shipping_order_status, '') AS SHIPPING_ORDER_STATUS,
+	COALESCE(SR.sales_quantity, 0) AS SALES_QUANTITY,
 		COALESCE(SR.sales_unit_price, 0) AS SALES_UNIT_PRICE,
 		COALESCE(SR.sales_supply_price, 0) AS SALES_SUPPLY_PRICE,
 	COALESCE(SR.sales_vat, 0) AS SALES_VAT,
@@ -1619,5 +1619,129 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
 		WHERE OBJID::VARCHAR = #{OBJID}
 	</update>
 	
+	<!-- 모든 분할 출하의 총 판매 수량 조회 -->
+	<select id="getTotalSalesQuantity" parameterType="map" resultType="map">
+		/* salesNcollectMgmt.getTotalSalesQuantity - project_no로 시작하는 모든 레코드의 판매 수량 합계 */
+		SELECT COALESCE(SUM(sales_quantity), 0) as total
+		FROM sales_registration
+		WHERE project_no LIKE #{orderNo} || '%'
+	</select>
+	
+	<!-- sales_registration 개수 조회 (분할 출하 순번용) -->
+	<select id="getSaleRegistrationCount" parameterType="map" resultType="map">
+		/* salesNcollectMgmt.getSaleRegistrationCount - project_no로 시작하는 레코드 개수 */
+		SELECT COUNT(*) as count
+		FROM sales_registration
+		WHERE project_no LIKE #{orderNo} || '%'
+	</select>
+	
+	<!-- sales_registration DELETE (기존 데이터 삭제) -->
+	<delete id="deleteSaleRegistration" parameterType="map">
+		/* salesNcollectMgmt.deleteSaleRegistration - sales_registration 삭제 */
+		DELETE FROM sales_registration
+		WHERE project_no = #{orderNo}
+	</delete>
+	
+	<!-- sales_registration UPDATE (기존 데이터 수정) -->
+	<update id="updateSaleRegistration" parameterType="map">
+		/* salesNcollectMgmt.updateSaleRegistration - sales_registration 업데이트 */
+		UPDATE sales_registration
+		SET
+			shipping_order_status = <choose>
+				<when test="shippingOrderStatus != null and shippingOrderStatus != ''">
+					#{shippingOrderStatus},
+				</when>
+				<otherwise>
+					'',
+				</otherwise>
+			</choose>
+			serial_no = #{serialNo},
+			sales_quantity = #{salesQuantity}::integer,
+			sales_unit_price = #{salesUnitPrice}::numeric,
+			sales_supply_price = #{salesSupplyPrice}::numeric,
+			sales_vat = #{salesVat}::numeric,
+			sales_total_amount = #{salesTotalAmount}::numeric,
+			sales_currency = #{salesCurrency},
+			sales_exchange_rate = #{salesExchangeRate}::numeric,
+			shipping_date = <choose>
+				<when test="shippingDate != null and shippingDate != ''">
+					TO_DATE(#{shippingDate}, 'YYYY-MM-DD'),
+				</when>
+				<otherwise>
+					NULL,
+				</otherwise>
+			</choose>
+			shipping_method = #{shippingMethod},
+			manager_user_id = #{manager},
+			incoterms = #{incoterms},
+			upd_date = NOW(),
+			upd_user_id = #{cretEmpNo}
+		WHERE project_no = #{orderNo}
+	</update>
+	
+	<!-- ========================================
+	     분할 출하 관련 쿼리 (shipment_log 테이블 활용)
+	     ======================================== -->
+	
+	<!-- shipment_log의 split_quantity 합산 조회 -->
+	<select id="getShipmentLogTotal" parameterType="map" resultType="map">
+		/* salesNcollectMgmt.getShipmentLogTotal - shipment_log의 split_quantity 합산 */
+		SELECT COALESCE(SUM(split_quantity), 0) as total 
+		FROM shipment_log SL 
+		INNER JOIN project_mgmt PM ON SL.target_objid = PM.OBJID::VARCHAR 
+		WHERE PM.PROJECT_NO = #{orderNo}
+	</select>
+	
+	<!-- shipment_log에 분할 출하 기록 저장 -->
+	<insert id="insertShipmentLog" parameterType="map">
+		/* salesNcollectMgmt.insertShipmentLog - 분할 출하 기록 저장 */
+		INSERT INTO shipment_log (
+			target_objid, log_type, log_message, split_quantity, original_quantity, 
+			remaining_quantity, shipping_status, shipping_date, shipping_method,
+			sales_unit_price, sales_supply_price, sales_vat, sales_total_amount,
+			sales_currency, sales_exchange_rate, manager_user_id, incoterms,
+			serial_no, parent_sale_no, reg_user_id
+		) VALUES (
+			#{targetObjid}, 'SPLIT_SHIPMENT', '분할 출하',
+			#{salesQuantity}::integer, #{originalQuantity}::integer, #{remainingQuantity}::integer,
+			#{shippingOrderStatus},
+			<choose>
+				<when test="shippingDate != null and shippingDate != ''">
+					TO_DATE(#{shippingDate}, 'YYYY-MM-DD'),
+				</when>
+				<otherwise>NULL,</otherwise>
+			</choose>
+			#{shippingMethod}, #{salesUnitPrice}::numeric, #{salesSupplyPrice}::numeric,
+			#{salesVat}::numeric, #{salesTotalAmount}::numeric, #{salesCurrency},
+			#{salesExchangeRate}::numeric, #{manager}, #{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>
+	
+	<!-- 출하일 상세 내역 조회 (모든 분할 출하 포함) -->
+	<select id="getShippingDetailList" parameterType="map" resultType="map">
+		/* salesNcollectMgmt.getShippingDetailList - 모든 분할 출하 포함 */
+		SELECT 
+			COALESCE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), '미등록') AS shipping_date,
+			COALESCE(SR.sales_quantity, 0) AS shipping_quantity,
+			COALESCE(SR.shipping_order_status, '미등록') AS shipping_order_status,
+			COALESCE(SR.serial_no, '-') AS serial_no,
+			SR.project_no,
+			CASE 
+				WHEN SR.project_no = #{projectNo} THEN '최초 출하'
+				ELSE '분할 출하 ' || SUBSTRING(SR.project_no FROM LENGTH(#{projectNo}) + 2)
+			END AS source
+		FROM sales_registration SR 
+		WHERE SR.project_no LIKE #{projectNo} || '%'
+		
+		ORDER BY shipping_date DESC, project_no
+	</select>
+	
 </mapper>

--- a/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp
+++ b/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp
@@ -24,6 +24,11 @@ $(document).ready(function(){
 	//날짜
 	_fnc_datepick();
 	
+	// 그리드 높이 동적 계산 (Total 합계 영역 + 여유 공간 80px)
+	fnc_calculateContentHeight("gridDiv", 80);
+	$(window).resize(function() {
+		fnc_calculateContentHeight("gridDiv", 80);
+	});
 	
 	$('.select2').select2();
 	
@@ -96,14 +101,14 @@ $(document).ready(function(){
 });

 var columns = [	
-			{formatter:"rowSelection", titleFormatter:"rowSelection", hozAlign:"center", headerSort:false, width:40, frozen:true},
-			{headerHozAlign : 'center', hozAlign : 'center',	width : '90',		title : '영업번호',	field : 'CONTRACT_NO', frozen:true,	
-				formatter:fnc_createGridAnchorTag,
-				cellClick:function(e, cell){
-					var objid = fnc_checkNull(cell.getData().OBJID);
-					fn_projectConceptDetail(objid);
-				}
-			}, 
+		// rowSelection 제거 - fnc_tabul_search의 showCheck 파라미터로 자동 추가됨
+		{headerHozAlign : 'center', hozAlign : 'center',	width : '90',		title : '영업번호',	field : 'CONTRACT_NO', frozen:true,	
+			formatter:fnc_createGridAnchorTag,
+			cellClick:function(e, cell){
+				var objid = fnc_checkNull(cell.getData().OBJID);
+				fn_projectConceptDetail(objid);
+			}
+		},
 			{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '주문유형',		field : 'CATEGORY_NAME'	}, 
 			{headerHozAlign : 'center', hozAlign : 'center',	width : '100',		title : '발주일',		field : 'ORDER_DATE'	},
 			{headerHozAlign : 'center', hozAlign : 'center',	width : '100',		title : '발주번호',		field : 'PO_NO'	}, 
@@ -182,64 +187,49 @@ var columns = [

 //var grid;
 function fn_search(){
-	// 그리드 조회 및 Total 합계 업데이트를 위한 커스텀 AJAX
-	$.ajax({
-		url: "/contractMgmt/contractGridList.do",
-		type: "POST",
-		data: $("#form1").serializeObject(),
-		dataType: "json",
-		beforeSend: function(){
-			_startLoading("Loading...");
-		},
-		complete: function(){
-			_endLoading();
-		},
-		success: function(response) {
-			// 그리드 데이터 설정
-			if(_tabulGrid){
-				_tabulGrid.setData(response.RESULTLIST || []);
-			} else {
-				// 그리드 초기화
-				_tabulGrid = new Tabulator("#mainGrid", {
-					layout: _tabul_layout_fitColumns,
-					columns: columns,
-					data: response.RESULTLIST || [],
-					selectable: true
-				});
-			}
-			
-			// 조회된 전체 데이터의 합계 계산
-			var totalSupplyPrice = 0;
-			var totalVat = 0;
-			var totalAmount = 0;
-			
-			if(response.RESULTLIST && response.RESULTLIST.length > 0) {
-				response.RESULTLIST.forEach(function(row) {
-					var supplyPrice = parseFloat(row.ORDER_SUPPLY_PRICE_SUM || 0);
-					var vat = parseFloat(row.ORDER_VAT_SUM || 0);
-					var amount = parseFloat(row.ORDER_TOTAL_AMOUNT_SUM || 0);
-					
-					totalSupplyPrice += supplyPrice;
-					totalVat += vat;
-					totalAmount += amount;
-				});
-			}
-			
-			// 합계 표시
-			$("#totalSupplyPrice").text(Number(totalSupplyPrice).toLocaleString());
-			$("#totalVat").text(Number(totalVat).toLocaleString());
-			$("#totalAmount").text(Number(totalAmount).toLocaleString());
-			
-			// 페이징 HTML 업데이트
-			if(response.PAGE_HTML){
-				$(".table_paging_wrap").html(response.PAGE_HTML);
-			}
-		},
-		error: function(jqxhr, status, error){
-			alert("데이터 조회 중 오류가 발생했습니다.");
-			console.error(error);
-		}
-	});
+	// fnc_tabul_search로 페이징 처리
+	_tabulGrid = fnc_tabul_search(
+		_tabul_layout_fitColumns,
+		_tabulGrid,
+		"/contractMgmt/contractGridList.do",
+		columns,
+		true
+	);
+	
+	// 데이터 렌더링 완료 후 합계 계산 (한 번만 실행)
+	if(_tabulGrid) {
+		// 기존 이벤트 제거 후 재등록
+		_tabulGrid.off("renderComplete");
+		_tabulGrid.on("renderComplete", function(){
+			fn_calculateTotalFromGrid();
+		});
+	}
+}
+
+// 그리드에 표시된 데이터의 원화총액 합계 계산
+function fn_calculateTotalFromGrid(){
+	if(!_tabulGrid) {
+		console.log("⚠️ [주문서관리] 그리드가 초기화되지 않음");
+		$("#totalAmount").text("0");
+		return;
+	}
+	
+	// 현재 그리드에 표시된 데이터만 가져오기
+	var data = _tabulGrid.getData();
+	var totalAmountKRW = 0;
+	
+	console.log("🔍 [주문서관리] 표시된 데이터 개수:", data.length);
+	
+	if(data.length > 0) {
+		// ORDER_TOTAL_AMOUNT_KRW 합산
+		data.forEach(function(row) {
+			var amountKRW = parseFloat(row.ORDER_TOTAL_AMOUNT_KRW || 0);
+			totalAmountKRW += amountKRW;
+		});
+	}
+	
+	console.log("✅ [주문서관리] 표시된 데이터 합계:", totalAmountKRW);
+	$("#totalAmount").text(Number(totalAmountKRW).toLocaleString());
 }

 function _fnc_datepick(){
@@ -716,23 +706,17 @@ function openProjectFormPopUp(objId){
 								<input type="text" name="due_end_date" id="due_end_date" style="width:90px;" autocomplete="off" value="${param.due_end_date}" class="date_icon">
 								</td>
 							</tr>
-			            </table>
-			        </div>
-			        
-			        <!-- Total 합계 표시 영역 -->
-			        <div style="padding: 3px 10px; background: #f5f5f5; border-radius: 3px; margin: 10px 0;">
-			            <span style="font-weight: bold; font-size: 12px; margin-right: 20px;">
-			                Total 공급가액: <span id="totalSupplyPrice" style="color: #2196F3;">0</span> 원
-			            </span>
-			            <span style="font-weight: bold; font-size: 12px; margin-right: 20px;">
-			                Total 부가세: <span id="totalVat" style="color: #FF9800;">0</span> 원
-			            </span>
-			            <span style="font-weight: bold; font-size: 12px;">
-			                Total 총액: <span id="totalAmount" style="color: #4CAF50;">0</span> 원
-			            </span>
-			        </div>
-			        
-			        <%@include file= "/WEB-INF/view/common/common_gridArea.jsp" %>
+		            </table>
+		        </div>
+		        
+		        <!-- Total 합계 표시 영역 (그리드 위) -->
+		        <div style="padding:5px 10px; background: #f5f5f5;">
+		            <span style="font-weight: bold; font-size: 13px;">
+		                수주 금액 : <span id="totalAmount" style="color: #4CAF50;">0</span> 원
+		            </span>
+		        </div>
+		        
+		        <%@include file= "/WEB-INF/view/common/common_gridArea.jsp" %>
 				</div>
 			</div>
 	</form>
--- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
+++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
@@ -53,6 +53,11 @@
 		$("#btnBulkRegister").click(function(){
 			fn_bulkRegister();
 		});
+		
+		// 거래명세서 출력 버튼
+		$("#btnTransactionStatement").click(function(){
+			fn_printTransactionStatement();
+		});
 	});
 	
 	// 날짜 선택기 초기화 함수
@@ -125,6 +130,39 @@
 		fn_centerPopup(popup_width, popup_height, url);
 	}
 	
+	// 그리드 데이터를 전달하는 판매등록 팝업
+	function fn_openSaleRegPopupWithData(rowData){
+		console.log("=== fn_openSaleRegPopupWithData 호출 ===");
+		console.log("rowData:", rowData);
+		console.log("SALES_QUANTITY:", rowData.SALES_QUANTITY);
+		console.log("SALES_UNIT_PRICE:", rowData.SALES_UNIT_PRICE);
+		console.log("SALES_SUPPLY_PRICE:", rowData.SALES_SUPPLY_PRICE);
+		console.log("SALES_VAT:", rowData.SALES_VAT);
+		console.log("SALES_TOTAL_AMOUNT:", rowData.SALES_TOTAL_AMOUNT);
+		console.log("SALES_CURRENCY:", rowData.SALES_CURRENCY);
+		console.log("SALES_EXCHANGE_RATE:", rowData.SALES_EXCHANGE_RATE);
+		
+		var popup_width = 850;
+		var popup_height = 550;
+		
+		// 기본 파라미터
+		var params = "orderNo=" + encodeURIComponent(rowData.PROJECT_NO);
+		params += "&saleNo=" + (rowData.SALE_NO ? encodeURIComponent(rowData.SALE_NO) : "");
+		
+	// 그리드에서 표시되고 있는 금액 정보 전달
+	if(rowData.SALES_QUANTITY !== undefined && rowData.SALES_QUANTITY !== null) params += "&salesQuantity=" + encodeURIComponent(rowData.SALES_QUANTITY);
+	if(rowData.SALES_UNIT_PRICE !== undefined && rowData.SALES_UNIT_PRICE !== null) params += "&salesUnitPrice=" + encodeURIComponent(rowData.SALES_UNIT_PRICE);
+	if(rowData.SALES_SUPPLY_PRICE !== undefined && rowData.SALES_SUPPLY_PRICE !== null) params += "&salesSupplyPrice=" + encodeURIComponent(rowData.SALES_SUPPLY_PRICE);
+	if(rowData.SALES_VAT !== undefined && rowData.SALES_VAT !== null) params += "&salesVat=" + encodeURIComponent(rowData.SALES_VAT);
+	if(rowData.SALES_TOTAL_AMOUNT !== undefined && rowData.SALES_TOTAL_AMOUNT !== null) params += "&salesTotalAmount=" + encodeURIComponent(rowData.SALES_TOTAL_AMOUNT);
+	if(rowData.SALES_CURRENCY) params += "&salesCurrency=" + encodeURIComponent(rowData.SALES_CURRENCY);
+	if(rowData.SALES_EXCHANGE_RATE !== undefined && rowData.SALES_EXCHANGE_RATE !== null) params += "&salesExchangeRate=" + encodeURIComponent(rowData.SALES_EXCHANGE_RATE);
+		
+		var url = "/salesMgmt/salesRegForm.do?" + params;
+		console.log("최종 URL:", url);
+		fn_centerPopup(popup_width, popup_height, url);
+	}
+	
 	function fn_FileRegist(objId, docType, docTypeName){
 		var popup_width = 800;
 		var popup_height = 680;		
@@ -163,11 +201,39 @@ var columns = [
 	{headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '발주일', field : 'ORDER_DATE'},
 	{headerHozAlign : 'center', hozAlign : 'center', width : '120', title : '발주번호', field : 'PO_NO'},
 	{headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '요청납기', field : 'REQUEST_DATE'},
-	{headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '출하일', field : 'SHIPPING_DATE'},
+	{headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '출하일', field : 'SHIPPING_DATE',
+		cellClick: function(e, cell) {
+			var projectNo = cell.getRow().getData().PROJECT_NO;
+			if(projectNo) {
+				fn_openShippingDetail(projectNo);
+			}
+		}
+	},
 	{headerHozAlign : 'center', hozAlign : 'left', width : '150', title : '고객사', field : 'CUSTOMER'},
 	{headerHozAlign : 'center', hozAlign : 'left', width : '180', title : '품명', field : 'PRODUCT_NAME'},
+	{headerHozAlign : 'center', hozAlign : 'right', width : '100', title : '견적수량', field : 'ESTIMATE_QUANTITY',
+		formatter: function(cell) {
+			var value = cell.getValue();
+			if(!value || value === '' || value === '0') return '';
+			// "X 외 Y건" 형식인지 확인
+			if(typeof value === 'string' && value.includes('외')) {
+				return value;
+			}
+			// 숫자인 경우 포맷팅
+			return Number(value).toLocaleString();
+		}
+	},
 	{headerHozAlign : 'center', hozAlign : 'right', width : '100', title : '수주수량', field : 'ORDER_QUANTITY',
-		formatter: "money", formatterParams: {thousand: ",", symbolAfter: "", precision: false}
+		formatter: function(cell) {
+			var value = cell.getValue();
+			if(!value || value === '' || value === '0') return '';
+			// "X 외 Y건" 형식인지 확인
+			if(typeof value === 'string' && value.includes('외')) {
+				return value;
+			}
+			// 숫자인 경우 포맷팅
+			return Number(value).toLocaleString();
+		}
 	},
 	{headerHozAlign : 'center', hozAlign : 'right', width : '100', title : '판매수량', field : 'SALES_QUANTITY',
 		formatter: "money", formatterParams: {thousand: ",", symbolAfter: "", precision: false}
@@ -294,6 +360,23 @@ function fn_search(){
 	});
 }

+// 출하일 상세 내역 팝업
+function fn_openShippingDetail(projectNo) {
+	console.log("=== fn_openShippingDetail 호출 ===");
+	console.log("전달받은 projectNo:", projectNo);
+	console.log("projectNo 타입:", typeof projectNo);
+	
+	if(!projectNo) {
+		alert("프로젝트 번호가 없습니다.");
+		return;
+	}
+	
+	var url = "/salesMgmt/shippingDetailPopup.do?projectNo=" + encodeURIComponent(projectNo);
+	console.log("팝업 URL:", url);
+	
+	window.open(url, "shippingDetailPopup", "width=800,height=600,scrollbars=yes,resizable=yes");
+}
+
 // 출하지시/판매등록 함수 (1건만 선택 가능)
 function fn_bulkRegister(){
 	if(!_tabulGrid){
@@ -318,8 +401,8 @@ function fn_bulkRegister(){
 	// 선택한 1건의 항목 가져오기
 	var selectedRow = selectedRows[0];
 	
-	// 판매등록 팝업 열기
-	fn_openSaleRegPopup(selectedRow.PROJECT_NO, selectedRow.SALE_NO);
+	// 판매등록 팝업 열기 (그리드 데이터 전달)
+	fn_openSaleRegPopupWithData(selectedRow);
 }
 </script>
 </head>
--- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesRegForm.jsp
+++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesRegForm.jsp
@@ -19,6 +19,15 @@
 	var snCounter = 1;
 	
 	$(function() {
+		console.log("=== salesRegForm.jsp 로드 ===");
+		console.log("SALES_QUANTITY: ${saleInfo.SALES_QUANTITY}");
+		console.log("SALES_UNIT_PRICE: ${saleInfo.SALES_UNIT_PRICE}");
+		console.log("SALES_SUPPLY_PRICE: ${saleInfo.SALES_SUPPLY_PRICE}");
+		console.log("SALES_VAT: ${saleInfo.SALES_VAT}");
+		console.log("SALES_TOTAL_AMOUNT: ${saleInfo.SALES_TOTAL_AMOUNT}");
+		console.log("SALES_CURRENCY: ${saleInfo.SALES_CURRENCY}");
+		console.log("SALES_EXCHANGE_RATE: ${saleInfo.SALES_EXCHANGE_RATE}");
+		
 		$('.select2').select2();

 		// 날짜 선택기 초기화
@@ -33,18 +42,6 @@
 		// 판매환종 초기값 설정 (견적환종과 동기화)
 		initializeSalesCurrency();
 		
-		// 페이지 로드 시 금액 자동 계산 (수주 데이터가 있을 때)
-		setTimeout(function() {
-			var quantity = parseFloat($("#salesQuantity").val()) || 0;
-			var unitPrice = parseFloat($("#salesUnitPrice").val()) || 0;
-			
-			// 수주 데이터가 있으면 자동 계산
-			if(quantity > 0 || unitPrice > 0) {
-				fn_calculateSupplyPrice();
-				console.log("페이지 로드 시 금액 자동 계산 완료");
-			}
-		}, 500);
-		
 		// S/N 필드 클릭 이벤트
 		$("#serialNo").click(function() {
 			fn_openSnManagePopup();
@@ -511,23 +508,65 @@
 		}
 		console.log("=== S/N 처리 완료 ===");
 		
-		if (confirm("저장하시겠습니까?")) {
+	if (confirm("저장하시겠습니까?")) {
+		$.ajax({
+			url : "/salesMgmt/saveSales.do",
+			type : "POST",
+			data : $("#form1").serialize(),
+			dataType : "json",
+		success : function(data) {
+			alert(data.msg);
+			
+			// 저장 후 잔량 확인을 위해 서버에 다시 조회
 			$.ajax({
-				url : "/salesMgmt/saveSales.do",
-				type : "POST",
-				data : $("#form1").serialize(),
-				dataType : "json",
-				success : function(data) {
-					alert(data.msg);
+				url: "/salesMgmt/salesRegForm.do",
+				type: "GET",
+				data: { orderNo: "${param.orderNo}" },
+				dataType: "html",
+				success: function(response) {
+					// 응답에서 SALES_QUANTITY 추출 (잔량)
+					var match = response.match(/SALES_QUANTITY:\s*(\d+)/);
+					var remainingQuantity = match ? parseInt(match[1]) : 0;
+					
+					console.log("서버에서 계산한 잔량:", remainingQuantity);
+					
+					if(remainingQuantity > 0) {
+						if(confirm("잔량 " + remainingQuantity + "개가 남았습니다. 계속 등록하시겠습니까?")) {
+							// 팝업 새로고침 (잔량으로 수량 자동 설정)
+							location.reload();
+						} else {
+							// 목록 새로고침 후 팝업 닫기
+							if(opener && opener.fn_search) {
+								opener.fn_search();
+							}
+							self.close();
+						}
+					} else {
+						// 목록 새로고침 후 팝업 닫기
+						if(opener && opener.fn_search) {
+							opener.fn_search();
+						}
+						self.close();
+					}
+				},
+				error: function() {
+					// 에러 시 그냥 팝업 닫기
 					if(opener && opener.fn_search) {
 						opener.fn_search();
 					}
 					self.close();
-				},
-				error : function(jqxhr, status, error) {
-					alert("저장 중 오류가 발생했습니다.");
 				}
 			});
+		},
+			error : function(jqxhr, status, error) {
+				console.log("=== AJAX 에러 ===");
+				console.log("status:", status);
+				console.log("error:", error);
+				console.log("responseText:", jqxhr.responseText);
+				console.log("status code:", jqxhr.status);
+				alert("저장 중 오류가 발생했습니다.\n상태: " + status + "\n에러: " + error);
+			}
+			});
 		}
 	}

@@ -693,7 +732,7 @@
                                <tr>
                                    <td class="input_title"><label for="salesVat">판매부가세</label></td>
                                    <td>
-                                        <input type="number" name="salesVat" id="salesVat" value="${saleInfo.SALES_VAT}" onchange="fn_calculateTotalAmount()" />
+                                        <input type="number" name="salesVat" id="salesVat" value="${saleInfo.SALES_VAT}" readonly style="background-color:#f5f5f5;" />
                                    </td>
                                    <td class="input_title"><label for="salesTotalAmount">판매총액</label></td>
                                    <td>
--- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/shippingDetailPopup.jsp
+++ 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" %>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>출하일 상세 내역</title>
+<link rel="stylesheet" href="/css/basic.css">
+<script src="/js/jquery-2.1.4.min.js"></script>
+<style>
+body {
+	margin: 0;
+	padding: 20px;
+	font-family: 'Malgun Gothic', sans-serif;
+}
+.popup-header {
+	font-size: 18px;
+	font-weight: bold;
+	margin-bottom: 20px;
+	padding-bottom: 10px;
+	border-bottom: 2px solid #333;
+}
+.shipping-table {
+	width: 100%;
+	border-collapse: collapse;
+	margin-bottom: 20px;
+}
+.shipping-table th {
+	background-color: #f5f5f5;
+	padding: 10px;
+	border: 1px solid #ddd;
+	text-align: center;
+	font-weight: bold;
+}
+.shipping-table td {
+	padding: 10px;
+	border: 1px solid #ddd;
+	text-align: center;
+}
+.btn-close {
+	padding: 8px 20px;
+	background-color: #666;
+	color: white;
+	border: none;
+	cursor: pointer;
+	font-size: 14px;
+}
+.btn-close:hover {
+	background-color: #444;
+}
+.btn-wrap {
+	text-align: center;
+	margin-top: 20px;
+}
+</style>
+</head>
+<body>
+	<div class="popup-header">
+		출하일 상세 내역 - ${projectNo}
+	</div>
+	
+	<table class="shipping-table">
+		<thead>
+			<tr>
+				<th>출하일</th>
+				<th>출하수량</th>
+				<th>출하지시상태</th>
+				<th>S/N</th>
+			</tr>
+		</thead>
+		<tbody>
+			<c:choose>
+				<c:when test="${empty shippingList}">
+					<tr>
+						<td colspan="4">출하 내역이 없습니다.</td>
+					</tr>
+				</c:when>
+				<c:otherwise>
+					<c:forEach items="${shippingList}" var="item">
+						<tr>
+							<td>${item.shipping_date}</td>
+							<td>${item.shipping_quantity}</td>
+							<td>${item.shipping_order_status}</td>
+							<td>${item.serial_no}</td>
+						</tr>
+					</c:forEach>
+				</c:otherwise>
+			</c:choose>
+		</tbody>
+	</table>
+	
+	<div class="btn-wrap">
+		<button type="button" class="btn-close" onclick="window.close();">닫기</button>
+	</div>
+</body>
+</html>