Commit Graph

230 Commits

Author SHA1 Message Date
leeheejin
b647ecf70d 일단 커밋 2025-11-26 15:35:49 +09:00
leeheejin
47cfa6bbf9 중간커밋 2025-11-26 11:12:42 +09:00
leeheejin
cd4f5afe87 auto commit 2025-11-25 13:58:07 +09:00
leeheejin
926e8d6420 Merge branch 'main' of https://g.wace.me/chpark/wace_plm into V2025111703 2025-11-25 13:39:39 +09:00
5d3b5a5c4b Merge pull request 'm-bom 추가, 삭제, 변경' (#75) from V2025111901 into main
Reviewed-on: #75
2025-11-25 04:38:13 +00:00
leeheejin
9dd7452d91 필요한 버튼만 냅둠 2025-11-25 13:36:26 +09:00
9a2bd56d09 m-bom 추가, 삭제, 변경 2025-11-25 13:10:30 +09:00
leeheejin
edd74b8471 버튼색상 되돌리기 2025-11-25 12:59:59 +09:00
leeheejin
57ca98bff4 Merge remote-tracking branch 'origin/main' into V2025111703 2025-11-25 12:03:35 +09:00
leeheejin
f22119fbbe 구매요청서 2025-11-25 12:02:52 +09:00
3e5b02f679 Merge pull request 'V2025111901' (#74) from V2025111901 into main
Reviewed-on: #74
2025-11-24 09:49:44 +00:00
93d62035cc m-bom 복사, 생성, 이력보기 중간 완성 2025-11-24 18:47:21 +09:00
leeheejin
8c1287dd04 구매요청서 ui 수정만 해놓음 2025-11-24 18:37:52 +09:00
b30e2843d9 공급업체 -> 메이커 2025-11-24 15:07:34 +09:00
leeheejin
42d16f89e7 Merge branch 'main' of https://g.wace.me/chpark/wace_plm into V2025111703 2025-11-24 14:20:16 +09:00
leeheejin
52c089ffc5 기준정보관리의 일반거래처 관리 2025-11-24 14:17:03 +09:00
40a87dddaf Merge pull request 'V2025111901' (#73) from V2025111901 into main
Reviewed-on: #73
2025-11-21 08:00:40 +00:00
28d121670d 견적없이 수주등록 개발 2025-11-21 16:56:52 +09:00
leeheejin
63e07e03d0 검색필터 수정 2025-11-21 16:01:35 +09:00
4f17449a26 e-bom 구조 컬럼별 정렬 제거! 2025-11-21 14:46:57 +09:00
22406be147 e-bom csv 업로드 문제 발생시 저장버튼 숨기기, 화면 수정 2025-11-21 14:37:55 +09:00
0d5d0e36c2 페이지네이션 오류 수정 2025-11-21 13:44:21 +09:00
leeheejin
aefafc1b31 행에 표기되도록 수정 2025-11-21 13:19:28 +09:00
b571012a5c Merge pull request 'jsp 수정' (#72) from V2025111901 into main
Reviewed-on: #72
2025-11-21 02:54:42 +00:00
0fd1f0726c jsp 수정 2025-11-21 11:54:25 +09:00
leeheejin
50b22bd469 Merge V2025111703: Update sales management display format 2025-11-21 11:52:58 +09:00
leeheejin
65f453d262 판매관리 괄호 추가 2025-11-21 11:52:06 +09:00
leeheejin
16d529e277 Merge branch 'main' of https://g.wace.me/chpark/wace_plm 2025-11-21 11:46:19 +09:00
leeheejin
3b710905b4 수정 2025-11-21 11:45:16 +09:00
a2f22120e9 Merge pull request 'V2025111901' (#71) from V2025111901 into main
Reviewed-on: #71
2025-11-21 00:45:01 +00:00
a058d2c2c7 봄 상태변경 권한 admin 추가 2025-11-21 09:41:46 +09:00
leeheejin
7f650cc3aa 일반 거래처 관리 xml까지 완료상태 2025-11-20 18:25:35 +09:00
leeheejin
75457247f7 통화기호 나오게 함 2025-11-20 17:53:30 +09:00
leeheejin
cb44c08c6d 디자인수정, 컬럼 수정, 이름 수정 2025-11-20 17:22:45 +09:00
5637d9d25c Merge pull request 'V2025111703' (#70) from V2025111703 into main
Reviewed-on: #70
2025-11-20 08:03:16 +00:00
leeheejin
071cd98a8e 컬럼수정완료 2025-11-20 17:02:47 +09:00
leeheejin
8d5065b7c5 거래명세서생성으로 수정 2025-11-20 16:54:54 +09:00
b12ed67f90 장비견적서 양식 컬럼너비 조정 2025-11-20 16:16:35 +09:00
1c7149afda 컬럼 추가 2025-11-20 13:17:47 +09:00
b456d1a14b 제품구분 Machine 일 경우 품목, 수량만큼 프로젝트 생성. 2025-11-20 11:49:27 +09:00
leeheejin
9563c8eec2 창고관리 완료 2025-11-20 11:47:09 +09:00
leeheejin
735ea9e048 창고관리 완료 2025-11-19 18:24:08 +09:00
leeheejin
c0e21f2330 창고관리 기능은 구현 css 해야함 2025-11-19 17:15:49 +09:00
leeheejin
81a0ac5c62 생산관리 2025-11-18 14:37:36 +09:00
leeheejin
af02560097 m-bom 진행중 2025-11-17 18:44:44 +09:00
leeheejin
baa5d0249a Fix: Java 버전 호환성 문제 해결 - Dockerfile.dev jre8->jre7 변경 2025-11-17 18:20:46 +09:00
leeheejin
fd4283f3cf auto commit 2025-11-17 17:29:04 +09:00
leeheejin
c1921855e6 봄 복사 기능 러프하게 구현(테스트 아직 못함) 결과 일단 저장 2025-11-17 10:03:29 +09:00
eff22bbc4c Merge pull request 'feature/20251113-hj' (#66) from feature/20251113-hj into main
Reviewed-on: #66
2025-11-14 00:52:05 +00:00
5a582862d6 Merge branch 'main' into feature/20251113-hj 2025-11-14 09:51:05 +09:00