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-12 18:29:11 +09:00
parent 6b3a2c1cf1
commit fdd5346c99
2 changed files with 28 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1420,6 +1420,31 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
)
</insert>
<!--
/**
* 출하일 상세 내역 조회 - 분할 출하된 날짜별 수량 조회
* PROJECT_NO로 조회
* @since 2025.11.12
* @author assistant
* @version 1.0
**/
-->
<select id="getShippingDetailList" parameterType="map" resultType="map">
/* salesNcollectMgmt.getShippingDetailList - 출하일 클릭 시 팝업에 표시할 분할 출하 내역 */
-- PROJECT_MGMT 기준으로 조회 (조건 완화: LIKE, UPPER)
SELECT
T.PROJECT_NO AS DEBUG_PROJECT_NO,
SR.project_no AS DEBUG_SR_PROJECT_NO,
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
FROM PROJECT_MGMT AS T
LEFT JOIN sales_registration SR ON TRIM(UPPER(T.PROJECT_NO)) = TRIM(UPPER(SR.project_no))
WHERE TRIM(UPPER(T.PROJECT_NO)) LIKE TRIM(UPPER(#{projectNo}))
</select>
<!--
/**
* 판매 정보 조회 - 판매등록 팝업에서 사용

66
src/com/pms/salesmgmt/service/SalesNcollectMgmtService.java
View File

@@ -321,38 +321,12 @@ public class SalesNcollectMgmtService {
PersonBean person = (PersonBean) request.getSession().getAttribute(Constants.PERSON_BEAN);
paramMap.put("cretEmpNo", person.getUserId());
// 기존 데이터 확인
Map<String, Object> existingData = sqlSession.selectOne("salesNcollectMgmt.getSaleInfo", paramMap);
if(existingData != null && existingData.get("sale_no") != null) {
// 이미 있으면 순번을 붙여서 새로운 project_no로 INSERT
String originalProjectNo = String.valueOf(paramMap.get("orderNo"));
// 기존 레코드 개수 조회
Map<String, Object> countResult = sqlSession.selectOne("salesNcollectMgmt.getSaleRegistrationCount", paramMap);
int count = countResult != null && countResult.get("count") != null ?
Integer.parseInt(String.valueOf(countResult.get("count"))) : 0;
// 새로운 project_no 생성 (순번 추가)
String newProjectNo = originalProjectNo + "_" + (count + 1);
paramMap.put("orderNo", newProjectNo);
System.out.println("=== 분할 출하 저장 ===");
System.out.println("원본 PROJECT_NO: " + originalProjectNo);
System.out.println("새 PROJECT_NO: " + newProjectNo);
System.out.println("수량: " + paramMap.get("salesQuantity"));
} else {
System.out.println("=== 판매 정보 신규 저장 ===");
System.out.println("PROJECT_NO: " + paramMap.get("orderNo"));
System.out.println("수량: " + paramMap.get("salesQuantity"));
}
// INSERT
sqlSession.insert("salesNcollectMgmt.insertSaleRegistration", paramMap);
resultMap.put("msg", "저장되었습니다.");
// sales_registration 테이블에 판매 데이터 저장 (ON CONFLICT로 자동 UPDATE)
sqlSession.insert("salesNcollectMgmt.insertSaleRegistration", paramMap);
sqlSession.commit();
resultMap.put("result", true);
resultMap.put("msg", "저장되었습니다.");
} catch(Exception e) {
if(sqlSession != null) {
sqlSession.rollback();
@@ -967,38 +941,4 @@ public class SalesNcollectMgmtService {
}
return resultList;
}
public Map<String, Object> getTotalSalesQuantity(Map<String, Object> paramMap) {
SqlSession sqlSession = null;
Map<String, Object> result = null;
try {
sqlSession = SqlMapConfig.getInstance().getSqlSession();
result = sqlSession.selectOne("salesNcollectMgmt.getTotalSalesQuantity", paramMap);
} catch(Exception e) {
e.printStackTrace();
} finally {
if(sqlSession != null) {
sqlSession.close();
}
}
return result;
}
public Map<String, Object> getShipmentLogTotal(Map<String, Object> paramMap) {
SqlSession sqlSession = null;
Map<String, Object> result = new HashMap<String, Object>();
try {
sqlSession = SqlMapConfig.getInstance().getSqlSession();
result = sqlSession.selectOne("salesNcollectMgmt.getShipmentLogTotal", paramMap);
} catch (Exception e) {
e.printStackTrace();
} finally {
if (sqlSession != null) {
sqlSession.close();
}
}
return result;
}
}