|
|
7bb3955a40
|
主分支合并
|
2024-06-21 10:32:26 +08:00 |
|
|
|
413f876247
|
Merge branch 'master' into master_merge
|
2024-06-21 10:30:00 +08:00 |
|
|
|
c6214fa0fa
|
分支合并
|
2024-06-21 10:25:34 +08:00 |
|
|
|
b8620f0973
|
Merge branch 'b_lms' into master_merge
|
2024-06-21 10:24:13 +08:00 |
|
|
|
cbfec25a9f
|
rev：发货区修改
|
2024-06-21 10:23:38 +08:00 |
|
|
|
43baf68a46
|
rev： 改切出库修改
|
2024-06-21 10:04:42 +08:00 |
|
yanps
|
be809d4132
|
opt:烘箱监控页面优化
|
2024-06-21 09:48:28 +08:00 |
|
yanps
|
0be3799d6d
|
opt: 国际化,页面优化
|
2024-06-21 09:45:04 +08:00 |
|
|
|
769d08d77b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
|
2024-06-21 09:05:59 +08:00 |
|
|
|
c7dd36d940
|
fix: 叉车二次分配
|
2024-06-21 08:56:49 +08:00 |
|
|
|
cdd51816fc
|
rev:优化拔前行架任务下发以及手动创建指令
|
2024-06-20 20:01:27 +08:00 |
|
|
|
06e7f163e2
|
Merge remote-tracking branch 'origin/master'
|
2024-06-20 18:36:36 +08:00 |
|
|
|
542ad5c293
|
fix: 26
|
2024-06-20 18:35:59 +08:00 |
|
|
|
1ae9b12cdc
|
Merge branch 'master' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
|
2024-06-20 17:16:42 +08:00 |
|
|
|
ee7a406d81
|
add：1.新增木箱称重校验功能2.输送任务反馈执行中更新木箱毛重
|
2024-06-20 17:07:40 +08:00 |
|
|
|
a6be1338da
|
Merge branch 'b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java
|
2024-06-20 11:00:39 +08:00 |
|
|
|
d04e626131
|
rev:发货区修改
|
2024-06-20 10:57:11 +08:00 |
|
|
|
5ce8b8a022
|
分支合并
|
2024-06-20 09:41:01 +08:00 |
|
|
|
de4d79e4a7
|
Merge branch 'b_lms' into master_merge
|
2024-06-20 09:40:21 +08:00 |
|
|
|
3c2da9058f
|
rev：发货任务二次分配修改
|
2024-06-20 09:39:22 +08:00 |
|
yanps
|
9a6afe1c2f
|
opt: 输送机称重驱动优化
|
2024-06-19 17:10:20 +08:00 |
|
yanps
|
8037d14a47
|
opt: 立库输送机写入信号判断优化,添加输送机称重驱动
|
2024-06-19 15:44:50 +08:00 |
|
|
|
e4e4dd6fa3
|
rev：分支合并
|
2024-06-19 15:02:15 +08:00 |
|
|
|
807a0af359
|
Merge branch 'b_lms' into master_merge
|
2024-06-19 15:01:02 +08:00 |
|
|
|
5bb695619e
|
rev：发货区修改
|
2024-06-19 14:59:15 +08:00 |
|
|
|
dc356bf29e
|
Merge remote-tracking branch 'origin/master'
|
2024-06-19 10:54:34 +08:00 |
|
|
|
2724907920
|
fix: 报错信息显示
|
2024-06-19 10:54:14 +08:00 |
|
|
|
bdadb9d622
|
rev:优化取消指令逻辑，拔前行架添加安全信号交互以及页面优化
|
2024-06-19 09:13:30 +08:00 |
|
|
|
810e8bb510
|
add:增加子卷质检接口
|
2024-06-18 20:53:13 +08:00 |
|
|
|
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
|
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 |
|
|
|
170170d608
|
fix：出库分配页面打不开bug修改
|
2024-06-18 08:54:08 +08:00 |
|
|
|
fd7f0e488b
|
opt:6.15上线装箱区代码修改
|
2024-06-17 21:26:41 +08:00 |
|
