|
|
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 |
|
|
|
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 |
|
|
|
bee8457496
|
opt:只显示存在点位的子卷信息
|
2024-06-18 17:19:56 +08:00 |
|
|
|
1c440c1085
|
rev：按钮显示
|
2024-06-18 16:51:54 +08:00 |
|
|
|
ec5279cf93
|
Merge commit '9186ce137f2a67a4d8d7bb1cbfcc40cf69729d22' into master_merge
|
2024-06-18 16:37:40 +08:00 |
|
|
|
15a46f0c62
|
opt:6.18 线上部署测试环境
|
2024-06-18 12:48:01 +08:00 |
|
|
|
170170d608
|
fix：出库分配页面打不开bug修改
|
2024-06-18 08:54:08 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
13cdba9ea1
|
rev：库存报表新增接头数
|
2024-06-14 17:29:30 +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 |
|
|
|
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 |
|
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 |
|
|
|
dc6904fabd
|
rev：前端修改
|
2024-06-07 17:08:40 +08:00 |
|
zhangzq
|
c33ffe440b
|
Merge branch 'master' into b_lms2
|
2024-06-07 16:21:32 +08:00 |
|
zhouz
|
9cb97a4b59
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
|
2024-06-06 13:52:39 +08:00 |
|
|
|
3fa97cac25
|
fix: ACS请求扣除纸管数量
|
2024-06-04 17:04:04 +08:00 |
|
|
|
935fdcaf8f
|
fix: 判断纸管、呼叫AGV更换托盘
|
2024-06-04 15:02:51 +08:00 |
|
zhouz
|
ce3324a8af
|
fix;表处代码修改
|
2024-06-04 10:37:35 +08:00 |
|
|
|
ac608ed2ca
|
rev：出库口自动分配
|
2024-05-31 09:00:14 +08:00 |
|
ludj
|
9736ad6807
|
rev:删除多余图片
|
2024-05-29 08:45:46 +08:00 |
|
zhouz
|
5939a0e520
|
fix:出入库流程修改
|
2024-05-28 09:26:40 +08:00 |
|
|
|
6a4dfd1f22
|
add：分拣出库
|
2024-05-22 17:16:05 +08:00 |
|
|
|
8217df4480
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-05-20 10:43:56 +08:00 |
|
|
|
9f73e74445
|
fix: 内包间任务完成点位数据赋值不对
|
2024-05-20 10:43:18 +08:00 |
|
|
|
ed68b654d8
|
fix:密码修改
|
2024-05-19 14:34:27 +08:00 |
|
zhouz
|
20904af6d5
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-17 17:02:49 +08:00 |
|
zhouz
|
6746f0a088
|
fix:入库修改
|
2024-05-17 17:02:43 +08:00 |
|
|
|
58d0dfa279
|
opt:优化子卷包装界面样式
|
2024-05-17 10:28:18 +08:00 |
|
|
|
96515306bd
|
opt:修改入库木箱获取方式
|
2024-05-16 17:09:19 +08:00 |
|
|
|
cf60ace60f
|
fix: 角色权限分配不显示
|
2024-05-15 09:37:11 +08:00 |
|
|
|
68b6ddb793
|
opt:子卷装箱测试
|
2024-05-14 22:49:10 +08:00 |
|
|
|
4667761c9c
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
|
2024-05-11 22:12:54 +08:00 |
|
|
|
34def7f32a
|
opt:空木箱入库增加层数
|
2024-05-11 22:09:26 +08:00 |
|
|
|
9d752f91ea
|
rev：图标优化
|
2024-05-11 17:16:54 +08:00 |
|
|
|
94f09d2397
|
rev： 空托盘入库托盘类型，仓位顺序，前端页面优化
|
2024-05-11 17:13:43 +08:00 |
|
|
|
a07df96854
|
opt:处理代码冲突
|
2024-05-10 14:19:13 +08:00 |
|
zhouz
|
d03c915e92
|
dev:新增备货区代码
|
2024-05-09 20:01:54 +08:00 |
|
|
|
a60a4229ff
|
rev:新增登录次数限制，密码正则表达式校验，发货区AGV任务生成添加开关
|
2024-05-08 17:05:39 +08:00 |
|
|
|
b6736b9a9d
|
add：拣选出库开发
|
2024-04-30 10:57:40 +08:00 |
|
