|
|
a4dda6eafd
|
opt:统一把业务id等字段的Long类型改为String类型，避免前端序列号丢失精度。
|
2024-02-28 16:06:16 +08:00 |
|
|
|
1cfbe67d67
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-02-28 16:06:01 +08:00 |
|
|
|
0c08dfa535
|
rev：仓储异常处理
|
2024-02-28 15:55:04 +08:00 |
|
|
|
30e79d3939
|
opt:统一把业务id等字段的Long类型改为String类型，避免前端序列号丢失精度。
|
2024-02-28 13:44:02 +08:00 |
|
|
|
8da9a4fd3c
|
feat: 完善部分分切业务
|
2024-02-27 20:39:47 +08:00 |
|
|
|
89371b1d5b
|
rev：测试修改
|
2024-02-27 19:42:06 +08:00 |
|
|
|
aca9984d3f
|
rev：代码合并
|
2024-02-27 09:12:00 +08:00 |
|
|
|
cfc21279c4
|
rev：木箱木库测试
|
2024-02-27 09:06:59 +08:00 |
|
|
|
42e572a003
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
|
2024-02-26 16:33:08 +08:00 |
|
|
|
2f85b23948
|
fix :lms联调
|
2024-02-26 16:31:33 +08:00 |
|
|
|
b2e2f92202
|
add: 分切业务开发
|
2024-02-26 14:29:48 +08:00 |
|
|
|
ca2dac7816
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
|
2024-02-26 14:24:07 +08:00 |
|
|
|
30d1086938
|
opt:优化业务逻辑
|
2024-02-26 10:17:20 +08:00 |
|
yanps
|
7282a6ef66
|
opt: 设备优化
|
2024-02-23 16:37:01 +08:00 |
|
yanps
|
d4c89bc50f
|
opt: 三色灯回退,OPC连接优化
|
2024-02-23 15:38:33 +08:00 |
|
|
|
2498dea59f
|
rev:代码优化
|
2024-02-23 15:23:39 +08:00 |
|
|
|
621fe7362e
|
add：acstolms 接口
|
2024-02-22 19:11:38 +08:00 |
|
|
|
20d2d77a21
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-02-22 19:05:06 +08:00 |
|
|
|
da3b9e6b78
|
rev:复烤回退
|
2024-02-22 19:04:47 +08:00 |
|
|
|
6c42abffde
|
Merge remote-tracking branch 'origin/master'
|
2024-02-22 17:59:25 +08:00 |
|
|
|
ff04f40bbc
|
fix :测试、对接点位
|
2024-02-22 17:55:13 +08:00 |
|
|
|
64e3d286cc
|
add：出库一键设置
|
2024-02-21 18:35:27 +08:00 |
|
yanps
|
407c8b5152
|
opt: 设备监控
|
2024-02-21 09:56:25 +08:00 |
|
|
|
5b096969a2
|
rev:优化kep信号读取
|
2024-02-21 09:11:29 +08:00 |
|
yanps
|
42a6aa3e4b
|
opt: 一期设备断连优化
|
2024-02-21 08:45:27 +08:00 |
|
|
|
5900712e61
|
Merge remote-tracking branch 'origin/master'
|
2024-02-20 17:17:32 +08:00 |
|
|
|
7c97cb116e
|
add :设备国际化
|
2024-02-20 17:16:58 +08:00 |
|
yanps
|
3021a83d0c
|
opt: 出烘箱,信号断连优化
|
2024-02-20 14:03:10 +08:00 |
|
|
|
d703d4ee29
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-02-20 13:29:56 +08:00 |
|
|
|
9f303916b9
|
rev:超期信息导入
|
2024-02-20 13:29:49 +08:00 |
|
yanps
|
fd08038078
|
add: 信号未连接,在监控显示感叹号
|
2024-02-19 17:00:57 +08:00 |
|
|
|
b6baccc8a9
|
rev：二期发货任务
|
2024-02-19 16:25:04 +08:00 |
|
|
|
1b215a0b93
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-02-19 14:38:06 +08:00 |
|
|
|
7d8a560571
|
rev:复烤、内包间查询优化
|
2024-02-19 14:37:55 +08:00 |
|
|
|
17c1843fea
|
Merge remote-tracking branch 'origin/master'
|
2024-02-19 10:49:03 +08:00 |
|
|
|
e95b1b46cf
|
add: 设备监控国际化
|
2024-02-19 10:48:28 +08:00 |
|
USER-20220102CG\noblelift
|
8cc21065aa
|
rev 解决系统日志失效问题
|
2024-02-18 16:24:50 +08:00 |
|
|
|
b45e089e7f
|
fix：脱机设备监控为红色
|
2024-02-18 15:56:25 +08:00 |
|
|
|
8ff453316b
|
rev：出库调拨单打印 毛重计算错误
|
2024-02-18 14:04:45 +08:00 |
|
|
|
9aed674e23
|
add：发货任务
|
2024-02-18 14:01:55 +08:00 |
|
|
|
b1aa7e47ee
|
Merge remote-tracking branch 'origin/master'
|
2024-02-18 13:41:58 +08:00 |
|
|
|
b038808898
|
add :登入粒子效果
|
2024-02-18 13:41:31 +08:00 |
|
|
|
3de65d80fa
|
rev:优化agv任务下发
|
2024-02-18 13:34:11 +08:00 |
|
|
|
b2a578ffd5
|
add：捆扎任务
|
2024-02-06 18:01:46 +08:00 |
|
yanps
|
160cbd506a
|
opt: 优化
|
2024-02-04 18:00:15 +08:00 |
|
yanps
|
95c0ce68a7
|
fix: 修复系统参数分页问题
|
2024-02-04 15:48:38 +08:00 |
|
yanps
|
74ca7e58ef
|
opt: 优化流量限制功能
|
2024-02-04 14:12:51 +08:00 |
|
|
|
6cf6ee8f06
|
opt:增加点位库存表启用状态过滤查询
|
2024-02-02 17:01:49 +08:00 |
|
|
|
4927838346
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-02-02 16:58:49 +08:00 |
|
|
|
91df60b647
|
opt:增加点位库存表启用状态过滤查询
|
2024-02-02 16:58:33 +08:00 |
|
