ZHOUZ\Noble'lift 22f61db5f5 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ...

# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java

2023-11-24 16:35:13 +08:00

..

common

1

2023-02-09 15:00:24 +08:00

config

add:es线上配置

2023-02-13 10:20:41 +08:00

modules

dev:报表优化、入库加并发锁

2023-10-23 17:50:13 +08:00

start

add：新增海亮二期仓库入库

2023-10-13 16:18:05 +08:00

system

rev:新增设备状态监控功能；修改点位查询和批量修改；任务下方ACSAGV参数修改；烘箱温度和时间用redis进行存储和查询；

2023-08-14 18:05:12 +08:00

wms

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

2023-11-24 16:35:13 +08:00

AppRun.java

代码更新

2023-04-21 17:38:20 +08:00

ElasticSearchTest.java

add:es

2023-02-09 13:07:57 +08:00

ss.wql

add: 新增立库监控前后端

2023-04-13 10:28:43 +08:00

ssosql-1228.sql

mdf:sys_dict sql

2023-01-04 11:48:39 +08:00