Commit Graph

234 Commits

Author SHA1 Message Date
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
Kana
18098d6e8a change products 2024-01-10 11:48:34 +09:00
Suh
87f7bd89ea Merge remote-tracking branch 'origin/master' 2024-01-10 00:07:18 +09:00
Suh
c506ab3489 authority group 부분 crud 기능 추가 2024-01-10 00:07:07 +09:00
sungsu
26e538fc06 #update
stock/list.jps
WarehouseController.java
WarehouseMapper.xml

#insert
warehouse/read.jsp
2024-01-09 20:31:51 +09:00
Kana
ae2ac39d94 change products 2024-01-09 18:36:39 +09:00
Kana
48cc35431a change category create.jsp To prevent the use of minus KAN code. 2024-01-09 18:36:13 +09:00
Kana
8d6174c39e add product dto, mapper, mapper.xml, controller, service,
product.list.jsp, vendorDto, change category controller, mapper.xml,
read.jsp
2024-01-09 17:21:15 +09:00
sungsu
cd726d6c42 #update
stock/list.jsp
WarehouseController.java
WarehouseMapper.xml
WarehouseService.java
WarehouseMapper.java
2024-01-09 16:35:38 +09:00
Suh
b82403d064 mybatis join 관련한 기능 추가 2024-01-09 13:08:26 +09:00
Suh
97d48eaf95 AccountDto 및 기타 dto 추가 2024-01-09 12:27:09 +09:00
Suh
607ae2152e base_in파일 추가 2024-01-09 12:05:43 +09:00
sungsu
1fb6fbefe2 #update
stock/create.jsp
stock/list.jsp
WarehouseController.java
WarehouseMapper.xml
WarehouseService.java

#insert
warehouse/create.jsp
warehouse/list.jsp
2024-01-09 00:47:19 +09:00
sungsu
1065d132f7 #update
StockController.java
2024-01-08 19:46:12 +09:00
sungsu
cb776d2727 #update
StockMapper.xml
2024-01-08 19:43:25 +09:00
sungsu
532b8e76b1 Merge remote-tracking branch 'origin/master' 2024-01-08 18:47:19 +09:00
sungsu
b6e967975b #수정
stock.list.jsp
StockMapper.xml

#추가
stock.create.jsp
WarehouseController.java
WarehouseDto.java
WarehouseMapper.java
WarehouseMapper.xml
WarehouseService.java
2024-01-08 18:46:09 +09:00
Kana
e786f0d8fb update categorys 09 2024-01-08 18:44:17 +09:00
Kana
fc90877136 Merge branch 'master' of https://github.com/suhf/No1WMS.git 2024-01-08 18:43:39 +09:00
Kana
b00c642afe update Categorys 08 2024-01-08 18:42:42 +09:00
Kana
e122d54b53 카테고리 리스트, 상세화면, 수정화면 및 기능 추가 2024-01-08 18:39:44 +09:00
Suh
2706c902c1 authority_list_dev.html 검색 창 전환기능 추가 2024-01-08 12:34:51 +09:00
Suh
ef0437456d bootstrap 설명을 위한 html 추가
layout_dev_bootstrap.html
2024-01-08 12:19:25 +09:00
Suh
be90a79c64 탭 및 검색 관련 html base 2024-01-08 11:49:25 +09:00
Suh
c836927425 Merge remote-tracking branch 'origin/master' 2024-01-08 09:59:32 +09:00
Suh
745bf9145b 탭 관련 html 추가
layout_dev_tabs.html
2024-01-08 09:59:20 +09:00
sungsu
84121ada9c #update
StockController.java
StockMapper.java
StockMapper.xml
StockService.java
stock.list.jsp
2024-01-08 01:27:09 +09:00
Suh
e256672486 stock 쪽 해결 2024-01-05 21:23:18 +09:00
Suh
43f25ea471 category create.jsp 변경 2024-01-05 19:45:00 +09:00
Suh
426d5b6bda Merge branch 'master' of https://github.com/suhf/No1WMS 2024-01-05 18:56:09 +09:00
Kana
4aacad84c8 change3 2024-01-05 18:41:02 +09:00
Kana
0568800b80 Merge branch 'master' of https://github.com/suhf/No1WMS.git 2024-01-05 18:38:02 +09:00
Kana
69c640ee4f change categorys2 2024-01-05 18:37:00 +09:00
Kana
9706c8e1c9 카테고리 수정 및 카테고리 jsp수정 2024-01-05 18:34:39 +09:00
1457rk
5597aea8a9 Update CategoryController.java 2024-01-05 18:33:53 +09:00
Kana
a5392ac111 update Category 2024-01-05 16:28:04 +09:00
sungsu
f34cccef35 #update
StockController.java
StockDto.java
StockMapper.xml
StockMapper.java
StockService.java
2024-01-05 15:11:31 +09:00
sungsu
e8962a3f5e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/resources/mappers/StockMapper.xml
2024-01-05 12:47:39 +09:00
sungsu
154873c024 #update
StockController.java
StockDto.java
StockMapper.xml
StockMapper.java
StockService.java
2024-01-05 12:46:25 +09:00
Suh
4c0b788210 css 에 % width 속성 추가 2024-01-05 12:45:04 +09:00
Suh
0c9d5d59ca css 에 % width 속성 추가 2024-01-05 12:42:30 +09:00
Suh
e40ac9a3f1 Merge remote-tracking branch 'origin/master' 2024-01-05 12:20:45 +09:00
Suh
816350dc45 현재 버전에 맞게 jstl 수정 2024-01-05 12:20:36 +09:00
Kana
aa91824f07 change HttpServletResponse and change Category jsp 2024-01-05 12:09:50 +09:00
Suh
511a927e33 #mybatis 관련 설정 변경
dto의 uuid를 그냥 string으로
2024-01-05 11:45:53 +09:00
Suh
4262262a0b Merge remote-tracking branch 'origin/master' 2024-01-05 10:11:11 +09:00