|
|
7ae57f9719
|
장비견적서 템플릿 수정, pdf 변환 메일 발송
|
2025-11-11 14:09:11 +09:00 |
|
|
|
a9836b599b
|
메일작성 변경
|
2025-11-11 14:09:11 +09:00 |
|
|
|
9aafeb3def
|
견적서 기본 템플릿 수정
|
2025-11-11 14:09:11 +09:00 |
|
|
|
c89266ec0f
|
Merge pull request 'V2025111101' (#58) from V2025111101 into main
Reviewed-on: #58
|
2025-11-11 05:00:17 +00:00 |
|
leeheejin
|
03e59664ab
|
auto commit
|
2025-11-11 13:52:56 +09:00 |
|
Johngreen
|
1c0e673068
|
Merge branch 'main' into V2025111101
|
2025-11-11 11:45:49 +09:00 |
|
Johngreen
|
ebc27216f4
|
영업관리_판매관리페이지 체크박스추가
|
2025-11-11 11:45:46 +09:00 |
|
|
|
690e60cd76
|
Merge pull request '도면업로드기능 업데이트, 업로드한 파일을 순회해서 하이픈 앞이 5자리면 10자리, 7자리면 16자리를 품번으로 추출하고, 맨 마지막 확장자만 인식하여 매칭한다.)' (#57) from V2025111101 into main
Reviewed-on: #57
|
2025-11-11 02:03:42 +00:00 |
|
Johngreen
|
378a84c768
|
도면업로드기능 업데이트, 업로드한 파일을 순회해서 하이픈 앞이 5자리면 10자리, 7자리면 16자리를 품번으로 추출하고, 맨 마지막 확장자만 인식하여 매칭한다.)
|
2025-11-11 11:01:35 +09:00 |
|
leeheejin
|
b01fafa0cd
|
Merge V2025111001 into main - 디버깅 로그 주석처리 및 컨트롤러 매핑 수정
|
2025-11-10 17:42:20 +09:00 |
|
leeheejin
|
54cd8e811f
|
콘솔로그 주석처리
|
2025-11-10 17:41:21 +09:00 |
|
leeheejin
|
eef9324a43
|
행이랑 검색필터 바꾸기 엑셀도 출하일 형식 맞추게 일단 로직 해놨음
|
2025-11-10 17:30:38 +09:00 |
|
leeheejin
|
69d7f8aba6
|
행이랑 검색필터 바꾸기 엑셀도 출하일 형식 맞추게 일단 로직 해놨음
|
2025-11-10 17:28:42 +09:00 |
|
|
|
8ba51a83b6
|
Merge pull request 'V2025111001' (#56) from V2025111001 into main
Reviewed-on: #56
|
2025-11-10 06:27:56 +00:00 |
|
leeheejin
|
1530d643f2
|
매출관리까지 한 작업 중간커밋
|
2025-11-10 14:40:34 +09:00 |
|
leeheejin
|
8b3c8b182c
|
중간커밋
|
2025-11-10 12:17:16 +09:00 |
|
leeheejin
|
ba78332607
|
auto commit
|
2025-11-10 09:32:45 +09:00 |
|
|
|
65dc50ced8
|
Merge pull request '2D 확장자 dxf 추가' (#55) from feature/20251104-hj into main
Reviewed-on: #55
|
2025-11-06 06:21:21 +00:00 |
|
|
|
8948073527
|
2D 확장자 dxf 추가
|
2025-11-06 15:12:57 +09:00 |
|
|
|
9f902a9e93
|
Merge pull request 'feature/20251104-hj' (#54) from feature/20251104-hj into main
Reviewed-on: #54
|
2025-11-04 05:38:14 +00:00 |
|
|
|
2b3177ead4
|
스핀들 영문 범주이름 한글 매칭 업로드 추가
|
2025-11-04 14:24:13 +09:00 |
|
|
|
87c2fd8f14
|
"?" 입력시 인코딩 오류 수정
|
2025-11-04 14:00:46 +09:00 |
|
|
|
b719d20ca2
|
e-bom, 상태변경 등 경고 표시, 상태변경 권한 적용
|
2025-11-04 13:35:39 +09:00 |
|
|
|
4dbc6eb887
|
공급업체->메이커, eo관련컬럼 제거
|
2025-11-04 10:21:55 +09:00 |
|
|
|
2b79ef456e
|
Merge pull request 'feature/new-work' (#53) from feature/new-work into main
Reviewed-on: #53
|
2025-11-04 00:59:36 +00:00 |
|
|
|
11638ac43c
|
일반견적서 pdf 변환 메일 첨부 수정
|
2025-11-04 09:46:17 +09:00 |
|
|
|
50baa3d75e
|
일반견적서 템플릿 변경, 견적서 pdf 변환하여 메일 첨부
|
2025-11-03 17:11:32 +09:00 |
|
|
|
399062a9a0
|
Merge remote-tracking branch 'origin/main' into feature/new-work
|
2025-11-03 17:09:23 +09:00 |
|
|
|
ded4a70b01
|
Merge pull request 'V20251023001' (#52) from V20251023001 into main
Reviewed-on: #52
|
2025-11-03 02:37:14 +00:00 |
|
Johngreen
|
44b43df82b
|
Merge branch 'main' into V20251023001
|
2025-11-03 11:36:53 +09:00 |
|
|
|
f26e92d9e3
|
Merge pull request '커넥션설정 보완작업' (#51) from V20251023001 into main
Reviewed-on: #51
|
2025-11-03 02:36:49 +00:00 |
|
Johngreen
|
4ca4bd2227
|
커넥션설정 보완작업
|
2025-11-03 11:34:48 +09:00 |
|
|
|
0dd9b8ab6d
|
Merge pull request 'V20251023001' (#50) from V20251023001 into main
Reviewed-on: #50
|
2025-10-31 03:00:56 +00:00 |
|
Johngreen
|
37980f8565
|
Merge branch 'main' into V20251023001
|
2025-10-31 12:00:40 +09:00 |
|
|
|
7558206e8b
|
Merge pull request '파트등록, 파트 조회 메뉴에도 도면 업로드 기능 추가' (#49) from V20251023001 into main
Reviewed-on: #49
|
2025-10-31 03:00:36 +00:00 |
|
Johngreen
|
1ad393e939
|
파트등록, 파트 조회 메뉴에도 도면 업로드 기능 추가
|
2025-10-31 12:00:17 +09:00 |
|
|
|
f9b20817a3
|
Merge pull request 'V20251023001' (#48) from V20251023001 into main
Reviewed-on: #48
|
2025-10-31 02:18:04 +00:00 |
|
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 |
|
