Commit Graph

228 Commits

Author SHA1 Message Date
김민구
a53ad9456a 입고예정 삭제 버튼 색사 변경 2024-01-24 18:09:20 +09:00
김민구
818f180718 Merge branch 'master' of https://github.com/suhf/No1WMS 2024-01-24 18:06:53 +09:00
김민구
1c82ee1a94 입고예정 버튼 색상 변경 2024-01-24 18:06:45 +09:00
Kana
dabe2ba098 제품 리스트에 번호추가 2024-01-24 17:51:50 +09:00
김민구
96cf79504e 입고 수정 모달에 페이징 추가 2024-01-24 17:50:39 +09:00
Kana
a0a4acd5fd change plan in add 2024-01-24 17:20:34 +09:00
Kana
da7a0cf9d5 마이페이지 비밀번호 수정기능 추가 2024-01-24 17:07:19 +09:00
Kana
02f31c224e change planin 2024-01-24 16:59:33 +09:00
sungsu
8d4eac2b77 #수정 2024-01-24 16:12:11 +09:00
Suh
9a9e58ecad 로그인 기능 연결 2024-01-24 15:56:41 +09:00
sungsu
beed683f96 Merge remote-tracking branch 'origin/master' 2024-01-24 15:14:51 +09:00
sungsu
8699e6923e #수정 2024-01-24 15:14:35 +09:00
Kana
b8c98c61dd img=jpg 2024-01-24 15:08:16 +09:00
sungsu
e9f78f87f7 #수정 2024-01-24 14:44:01 +09:00
sungsu
eee447f37c Merge remote-tracking branch 'origin/master' 2024-01-24 14:38:41 +09:00
sungsu
6ca7664916 #수정 2024-01-24 14:38:25 +09:00
Kana
390da27e28 change mainpage img 2024-01-24 12:48:30 +09:00
Kana
175f71c8da change search bar 2024-01-24 12:36:56 +09:00
sungsu
256dd5961c #수정 2024-01-24 12:24:14 +09:00
Kana
89b9045d1e change BaseController 2024-01-24 12:13:20 +09:00
김민구
717a1b9d4c Merge branch 'master' of https://github.com/suhf/No1WMS 2024-01-24 12:12:40 +09:00
김민구
b63aa92326 Merge branch 'master' of https://github.com/suhf/No1WMS 2024-01-24 12:12:14 +09:00
sungsu
8c7fb089d7 #수정 2024-01-24 12:12:11 +09:00
김민구
c50e12b597 입고예정 System.out.println(); 주석처리 2024-01-24 12:12:02 +09:00
sungsu
530e0b532d Merge branch 'master' of https://github.com/suhf/No1WMS 2024-01-24 12:08:15 +09:00
Kana
8e88b41ba6 change in 2024-01-24 12:06:52 +09:00
Kana
44e9936534 Merge branch 'master' of https://github.com/suhf/No1WMS.git 2024-01-24 12:06:30 +09:00
Kana
fcbea8e503 add mainpage 2024-01-24 12:06:17 +09:00
김민구
2e29fcb969 입고예정 리스트 하단 page 번호 추가 2024-01-24 11:56:38 +09:00
sungsu
f404915ae3 Merge branch 'master' of https://github.com/suhf/No1WMS 2024-01-24 11:18:31 +09:00
sungsuhub
8e38a3f520 Update StockMapper.xml 2024-01-24 11:18:21 +09:00
sungsuhub
c84ebae56c Update main.jsp 2024-01-24 11:17:30 +09:00
sungsuhub
bfb2e8fa14 Update MainPageController.java 2024-01-24 11:16:45 +09:00
sungsu
d0b9ecdbea Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/webapp/WEB-INF/views/base/main.jsp
2024-01-24 11:14:46 +09:00
sungsu
dd502574fb #수정 2024-01-24 11:12:02 +09:00
Kana
cb0eac897e change mainpage 2024-01-24 10:30:46 +09:00
Kana
bbf093258e mainpage 2024-01-24 10:16:33 +09:00
sungsu
d09efc50dc #수정 2024-01-24 10:08:58 +09:00
Suh
aa73185c51 base.css에 본문 배경 색 추가 2024-01-24 09:58:50 +09:00
Suh
d505f43cfc Merge remote-tracking branch 'origin/master' 2024-01-24 09:58:05 +09:00
Suh
e034c17d24 base.css에 본문 배경 색 추가 2024-01-24 09:57:56 +09:00
김민구
c94cebdd13 입고예정 리스트 검색 기능 추가 2024-01-23 21:30:32 +09:00
sungsu
3329c00019 Merge remote-tracking branch 'origin/master' 2024-01-22 18:11:11 +09:00
sungsu
70a5906299 #update 2024-01-22 18:11:01 +09:00
Kana
ccd2c001b4 change minor issue 2024-01-22 17:06:14 +09:00
Kana
a53c6b9602 in update search 2024-01-22 15:56:51 +09:00
Kana
7d932295b0 in complete 2024-01-22 15:39:36 +09:00
sungsu
4a54ccc293 #수정 2024-01-22 13:14:51 +09:00
sungsu
b06a984f27 #수정
재고량이 수정되어 예약된 출고량보다 낮아지면 즉시 출고 안됨
2024-01-22 13:06:36 +09:00
sungsu
7dbae87749 #수정
stock/create.jsp
StockService.java
StockController.java
2024-01-22 12:10:58 +09:00