Commit Graph

277 Commits

Author SHA1 Message Date
leeheejin
7195dfb5f1 커밋 2025-11-13 17:00:31 +09:00
leeheejin
c2f2350b83 사라지기전에 2025-11-13 16:52:18 +09:00
leeheejin
849df44333 컬럼추가들 2025-11-13 15:00:02 +09:00
leeheejin
cf5806add5 거래명세서 완료 2025-11-13 14:35:13 +09:00
leeheejin
b567dedcaa 날짜수정 잘 들어감 2025-11-13 13:56:10 +09:00
leeheejin
56aa05513c 거래명세서커밋 2025-11-13 13:44:01 +09:00
leeheejin
258ed89c84 프로젝트번호 빈배열오류해결 2025-11-13 11:07:30 +09:00
leeheejin
32deed0726 Merge branch 'main' of https://g.wace.me/chpark/wace_plm into V2025111104 2025-11-13 10:59:59 +09:00
leeheejin
76aeae96fc 잔량 거래명세서데이터베이스저장완료 출하일눌렀을대 보임 2025-11-13 10:58:12 +09:00
leeheejin
f9a6dd145a 커밋밋 2025-11-13 10:04:01 +09:00
8e2092976c Merge pull request 'ㅇㅇ' (#63) from feature/estimate-template-improvements into main
Reviewed-on: #63
2025-11-13 00:57:30 +00:00
031ce7615d ㅇㅇ 2025-11-13 09:56:55 +09:00
leeheejin
5d60957bca 일단저장 2025-11-13 09:55:36 +09:00
leeheejin
27daa36137 Merge branch 'V2025111104' 2025-11-12 18:56:54 +09:00
leeheejin
c394900a83 auto commit 2025-11-12 18:56:43 +09:00
78281c5b86 Merge pull request 'fix: Use official Python image for backup container' (#62) from feature/estimate-template-improvements into main
Reviewed-on: #62
2025-11-12 09:48:48 +00:00
cf79338b55 fix: Use official Python image for backup container
- Change from dockerhub.wace.me/python:3.10-slim.linux to python:3.10-slim
- Fix Docker image not found error
2025-11-12 18:46:22 +09:00
leeheejin
479025bb79 저장 2025-11-12 18:33:33 +09:00
leeheejin
606172fada 일단 브랜치에 커밋 2025-11-12 18:29:20 +09:00
leeheejin
fdd5346c99 일단 브랜치에 커밋만 2025-11-12 18:29:11 +09:00
68dc1f096a Merge pull request 'feature/estimate-template-improvements' (#61) from feature/estimate-template-improvements into main
Reviewed-on: #61
2025-11-12 09:21:29 +00:00
ba026842f7 feat: Add database backup system
- Add Dockerfile.backup for backup container
- Add backup.py script with PostgreSQL backup functionality
- Add backup service to docker-compose.prod.yml
- Update env.production.example with backup configuration
- Add db/README.md with backup system documentation

Features:
- Automated daily backups (07:30, 18:00)
- Local and FTP remote backup support
- 7-day retention policy
- PostgreSQL 16 client for waceplm database
2025-11-12 18:19:54 +09:00
leeheejin
6b3a2c1cf1 분할 출하 기능 완료 - 잔량 계산 수정 2025-11-12 15:40:51 +09:00
8cccd9db2c 화면 수정 2025-11-11 18:09:37 +09:00
c366b71174 Merge pull request '수주등록 견적서 내용 기본입력되도록 수정' (#60) from feature/estimate-template-improvements into main
Reviewed-on: #60
2025-11-11 07:51:46 +00:00
da883f0007 수주등록 견적서 내용 기본입력되도록 수정 2025-11-11 16:47:29 +09:00
leeheejin
2bcc39ff65 Merge branch 'V2025111104' 2025-11-11 14:49:26 +09:00
leeheejin
0b291c4ea2 오류수정 2025-11-11 14:48:22 +09:00
0817253285 Merge pull request 'feature/estimate-template-improvements' (#59) from feature/estimate-template-improvements into main
Reviewed-on: #59
2025-11-11 05:14:16 +00:00
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