github-mirrors/No1WMS
1
0
Fork 0
mirror of https://github.com/suhf/No1WMS.git synced 2026-02-05 19:53:26 +09:00
Code Issues Packages Projects Releases Wiki Activity
147 Commits 1 Branch 0 Tags
9fff45dd6bd25450e7a50dcf5eab251eb5a51ab5
Commit Graph

78 Commits

Author SHA1 Message Date
sungsu
9fff45dd6b #update 2024-01-18 17:51:01 +09:00
sungsu
dabcd74cb6 #update 2024-01-18 17:29:35 +09:00
Kana
463fda993e use session 2024-01-18 16:15:34 +09:00
김민구
8490d7936e 입고 예정 추가 구현중 2024-01-18 15:32:01 +09:00
sungsu
054fb828c8 Merge remote-tracking branch 'origin/master' 2024-01-18 11:30:50 +09:00
sungsu
75a0ac4771 #update 
stock/list.jsp
 2024-01-18 11:30:29 +09:00
김민구
3c0409041f 입고예정 상세페이지 구현 중 2024-01-18 10:02:25 +09:00
sungsu
cddc901805 #update 
ResetPasswordController.java
ResetPasswordMapper.java
ResetPasswordService.java
ResetPasswordMapper.xml
resetpassword/list.jsp
 2024-01-18 00:36:46 +09:00
Kana
9e969783ef 메인페이지 달력 작업 2024-01-17 17:47:02 +09:00
김민구
e4f3155534 오탈자 2024-01-17 17:43:50 +09:00
Suh
2a63f0dfc8 plainin list와 read기본 2024-01-17 17:42:17 +09:00
sungsu
0f70e5ad5c #update 2024-01-17 17:08:35 +09:00
sungsu
821034569e Merge remote-tracking branch 'origin/master' 2024-01-17 17:04:33 +09:00
sungsu
9c91eb41cb #update 2024-01-17 17:03:28 +09:00
김민구
f7666aa84f Planinn list 2024-01-17 16:48:32 +09:00
sungsu
ccd7d743d8 Merge remote-tracking branch 'origin/master' 2024-01-17 16:13:18 +09:00
sungsu
b212f14f53 #update 
/stock/list.jsp
 2024-01-17 16:13:04 +09:00
Kana
711bc207cd 마이페이지 프로필사진 수정기능 완료 2024-01-17 13:39:44 +09:00
Kana
51d58cac5d 이미지 업로드 관련 2024-01-17 12:12:13 +09:00
Suh
d51668f3ec ResetPassword 관련 추가 2024-01-17 10:25:14 +09:00
Suh
17a6e5bafb Merge remote-tracking branch 'origin/master' 2024-01-17 09:40:45 +09:00
Suh
4a66a88d7b 네비게이션에서 mypage연결 2024-01-17 09:40:36 +09:00
Kana
6ccad5029d add mypage 2024-01-16 18:50:30 +09:00
Suh
18a0f083be planin 추가 2024-01-16 17:14:44 +09:00
sungsu
d10a18ea8f Merge branch 'master' of https://github.com/suhf/No1WMS 
# Conflicts:
#	src/main/java/com/no1/wms/vendor/VendorDto.java
#	src/main/resources/mappers/VendorMapper.xml
#	src/main/webapp/WEB-INF/views/vendor/create.jsp
#	src/main/webapp/WEB-INF/views/vendor/list.jsp
#	src/main/webapp/WEB-INF/views/vendor/read.jsp
#	src/main/webapp/WEB-INF/views/vendor/update.jsp
 2024-01-16 12:30:20 +09:00
Suh
e9875a9944 Merge remote-tracking branch 'origin/master' 2024-01-16 12:04:57 +09:00
Suh
88806ccde6 추가 2024-01-16 12:04:48 +09:00
Kana
00398754c3 The paging and search functions of the modal screens of the category 
page, price page, and product page have been completed
 2024-01-16 11:53:15 +09:00
sungsuhub
c79906db7d Add files via upload 2024-01-16 00:15:10 +09:00
sungsu
30d419bb5f #update 
VendorDto.java
VendorMapper.xml
vendor/create.jsp
vendor/create.jsp
vendor/create.jspvendor/create.jsp
 2024-01-16 00:10:40 +09:00
sungsu
c120f4df74 Merge remote-tracking branch 'origin/master' 2024-01-15 23:52:19 +09:00
sungsu
056e39dedc #update 
/stock/create.jsp
/warehouse/create.jsp
/stock/list.jsp
/warehouse/list.jsp
/warehouse/read.jsp
StockController.java
StockDto.java
StockMapper.xml
StockMapper.java
StockService.java
VendorDto.java
WarehouseMapper.xml
WarehouseController.java

#insert

/vendor/create.jsp
/vendor/list.jsp
product_category_company_search.jsp
/stock/read.jsp
/vendor/read.jsp
/stock/update.jsp
/vendor/update.jsp
VendorController.java
VendorMapper.java
VendorMapper.xml
VendorService.java
warehouse_capacity_currentCapacity.jsp
 2024-01-15 23:50:25 +09:00
Kana
b069e1d1be add excel upload 2024-01-15 18:00:19 +09:00
Suh
f21300a991 aop로 권한 적용되게 추가 2024-01-15 15:39:00 +09:00
Suh
cd82828562 Merge remote-tracking branch 'origin/master' 2024-01-15 10:28:05 +09:00
Suh
14e3b8b513 계정 추가 및 개인 권한 설정 기능 추가 2024-01-15 10:27:55 +09:00
Kana
8c31a4eae6 add Select Modal and Modal views 2024-01-12 17:47:56 +09:00
Suh
3307564595 Merge remote-tracking branch 'origin/master' 2024-01-12 12:38:08 +09:00
Suh
96b9dbcd8a account read update 관련 2024-01-12 12:37:56 +09:00
Kana
735cf868cd update Categorys and Products and add Prices 2024-01-12 09:53:33 +09:00
sungsu
660e581391 #update 
warehouse/read.jsp
 2024-01-11 20:41:28 +09:00
sungsu
4cd9d19c7a #수정 
stock/create.jsp
stock/list.jsp
stock/read.jsp
stock/update.jsp
WarehouseController.java
WarehouseMapper.xml
 2024-01-11 18:25:10 +09:00
Suh
9249fb4b50 Merge remote-tracking branch 'origin/master' 2024-01-11 16:33:24 +09:00
Suh
76e6d3c949 검색 모달 기능 추가 2024-01-11 16:32:40 +09:00
Kana
706dade420 update categorys 2024-01-11 15:36:03 +09:00
Suh
6f2cd14220 tiles * 일때 기능 없앰 2024-01-11 10:46:09 +09:00
Suh
6434cd8774 tiles * 일때 기능 없앰 2024-01-11 09:56:03 +09:00
sungsu
4b1c006adc Merge remote-tracking branch 'origin/master' 2024-01-11 00:17:08 +09:00
sungsu
9a761e7728 #update 
warehouse/list.jsp
warehouse/read.jsp
StockDto.java
WarehouseController.java
WarehouseDto.java
WarehouseMapper.java
WarehouseMapper.xml
WarehouseService.java

#insert
warehouse/update.jsp
 2024-01-11 00:16:39 +09:00
Kana
93e55e26ec change Categorys and change Products and add Product jsp 2024-01-10 19:21:23 +09:00