|
|
bba3cdc35b
|
rev: i18n位置挪动
|
2024-05-29 09:09:47 +08:00 |
|
ludj
|
9736ad6807
|
rev:删除多余图片
|
2024-05-29 08:45:46 +08:00 |
|
|
|
bcb6d51f2f
|
Merge remote-tracking branch 'origin/admin' into lms_v1.0.0
|
2024-05-28 17:17:55 +08:00 |
|
ludj
|
df89d088a3
|
代码格式调整
|
2024-05-28 16:31:14 +08:00 |
|
|
|
157aea57b1
|
Merge remote-tracking branch 'origin/admin' into lms_v1.0.0
|
2024-05-28 16:04:13 +08:00 |
|
ludj
|
8bf43d5cc7
|
前端样式修改
|
2024-05-28 16:02:04 +08:00 |
|
ludj
|
e388b3debe
|
前端样式修改
|
2024-05-28 15:56:00 +08:00 |
|
ludj
|
2ffd105ac0
|
新建测试
|
2024-05-28 15:48:39 +08:00 |
|
|
|
349ed3c90d
|
test: 测试
|
2024-05-28 15:40:53 +08:00 |
|
zhouz
|
20bc00c0ca
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-28 09:26:47 +08:00 |
|
zhouz
|
5939a0e520
|
fix:出入库流程修改
|
2024-05-28 09:26:40 +08:00 |
|
yanps
|
a50c10c032
|
opt: AGV偏移功能优化
|
2024-05-27 19:43:14 +08:00 |
|
|
|
01bf0d484b
|
opt:修改查询木箱信息
|
2024-05-27 16:11:32 +08:00 |
|
|
|
c22c382bdf
|
refactor: nladmin-lms init
|
2024-05-27 15:38:56 +08:00 |
|
|
|
1179a5f154
|
fix: logback-spring.xml配置dev
|
2024-05-27 14:31:50 +08:00 |
|
|
|
f5e6db390a
|
refactor: 前后端基础部分
|
2024-05-27 14:15:48 +08:00 |
|
|
|
0636d1170d
|
rev：向txt文件中新增字段
|
2024-05-27 13:55:12 +08:00 |
|
|
|
bd090a67af
|
add：子卷包装关系增加字段
|
2024-05-27 11:10:37 +08:00 |
|
|
|
2f446cb2cd
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-05-27 11:05:48 +08:00 |
|
|
|
057e09e545
|
fix:新增包装关系字段
|
2024-05-27 11:05:39 +08:00 |
|
|
|
6ebf142c23
|
add:新增定时清理设备故障表任务
|
2024-05-27 10:58:53 +08:00 |
|
管理员
|
f23e4548cd
|
Initial commit
|
2024-05-27 09:48:12 +08:00 |
|
|
|
7abf41f2f4
|
fix: 出库联调修改
|
2024-05-27 09:32:02 +08:00 |
|
zhouz
|
3b4576ef12
|
fix:空木箱入库、退货入库将木箱和托盘进行绑定
|
2024-05-26 11:14:44 +08:00 |
|
|
|
67120342ac
|
Merge remote-tracking branch 'origin/master'
|
2024-05-25 17:38:20 +08:00 |
|
zhouz
|
b3b82e2352
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-25 15:49:31 +08:00 |
|
zhouz
|
a44c225026
|
fix:出库任务给托盘类型
|
2024-05-25 15:49:27 +08:00 |
|
|
|
38e3302e40
|
opt:修改退货入库逻辑
|
2024-05-25 15:47:06 +08:00 |
|
|
|
b205002324
|
add:新增lucence日志清理
|
2024-05-24 17:48:11 +08:00 |
|
zhouz
|
b284be33ea
|
fix:入库优化
|
2024-05-24 15:31:02 +08:00 |
|
zhouz
|
dc785a42eb
|
fix:下发任务给高度类型
|
2024-05-24 13:50:13 +08:00 |
|
|
|
b8891aabf4
|
fix: 限高，kep报错等修改
|
2024-05-23 19:45:46 +08:00 |
|
zhouz
|
28b990e002
|
fix:获取木箱高度类型修改
|
2024-05-23 17:30:19 +08:00 |
|
zhouz
|
192bdb52cb
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java
|
2024-05-23 17:25:13 +08:00 |
|
zhouz
|
d1731ab7f3
|
fix:MES接口相关修改
|
2024-05-23 17:21:19 +08:00 |
|
|
|
ff125b673e
|
feat: 增加存储acs反馈的子卷重量,修复了已知的问题
|
2024-05-23 15:02:16 +08:00 |
|
|
|
16cb0f8da4
|
opt: 子卷判断是送到废品还是成品称重的优化
|
2024-05-23 10:10:10 +08:00 |
|
yanps
|
c19dbfe11d
|
opt: 货位地址,rgv监控,创建指令优化
|
2024-05-22 17:33:39 +08:00 |
|
|
|
6a4dfd1f22
|
add：分拣出库
|
2024-05-22 17:16:05 +08:00 |
|
|
|
4a69020b76
|
rev:优化指令取消逻辑
|
2024-05-22 16:48:44 +08:00 |
|
zhouz
|
8e5fcb1006
|
fix:高度校验
|
2024-05-22 16:09:52 +08:00 |
|
zhouz
|
fbf5640d2d
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-22 11:23:36 +08:00 |
|
zhouz
|
c9a45ea457
|
fix：位置校验
|
2024-05-22 11:23:32 +08:00 |
|
yanps
|
fa4a85ebcc
|
add: agv偏移功能
|
2024-05-21 18:38:01 +08:00 |
|
|
|
ffc2323379
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-05-21 15:07:53 +08:00 |
|
|
|
a854cb2ecc
|
fix: 气胀轴送暂存区代数校验错误
|
2024-05-21 15:07:24 +08:00 |
|
zhouz
|
46541d0c50
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-21 14:53:55 +08:00 |
|
zhouz
|
8664d7943f
|
fix:异常任务相关处理
|
2024-05-21 14:53:49 +08:00 |
|
|
|
a57a696a9b
|
Merge remote-tracking branch 'origin/master'
|
2024-05-21 13:42:35 +08:00 |
|
|
|
78242a58e0
|
fix: 堆垛机联调修改
|
2024-05-21 13:41:10 +08:00 |
|
