智慧实验室优化版本
parent: b02535 | patch | commitdiff
gdg
2021-01-18 3ec412f3cdc8b114cf629e866a7b7b80687a3442
refs
author gdg <764716047@qq.com>
Monday, January 18, 2021 10:09 +0800
committer gdg <764716047@qq.com>
Monday, January 18, 2021 10:09 +0800
commit3ec412f3cdc8b114cf629e866a7b7b80687a3442
tree c91ff4087a60abde3559d6ae33b66f6fbbaf84ac tree | zip | gz
parent b02535c9a99324823812f6c2d08f066d8e1ba75f view | diff
12714c71c7737e21c3268b44a39f8f02befc5cb5 view | diff 
Merge remote-tracking branch 'remotes/origin/yufei' into master

# Conflicts:
#	src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
#	src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
#	src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
#	src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
#	src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java
#	src/main/webapp/warehouse_stock_mng.xhtml
26 files modified
1 files added
1048 ■■■■■ changed files
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java 290 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml 37 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml 21 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java 1 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java 52 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/entity/OpeReagentStatus.java 18 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java 19 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/exception/ExceptionEnumCode.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeApplyService.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java 69 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeOrderService.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeOrderServiceImpl.java 11 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java 134 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java 25 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/util/Constants.java 1 ●●●●● diff | view | raw | blame | history
src/main/webapp/WEB-INF/spring-menu.xml 9 ●●●●● diff | view | raw | blame | history
src/main/webapp/order_input_warehouse.xhtml 202 ●●●●● diff | view | raw | blame | history
src/main/webapp/resources/css/default.css 5 ●●●●● diff | view | raw | blame | history
src/main/webapp/warehouse_stock_mng.xhtml 103 ●●●●● diff | view | raw | blame | history