Commit Graph

2269 Commits

Author SHA1 Message Date
3282f15af7 add: 输送机申请贴标demo 2024-05-13 11:10:46 +08:00
4e3dc384af fix: 托盘类型不对,直接去扫码位托盘入库代码开发 2024-05-13 10:07:27 +08:00
zhouz
30ad6db6ac Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-13 09:35:08 +08:00
zhouz
6c4170cd59 rev;木箱入库修改 2024-05-13 09:35:01 +08:00
6831a82a5a opt:空木箱入库增加层数 2024-05-12 16:43:16 +08:00
a6b9e54572 opt:空木箱入库增加层数 2024-05-12 15:26:32 +08:00
zhouz
a296a4845d rev:空木箱入库修改 2024-05-12 15:12:49 +08:00
zhouz
095809680d Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-12 15:12:04 +08:00
zhouz
28059f4269 rev:空木箱入库修改 2024-05-12 15:12:00 +08:00
fde40a795a fix: 任务暂停修复 2024-05-12 11:25:09 +08:00
3e0eb7fd54 fix: 申请成功后下发命令、堆垛机报警重试 2024-05-12 09:48:37 +08:00
2939259652 Merge remote-tracking branch 'origin/master' 2024-05-12 09:42:37 +08:00
7f1b8b8e29 fix: 申请成功后下发命令、堆垛机报警重试 2024-05-12 09:41:58 +08:00
9eea3bb5ea opt:空木箱入库增加层数 2024-05-11 22:23:02 +08:00
4667761c9c Merge remote-tracking branch 'origin/b_lms' into b_lms
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java
#	lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
2024-05-11 22:12:54 +08:00
34def7f32a opt:空木箱入库增加层数 2024-05-11 22:09:26 +08:00
yanps
b6dd29b4b7 add: 添加任务类型显示查询 2024-05-11 20:27:02 +08:00
fd86281afe rev:修改空托盘出库任务类 2024-05-11 17:27:00 +08:00
yanps
fb8cf98363 opt: 日志文件大小调整 2024-05-11 17:23:20 +08:00
9d752f91ea rev:图标优化 2024-05-11 17:16:54 +08:00
94f09d2397 rev: 空托盘入库托盘类型,仓位顺序,前端页面优化 2024-05-11 17:13:43 +08:00
yanps
37ad133cfe add: 增加日志级别 2024-05-11 15:56:55 +08:00
0c0eda5d8e fix: 二期内包间送子卷请求 2024-05-11 14:20:42 +08:00
1203688b92 add:手持空托盘入库 2024-05-11 13:13:47 +08:00
52b4c905f7 rev:二期任务类型 2024-05-11 12:32:45 +08:00
yanps
5b41adbf67 add: 增加打印日志级别校验,添加测距站点 2024-05-11 11:16:48 +08:00
zhouz
034907e722 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-11 09:25:17 +08:00
zhouz
e79f50f09b rev:空木箱入库给ACS木箱信息字段 2024-05-11 09:25:11 +08:00
45d609fb33 fix: 字段修改 2024-05-11 09:02:16 +08:00
10dcb6f9a5 Merge remote-tracking branch 'origin/master' 2024-05-10 19:20:07 +08:00
d83f7c450b fix: 禁止出入库任务、暂停任务 2024-05-10 19:19:15 +08:00
f9667ee9a1 fix:优化前端页面以及修复点位管理功能bug 2024-05-10 17:51:15 +08:00
a07df96854 opt:处理代码冲突 2024-05-10 14:19:13 +08:00
yanps
9e45690cd0 opt: 添加堆垛机下发信号日志 2024-05-10 10:56:16 +08:00
zhouz
ce168c147b Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-09 20:02:00 +08:00
zhouz
d03c915e92 dev:新增备货区代码 2024-05-09 20:01:54 +08:00
yanps
04fb44f67d opt: 设备xy坐标不记录日志 2024-05-09 19:12:35 +08:00
yanps
b0f9b1c038 opt: 拔轴机优化 2024-05-09 19:07:36 +08:00
dee0cf57ae fix: 纸管信息设置到点位上 2024-05-09 17:00:10 +08:00
de4ef00659 rev:手持入库仓位数限制 2024-05-09 11:17:15 +08:00
9f5baffd40 rev:设备监控页面优化 2024-05-09 10:54:19 +08:00
bd2bc9ba99 Merge remote-tracking branch 'origin/master' 2024-05-08 17:22:28 +08:00
b36299dd56 fix: 堆垛机异常情况取消 2024-05-08 17:16:58 +08:00
f35d96317c Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-05-08 17:05:51 +08:00
a60a4229ff rev:新增登录次数限制,密码正则表达式校验,发货区AGV任务生成添加开关 2024-05-08 17:05:39 +08:00
yanps
9c3d8f3322 opt: 贴标增加字段 2024-05-08 15:13:22 +08:00
1877e6a1f2 add:仓位初始化 2024-05-08 10:10:32 +08:00
yanps
40ae72314a opt: 设备报警字典表 2024-05-08 08:54:42 +08:00
5d88fe734d fix: 堆垛机异常情况开发 2024-05-07 14:55:37 +08:00
9ff24e0095 fix: 堆垛机异常情况开发 2024-05-07 14:20:30 +08:00