Commit Graph

361 Commits

Author SHA1 Message Date
Johngreen
49dd4b7c88 Merge branch 'main' into V20251023001 2025-10-31 11:17:41 +09:00
Johngreen
37285fbce6 Merge branch 'main' into V20251023001 2025-10-31 11:17:34 +09:00
e29305c1dc Merge pull request 'V20251023001' (#47) from V20251023001 into main
Reviewed-on: #47
2025-10-31 02:17:31 +00:00
Johngreen
a41c75c0f8 품번.확장자” 로 했을경우 업로드시 정확한 위치 업로드 버그수정 2025-10-31 11:17:05 +09:00
d4500e3f0b Merge pull request 'feature/new-work' (#46) from feature/new-work into main
Reviewed-on: #46
2025-10-31 01:29:55 +00:00
b5e50366d4 Merge branch 'main' into feature/new-work 2025-10-31 10:29:16 +09:00
8bb05b060c Merge branch 'main' into feature/new-work 2025-10-31 10:28:55 +09:00
21652fc0d1 Merge pull request 'e-bom 팝업창 항목수량(part_mng.qty -> bom_part_qty.item_qty)' (#45) from feature/new-work into main
Reviewed-on: #45
2025-10-31 01:28:45 +00:00
590ab6531b Merge pull request 'V20251023001' (#44) from V20251023001 into main
Reviewed-on: #44
2025-10-31 01:24:46 +00:00
Johngreen
b58b021dc9 Merge branch 'main' into V20251023001 2025-10-31 10:23:51 +09:00
Johngreen
eef76746ac Merge branch 'main' into V20251023001 2025-10-31 10:19:51 +09:00
a0acfc8067 Merge pull request 'V20251023001' (#43) from V20251023001 into main
Reviewed-on: #43
2025-10-31 01:19:43 +00:00
Johngreen
37d5427236 Merge branch 'main' into V20251023001 2025-10-31 10:19:19 +09:00
5d07b23098 Merge pull request 'V20251023001' (#42) from V20251023001 into main
Reviewed-on: #42
2025-10-31 01:19:07 +00:00
Johngreen
3f15362325 Merge branch 'main' into V20251023001 2025-10-31 10:18:40 +09:00
ee0389ad8a Merge pull request 'V20251023001' (#41) from V20251023001 into main
Reviewed-on: #41
2025-10-31 01:18:10 +00:00
87d6e0db0f e-bom 팝업창 항목수량(part_mng.qty -> bom_part_qty.item_qty) 2025-10-31 10:17:22 +09:00
Johngreen
7fa815a0cc Merge branch 'main' into V20251023001 2025-10-31 10:17:11 +09:00
aa7b03c959 Merge pull request 'V20251023001' (#40) from V20251023001 into main
Reviewed-on: #40
2025-10-31 01:13:34 +00:00
Johngreen
81d4b5a169 Merge branch 'main' into V20251023001 2025-10-31 10:12:59 +09:00
5cf3394df8 Merge pull request '한글, 특수문자버그수정' (#39) from V20251023001 into main
Reviewed-on: #39
2025-10-31 01:12:40 +00:00
Johngreen
0ac007eeb7 한글, 특수문자버그수정 2025-10-31 10:12:02 +09:00
50ed8a4ee1 Merge pull request 'V20251023001' (#38) from V20251023001 into main
Reviewed-on: #38
2025-10-31 00:32:24 +00:00
Johngreen
79ed8ee646 Merge branch 'main' into V20251023001 2025-10-31 09:31:33 +09:00
Johngreen
8645e74168 Merge branch 'main' into V20251023001 2025-10-31 09:31:23 +09:00
d61856111f Merge pull request '품번, 품명만 입력하고 저장시 빈 내용으로 이봄 리스트 생성(완료)' (#37) from V20251023001 into main
Reviewed-on: #37
2025-10-31 00:31:02 +00:00
Johngreen
5e92d29028 품번, 품명만 입력하고 저장시 빈 내용으로 이봄 리스트 생성(완료) 2025-10-31 09:30:26 +09:00
56d4387519 Merge pull request 'V20251023001' (#36) from V20251023001 into main
Reviewed-on: #36
2025-10-30 09:20:19 +00:00
Johngreen
f6d26de480 Merge branch 'main' into V20251023001 2025-10-30 18:20:04 +09:00
Johngreen
1d3d8f53e7 Merge branch 'main' into V20251023001 2025-10-30 18:20:01 +09:00
75febfdddb Merge pull request 'V20251023001' (#35) from V20251023001 into main
Reviewed-on: #35
2025-10-30 09:19:59 +00:00
Johngreen
c600012172 Merge branch 'main' into V20251023001 2025-10-30 18:19:46 +09:00
7256f40e0f Merge pull request '수정' (#34) from V20251023001 into main
Reviewed-on: #34
2025-10-30 09:19:32 +00:00
8c9ec367af Merge branch 'main' of https://g.wace.me/chpark/wace_plm 2025-10-30 18:11:58 +09:00
d1a3ae950d Revert: PDF 변환 기능 되돌림 (4a9577c) 2025-10-30 18:11:45 +09:00
7b4167d483 Revert: PDF 관련 커밋 2개 되돌림 (4a9577c, 4d56d64) 2025-10-30 18:06:45 +09:00
4d56d649e1 Merge branch 'main' of https://g.wace.me/chpark/wace_plm 2025-10-30 17:41:30 +09:00
Johngreen
6e7bdbf284 수정 2025-10-30 17:40:22 +09:00
25293d9273 Merge pull request 'V20251023001' (#33) from V20251023001 into main
Reviewed-on: #33
2025-10-30 05:49:53 +00:00
Johngreen
5ce29bf7b9 Merge branch 'main' into V20251023001 2025-10-30 14:49:25 +09:00
Johngreen
42bb799b73 이봄리스트>이봄등록 csv 업로드시 항목수량 컬럼 업로드 안되는 버그수정 2025-10-30 14:49:20 +09:00
643ece2589 Merge pull request 'V20251023001' (#32) from V20251023001 into main
Reviewed-on: #32
2025-10-30 04:15:56 +00:00
Johngreen
d09ae17a85 Merge branch 'main' into V20251023001 2025-10-30 13:15:42 +09:00
Johngreen
30b341753c Merge branch 'main' into V20251023001 2025-10-30 13:15:28 +09:00
c8cf1be26b Merge pull request 'M-BOM관리페이지 업데이트' (#31) from V20251023001 into main
Reviewed-on: #31
2025-10-30 04:15:24 +00:00
Johngreen
cfa031b20b M-BOM관리페이지 업데이트 2025-10-30 12:27:47 +09:00
4a9577c554 일반견적서 템플릿 변경, 견적서 pdf 변환하여 메일 첨부 2025-10-29 17:59:19 +09:00
128c3102c5 Merge pull request 'V20251023001' (#30) from V20251023001 into main
Reviewed-on: #30
2025-10-29 03:34:39 +00:00
Johngreen
56ee15565f Merge branch 'main' into V20251023001 2025-10-29 12:34:19 +09:00
Johngreen
7a718f9fe7 Merge branch 'main' into V20251023001 2025-10-29 12:34:12 +09:00