Commit Graph

114 Commits

Author SHA1 Message Date
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
sungsuhub
8e38a3f520 Update StockMapper.xml 2024-01-24 11:18:21 +09:00
Kana
cb0eac897e change mainpage 2024-01-24 10:30:46 +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
70a5906299 #update 2024-01-22 18:11:01 +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
e2f8967403 #수정
StockMapper.java
StockService.java
StockController.java
StockMapper.xml
2024-01-22 11:02:49 +09:00
sungsu
ba94f72e5e #수정
stock/create.jsp
StockController.java
StockMapper.xml
2024-01-22 10:26:52 +09:00
sungsu
fbc2470c98 #수정
stock/create.jsp
stock/list.jsp
stock/read.jsp
stock/update.jsp
WarehouseController.java
WarehouseMapper.xml
2024-01-22 10:11:38 +09:00
sungsu
75e2cbaade #수정
stock/create.jsp
stock/list.jsp
stock/read.jsp
stock/update.jsp
WarehouseController.java
WarehouseMapper.xml
2024-01-22 10:11:07 +09:00
sungsu
c4776ac8a2 #update 2024-01-21 23:25:34 +09:00
Suh
04392168ba planin url 관련 버그 수정 2024-01-19 22:14:52 +09:00
Kana
6641e4ac9b 입고 전체적으로 수정 2024-01-19 18:39:29 +09:00
sungsu
721d76a097 Merge remote-tracking branch 'origin/master' 2024-01-19 18:25:35 +09:00
sungsu
7a24bd48eb #수정
stock/create.jsp
stock/list.jsp
stock/read.jsp
stock/update.jsp
WarehouseController.java
WarehouseMapper.xml
2024-01-19 18:25:14 +09:00
Suh
8a81165f2a Merge remote-tracking branch 'origin/master' 2024-01-19 18:16:08 +09:00
Suh
7aed18a27c planin 작업 완료 2024-01-19 18:15:59 +09:00
sungsu
c09b676be6 #수정
stock/create.jsp
stock/list.jsp
stock/read.jsp
stock/update.jsp
WarehouseController.java
WarehouseMapper.xml
2024-01-19 16:29:47 +09:00
Kana
54d3b16003 제품 모달 업데이트 가격 입고 생성 jsp업데이트 입고 컨트롤러 매퍼 리스트 업데이트 2024-01-19 12:57:00 +09:00
sungsu
3ec4a46b97 Merge remote-tracking branch 'origin/master' 2024-01-19 09:54:41 +09:00
sungsu
98de984f58 #update 2024-01-19 09:54:32 +09:00
Kana
7dd68da7d2 change list Date value and add In Controller,Dto, mapper, mapper.xml,
service, views and change minor details
2024-01-18 18:33:32 +09:00
Suh
0cd70e4137 planin 작업중 2024-01-18 18:23:22 +09:00
sungsu
dabcd74cb6 #update 2024-01-18 17:29:35 +09:00
김민구
8490d7936e 입고 예정 추가 구현중 2024-01-18 15:32:01 +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
Suh
2a63f0dfc8 plainin list와 read기본 2024-01-17 17:42:17 +09:00
Suh
feab8f173c auth aspect 2024-01-17 17:09:10 +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
Suh
2eb2901473 planinMapper 추가 2024-01-17 15:54:35 +09:00
Suh
4b2ad1bc90 Merge remote-tracking branch 'origin/master' 2024-01-17 15:50:22 +09:00
Suh
8475b3a408 planinMapper 추가 2024-01-17 15:50:12 +09:00
Kana
711bc207cd 마이페이지 프로필사진 수정기능 완료 2024-01-17 13:39:44 +09:00
Suh
d51668f3ec ResetPassword 관련 추가 2024-01-17 10:25:14 +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