Commit Graph

2755 Commits

Author SHA1 Message Date
daa1a8a64e fix:修复区域问题 2024-06-18 18:20:29 +08:00
87dca36386 fix:修复区域问题 2024-06-18 18:19:23 +08:00
bee8457496 opt:只显示存在点位的子卷信息 2024-06-18 17:19:56 +08:00
ceb0bac497 opt:只显示存在点位的子卷信息 2024-06-18 17:17:57 +08:00
1c440c1085 rev:按钮显示 2024-06-18 16:51:54 +08:00
05312a9f8a rev:分支合并 2024-06-18 16:38:41 +08:00
ec5279cf93 Merge commit '9186ce137f2a67a4d8d7bb1cbfcc40cf69729d22' into master_merge 2024-06-18 16:37:40 +08:00
2c208789ce 代码合并 2024-06-18 16:35:05 +08:00
c8e55ca772 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-06-18 16:34:32 +08:00
9186ce137f rev:1.出库六个位置在一个出库单上一起出库的时候 报错:‘仓位不足’
2.出库捆扎的时候要进行判断此规格是否只有一个箱子,如果是直接调用acs接口放行
3.捆扎的时候捆扎位如果有一个相同规格的箱子 要优先放在这个位置上
4.生成转库任务时 需要提前确定巷道的位置
2024-06-18 16:34:21 +08:00
41cf6d7466 opt:只显示存在点位的子卷信息 2024-06-18 16:00:57 +08:00
yanps
39fa9a00da opt: 设备监控页面国际化优化 2024-06-18 15:56:18 +08:00
cf95dc505c fix:发货出库木箱号解析错误导致查不到子卷问题; 2024-06-18 15:33:14 +08:00
e8a2a779b6 add: 终点工作模式校验 2024-06-18 14:30:48 +08:00
148223b01d add: 国际化 2024-06-18 13:55:33 +08:00
5b279f2149 add: 前段参数添加 2024-06-18 13:27:44 +08:00
15a46f0c62 opt:6.18 线上部署测试环境 2024-06-18 12:48:01 +08:00
zhouz
e12a436783 Merge branch 'refs/heads/b_lms' into master_merge 2024-06-18 10:04:49 +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
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