|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
807a0af359
|
Merge branch 'b_lms' into master_merge
|
2024-06-19 15:01:02 +08:00 |
|
|
|
810e8bb510
|
add:增加子卷质检接口
|
2024-06-18 20:53:13 +08:00 |
|
|
|
daa1a8a64e
|
fix:修复区域问题
|
2024-06-18 18:20:29 +08:00 |
|
|
|
ceb0bac497
|
opt:只显示存在点位的子卷信息
|
2024-06-18 17:17:57 +08:00 |
|
|
|
ec5279cf93
|
Merge commit '9186ce137f2a67a4d8d7bb1cbfcc40cf69729d22' into master_merge
|
2024-06-18 16:37:40 +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 |
|
|
|
fd7f0e488b
|
opt:6.15上线装箱区代码修改
|
2024-06-17 21:26:41 +08:00 |
|
|
|
61d28d7138
|
rev：库存报表入库时间更新
|
2024-06-17 15:38:33 +08:00 |
|
zhouz
|
0d4f004798
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-06-17 11:05:00 +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 |
|
|
|
78fb4e7a5f
|
opt:6.15上线装箱区代码修改
|
2024-06-15 14:18:28 +08:00 |
|
zhouz
|
b4e5ce473d
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-06-14 19:50:38 +08:00 |
|
|
|
13cdba9ea1
|
rev：库存报表新增接头数
|
2024-06-14 17:29:30 +08:00 |
|
|
|
248746de38
|
opt:6.15上线装箱区代码修改
|
2024-06-14 14:58:06 +08:00 |
|
zhouz
|
4c2f358adb
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-06-14 09:10:34 +08:00 |
|
|
|
3d8a4a0cae
|
opt:优化待检区到装箱区agv搬运任务
|
2024-06-13 23:21:09 +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 |
|
zhouz
|
6c5bc123c9
|
fix:反馈ACS管芯库存
|
2024-06-12 11:32:20 +08:00 |
|
zhouz
|
ad2879667b
|
fix:反馈ACS管芯库存
|
2024-06-12 11:24:57 +08:00 |
|
zhangzq
|
91e0ce0752
|
merge:冲突处理
|
2024-06-07 16:59:20 +08:00 |
|
zhangzq
|
c33ffe440b
|
Merge branch 'master' into b_lms2
|
2024-06-07 16:21:32 +08:00 |
|
|
|
0fbc830b00
|
rev：字段修改
|
2024-06-06 15:54:46 +08:00 |
|
|
|
9aba17fd13
|
rev：成品报废审核增加接口报错信息
|
2024-06-06 09:35:53 +08:00 |
|
|
|
94f17e8464
|
rev：报废回传修改
|
2024-06-05 15:24:15 +08:00 |
|
zhouz
|
ce3324a8af
|
fix;表处代码修改
|
2024-06-04 10:37:35 +08:00 |
|
zhouz
|
5939a0e520
|
fix:出入库流程修改
|
2024-05-28 09:26:40 +08:00 |
|
|
|
0636d1170d
|
rev：向txt文件中新增字段
|
2024-05-27 13:55:12 +08:00 |
|
|
|
bd090a67af
|
add：子卷包装关系增加字段
|
2024-05-27 11:10:37 +08:00 |
|
|
|
2f446cb2cd
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-05-27 11:05:48 +08:00 |
|
|
|
057e09e545
|
fix:新增包装关系字段
|
2024-05-27 11:05:39 +08:00 |
|
|
|
38e3302e40
|
opt:修改退货入库逻辑
|
2024-05-25 15:47:06 +08:00 |
|
zhouz
|
28b990e002
|
fix:获取木箱高度类型修改
|
2024-05-23 17:30:19 +08:00 |
|
zhouz
|
d1731ab7f3
|
fix:MES接口相关修改
|
2024-05-23 17:21:19 +08:00 |
|
|
|
6a4dfd1f22
|
add：分拣出库
|
2024-05-22 17:16:05 +08:00 |
|
zhouz
|
8e5fcb1006
|
fix:高度校验
|
2024-05-22 16:09:52 +08:00 |
|
zhouz
|
c9a45ea457
|
fix：位置校验
|
2024-05-22 11:23:32 +08:00 |
|
zhouz
|
46541d0c50
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-21 14:53:55 +08:00 |
|
zhouz
|
8664d7943f
|
fix:异常任务相关处理
|
2024-05-21 14:53:49 +08:00 |
|
|
|
ca892b7644
|
opt:修改输送线到满轴位四个点任务逻辑；
|
2024-05-20 17:30:01 +08:00 |
|
|
|
b9854b2c66
|
add：新增生成excel任务调度
|
2024-05-20 16:34:10 +08:00 |
|
zhouz
|
7b868f213c
|
fix:新增退货入库业务
|
2024-05-18 11:33:10 +08:00 |
|
