Commit Graph

127 Commits

Author SHA1 Message Date
Johngreen
c46f118f58 Merge branch 'main' into V20251023001 2025-10-27 21:52:55 +09:00
Johngreen
e2c60f4d63 Merge branch 'main' into V20251023001 2025-10-27 21:52:46 +09:00
7ae55dfa1f Merge pull request '3D, 2D, PDF 아이콘 눌려서 파일 개별 첨부하는 곳 첨부 안되는부분수정완료' (#19) from V20251023001 into main
Reviewed-on: #19
2025-10-27 12:50:07 +00:00
Johngreen
caa19e50d1 3D, 2D, PDF 아이콘 눌려서 파일 개별 첨부하는 곳 첨부 안되는부분수정완료 2025-10-27 21:48:26 +09:00
5f7b435c70 Merge pull request 'E-BOM 확인/수정 파일업로드기능추가' (#18) from V20251023001 into main
Reviewed-on: #18
2025-10-27 12:03:57 +00:00
Johngreen
657a8d3234 E-BOM 확인/수정 파일업로드기능추가 2025-10-27 21:03:21 +09:00
9c3bea7e95 Merge pull request 'V20251023001' (#17) from V20251023001 into main
Reviewed-on: #17
2025-10-27 08:17:19 +00:00
Johngreen
ff74ac99ca Merge branch 'main' into V20251023001 2025-10-27 17:15:35 +09:00
Johngreen
d69dfe8d95 Remove build artifact: partMng.xml from classes directory 2025-10-27 17:15:10 +09:00
Johngreen
01ebc04dfd Merge branch 'main' into V20251023001 2025-10-27 17:12:43 +09:00
37702b64eb Merge pull request 'E-BOM 확인/수정 품목추가로직수정' (#16) from V20251023001 into main
Reviewed-on: #16
2025-10-27 08:12:22 +00:00
Johngreen
af1c73345d E-BOM 확인/수정 품목추가로직수정 2025-10-27 17:11:57 +09:00
15af60c44e Merge remote-tracking branch 'origin/main' 2025-10-27 16:30:01 +09:00
6969e469dc E-BOM 조회 정전개, 역전개 2025-10-27 16:27:17 +09:00
bff85e1da5 Merge pull request 'V20251023001' (#15) from V20251023001 into main
Reviewed-on: #15
2025-10-27 05:30:19 +00:00
Johngreen
588fef91ce Update structurePopupLeft.jsp 2025-10-27 14:29:56 +09:00
Johngreen
df0a534f0e dd 2025-10-27 14:05:40 +09:00
Johngreen
bc6a7dcf7e Update partMng.xml 2025-10-27 14:04:06 +09:00
934c220abc Merge branch 'main' of https://g.wace.me/chpark/wace_plm 2025-10-27 13:41:53 +09:00
a802714411 E-BOM List, part 등록 수정 2025-10-27 13:38:51 +09:00
13164de870 Merge pull request 'V20251023001' (#14) from V20251023001 into main
Reviewed-on: #14
2025-10-27 04:15:01 +00:00
Johngreen
a19388eb1c 상단 E-BOM 품명 안나오는문제 수정 2025-10-27 13:14:32 +09:00
Johngreen
1d93f6ef3a 상단 E-BOM 품명 안나오는문제 해결 2025-10-27 12:09:22 +09:00
ba7edde4da Merge remote-tracking branch 'origin/main' 2025-10-24 17:49:22 +09:00
709f2b4d4b 봄 등록, csv 적용, 모품번 없이 저장 기능 개발, 엑셀 새로 업로드 기능 추가 2025-10-24 17:47:21 +09:00
5514ab3bb7 Merge pull request 'V20251023001' (#13) from V20251023001 into main
Reviewed-on: #13
2025-10-24 07:56:48 +00:00
Johngreen
63043f6909 E-BOM 확인/수정 완료 2025-10-24 16:56:00 +09:00
Johngreen
2b12fc3f6e E-BOM 확인/수정 2025-10-24 15:52:14 +09:00
23ebcd3b88 봄 복사기능 추가 2025-10-24 15:25:54 +09:00
967b8b6529 디자인 변경 2025-10-24 15:24:39 +09:00
b463ab84e3 봄 구조등록 수정. 봄 복사 개발 전 2025-10-24 14:26:55 +09:00
09d225803d Merge pull request '프로젝트일정관리 업데이트' (#12) from V20251023001 into main
Reviewed-on: #12
2025-10-23 08:41:01 +00:00
Johngreen
9c8d71c924 프로젝트일정관리 업데이트 2025-10-23 17:39:47 +09:00
daf5d9bce4 Merge pull request 'V20251023001' (#11) from V20251023001 into main
Reviewed-on: #11
2025-10-23 07:21:42 +00:00
Johngreen
1185aa491f 프로젝트관리_일정관리(WBS)3페이지 출하일 추가 2025-10-23 16:20:00 +09:00
Johngreen
dff92cedf7 프로젝트관리_일정관리업데이트 2025-10-23 15:52:53 +09:00
3a72111b20 Merge pull request '판매관리 검색필터부분 매출관리랑 맞춤' (#10) from V2025101701 into main
Reviewed-on: #10
2025-10-23 04:30:34 +00:00
Johngreen
fc2448eb6b 판매관리 검색필터부분 매출관리랑 맞춤 2025-10-23 13:30:12 +09:00
a4d1af4d91 Merge pull request 'V2025101701' (#9) from V2025101701 into main
Reviewed-on: #9
2025-10-23 04:19:22 +00:00
Johngreen
109d5b0501 판매 등록디자인일관성 수정 2025-10-23 13:18:54 +09:00
Johngreen
1890cb992d 판매관리페이지에서 고객사 요청사항 버그 수정 2025-10-23 13:10:17 +09:00
5d288975ae Merge pull request '판매관리, 매출관리 업데이트' (#8) from V2025101701 into main
Reviewed-on: #8
2025-10-23 02:31:28 +00:00
Johngreen
de875a207b 판매관리, 매출관리 업데이트 2025-10-23 11:30:46 +09:00
f00462ed70 Merge remote-tracking branch 'origin/main' 2025-10-23 09:54:13 +09:00
42d1cd4cd0 주문서첨부파일, 견적관리 틀고정 수정 2025-10-23 09:50:58 +09:00
Johngreen
f171212092 ㄹㄹ 2025-10-22 21:14:01 +09:00
221a2a3f8a Merge pull request 'V2025101701' (#7) from V2025101701 into main
Reviewed-on: #7
2025-10-22 12:06:26 +00:00
Johngreen
f8ef97bb3c Merge branch 'main' into V2025101701 2025-10-22 21:05:10 +09:00
Johngreen
d45261788c 수주/매출 관리 기능 수정 - ORDER_DATE 필드 추가 및 수주 합계 정보 수정 2025-10-22 21:04:55 +09:00
Johngreen
a3dd839b34 partMng.xml 수정 2025-10-22 21:02:31 +09:00