root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,226 Commits 1 Branch 0 Tags
1c440c10851639660adb59b7a955c135d5b41b14
Commit Graph

1354 Commits

Author SHA1 Message Date
liuxy
1c440c1085 rev：按钮显示 2024-06-18 16:51:54 +08:00
liuxy
05312a9f8a rev：分支合并 2024-06-18 16:38:41 +08:00
liuxy
ec5279cf93 Merge commit '9186ce137f2a67a4d8d7bb1cbfcc40cf69729d22' into master_merge 2024-06-18 16:37:40 +08:00
liuxy
9186ce137f rev：1.出库六个位置在一个出库单上一起出库的时候 报错：‘仓位不足’ 
2.出库捆扎的时候要进行判断此规格是否只有一个箱子，如果是直接调用acs接口放行
3.捆扎的时候捆扎位如果有一个相同规格的箱子 要优先放在这个位置上
4.生成转库任务时 需要提前确定巷道的位置
 2024-06-18 16:34:21 +08:00
gongbaoxiong
15a46f0c62 opt:6.18 线上部署测试环境 2024-06-18 12:48:01 +08:00
zhouz
e8dec156d5 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-06-18 10:04:19 +08:00
zhouz
212b14008f fix:BUG修改 2024-06-18 10:04:10 +08:00
liuxy
170170d608 fix：出库分配页面打不开bug修改 2024-06-18 08:54:08 +08:00
gongbaoxiong
fd7f0e488b opt:6.15上线装箱区代码修改 2024-06-17 21:26:41 +08:00
zhouz
674685ef15 Merge branch 'refs/heads/b_lms' into master_merge 2024-06-17 13:26:21 +08:00
gongbaoxiong
019022a5a8 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-06-17 13:12:36 +08:00
gongbaoxiong
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
gongbaoxiong
12e72ae6fd opt:6.15上线装箱区代码修改 2024-06-17 11:01:36 +08:00
gongbaoxiong
78fb4e7a5f opt:6.15上线装箱区代码修改 2024-06-15 14:18:28 +08:00
zhouz
6d587388d6 Merge branch 'refs/heads/b_lms' into master_merge 2024-06-14 21:32:20 +08:00
liyongde
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
liyongde
a0b09b8361 feat: getCanMovePointOne 新增校验可用点位 2024-06-14 17:10:17 +08:00
liyongde
4a1269fe45 fix: 查找剩余同组分切计划BUG 2024-06-14 16:29:05 +08:00
gongbaoxiong
aed5b198ba Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-06-14 14:58:23 +08:00
gongbaoxiong
248746de38 opt:6.15上线装箱区代码修改 2024-06-14 14:58:06 +08:00
liuxy
399532c9d2 rev：合并 2024-06-14 14:49:48 +08:00
liuxy
788c6cb905 Merge commit 'd5ea6fad1daf9b38262c57ec69eeb915ad1f06ae' into master_merge 2024-06-14 14:44:45 +08:00
liuxy
a66c01549a rev：代码合并 2024-06-14 14:14:35 +08:00
liuxy
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
liuxy
f4c93965b9 rev：出库任务拆分 2024-06-14 14:13:50 +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
gongbaoxiong
d5513d1075 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-06-13 23:21:31 +08:00
gongbaoxiong
3d8a4a0cae opt:优化待检区到装箱区agv搬运任务 2024-06-13 23:21:09 +08:00
liyongde
81d06decbb fix: 查找相同组气胀轴BUG 2024-06-13 18:19:10 +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
gongbaoxiong
5ed5153bb4 opt:优化现场联调产生的一些问题 2024-06-12 18:49:27 +08:00
liyongde
1aa9a90372 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-06-12 17:02:44 +08:00
liyongde
a7f84ba0e2 fix: 呼叫套轴校验是否可成组合的分切计划，继续套轴 2024-06-12 17:01:45 +08:00
zhouz
cb4117cf73 Merge branch 'refs/heads/b_lms' into master_merge 2024-06-12 13:38:18 +08:00
zhouz
6c5bc123c9 fix:反馈ACS管芯库存 2024-06-12 11:32:20 +08:00
zhouz
ad2879667b fix:反馈ACS管芯库存 2024-06-12 11:24:57 +08:00
liyongde
c2384e73a4 feat: 手持穿拔轴初始化 2024-06-12 10:13:52 +08:00
liyongde
46c641b96b fix: 任务不显示完整气胀轴编码 2024-06-11 14:48:31 +08:00
zhouz
e9f0a3fcad fix:内包间代码逻辑优化 2024-06-11 10:08:32 +08:00
zhouz
506dcbe372 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-06-11 09:53:29 +08:00
zhouz
774fb2baa2 fix:内包间代码逻辑优化 2024-06-11 09:53:22 +08:00