Commit Graph

2736 Commits

Author SHA1 Message Date
zhouz
212b14008f fix:BUG修改 2024-06-18 10:04:10 +08:00
zhouz
57defd4e0d fix:BUG修改 2024-06-18 10:03:24 +08:00
170170d608 fix:出库分配页面打不开bug修改 2024-06-18 08:54:08 +08:00
fd7f0e488b opt:6.15上线装箱区代码修改 2024-06-17 21:26:41 +08:00
b8f59035dc Merge remote-tracking branch 'origin/master' 2024-06-17 19:15:03 +08:00
9b6291f146 fix: 扫描补码、仙宫货叉调整 2024-06-17 19:14:29 +08:00
61d28d7138 rev:库存报表入库时间更新 2024-06-17 15:38:33 +08:00
zhouz
674685ef15 Merge branch 'refs/heads/b_lms' into master_merge 2024-06-17 13:26:21 +08:00
019022a5a8 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-06-17 13:12:36 +08:00
d3f33a12d1 opt:6.15上线装箱区代码修改 2024-06-17 13:12:24 +08:00
zhouz
02fe21fb47 Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge 2024-06-17 11:06:27 +08:00
zhouz
0d4f004798 Merge branch 'refs/heads/b_lms' into master_merge 2024-06-17 11:05:00 +08:00
zhouz
8d1b82e3f9 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-06-17 11:04:35 +08:00
zhouz
12bded91fb fix:立库代码更新 2024-06-17 11:04:31 +08:00
12e72ae6fd opt:6.15上线装箱区代码修改 2024-06-17 11:01:36 +08:00
8d71dad251 rev:打印米数保留2位小数 2024-06-15 21:23:09 +08:00
41fea50b24 Merge remote-tracking branch 'origin/master' 2024-06-15 15:10:09 +08:00
01a0ebfb4e add: 诺宝agv、诺宝叉车调试开发 2024-06-15 15:09:22 +08:00
78fb4e7a5f opt:6.15上线装箱区代码修改 2024-06-15 14:18:28 +08:00
72cfb31714 add:新增交互字段显示 2024-06-15 13:36:06 +08:00
zhouz
6d587388d6 Merge branch 'refs/heads/b_lms' into master_merge 2024-06-14 21:32:20 +08:00
f4db63c3fe fix: 无法登录 2024-06-14 21:29:10 +08:00
zhouz
b4e5ce473d Merge branch 'refs/heads/b_lms' into master_merge 2024-06-14 19:50:38 +08:00
549e9650cb fix:优化现场联调出现的问题以及添加日志 2024-06-14 18:31:18 +08:00
13cdba9ea1 rev:库存报表新增接头数 2024-06-14 17:29:30 +08:00
a0b09b8361 feat: getCanMovePointOne 新增校验可用点位 2024-06-14 17:10:17 +08:00
4a1269fe45 fix: 查找剩余同组分切计划BUG 2024-06-14 16:29:05 +08:00
aed5b198ba Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-06-14 14:58:23 +08:00
248746de38 opt:6.15上线装箱区代码修改 2024-06-14 14:58:06 +08:00
399532c9d2 rev:合并 2024-06-14 14:49:48 +08:00
788c6cb905 Merge commit 'd5ea6fad1daf9b38262c57ec69eeb915ad1f06ae' into master_merge 2024-06-14 14:44:45 +08:00
a66c01549a rev:代码合并 2024-06-14 14:14:35 +08:00
d5ea6fad1d Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-06-14 14:13:58 +08:00
f4c93965b9 rev:出库任务拆分 2024-06-14 14:13:50 +08:00
b035da2cca fix:修复设备监控页面报错问题 2024-06-14 09:37:38 +08:00
zhouz
4c2f358adb Merge branch 'refs/heads/b_lms' into master_merge 2024-06-14 09:10:34 +08:00
zhouz
14bba1617f Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-06-14 09:09:54 +08:00
zhouz
12a59a083c fix:内包间代码优化 2024-06-14 09:09:23 +08:00
zhouz
ecb78f88be Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge 2024-06-14 09:07:38 +08:00
zhouz
c40db4deb1 fix:内包间代码优化 2024-06-14 09:07:00 +08:00
d5513d1075 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-06-13 23:21:31 +08:00
3d8a4a0cae opt:优化待检区到装箱区agv搬运任务 2024-06-13 23:21:09 +08:00
81d06decbb fix: 查找相同组气胀轴BUG 2024-06-13 18:19:10 +08:00
wangsong
62bf1f9ef4 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-06-13 14:29:40 +08:00
wangsong
5f6e0f61b5 add 2024-06-13 14:29:00 +08:00
f299f1c7d5 opt:优化现场联调产生的问题 2024-06-13 13:29:49 +08:00
7742b23a55 Merge pull request 'b_lms' (#2) from b_lms into master_merge
Reviewed-on: http://121.40.234.130:8899/root/lanzhouhailiang_one/pulls/2
2024-06-12 18:57:32 +08:00
5ed5153bb4 opt:优化现场联调产生的一些问题 2024-06-12 18:49:27 +08:00
1aa9a90372 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-06-12 17:02:44 +08:00
a7f84ba0e2 fix: 呼叫套轴校验是否可成组合的分切计划,继续套轴 2024-06-12 17:01:45 +08:00