Commit Graph

128 Commits

Author SHA1 Message Date
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 8f37779890 Add files via upload 2024-01-16 00:13:56 +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 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
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 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
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 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 e122d54b53 카테고리 리스트, 상세화면, 수정화면 및 기능 추가 2024-01-08 18:39:44 +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
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
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
Suh eff8e72d45 #tiles 이슈
스프링 부트 버전 2.x으로 내려감
스프링 버전 5.x으로 내려감

화면 개발을 위한
layout_dev.html
layout_dev_base.html 등등 추가
2024-01-05 10:10:56 +09:00
Kana 436adb7ec7 change Categorys 2024-01-05 09:44:25 +09:00