|
|
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 |
|
|
|
098330e94f
|
rev：代码合并
|
2024-05-20 09:24:03 +08:00 |
|
|
|
8122f60be9
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-20 09:23:35 +08:00 |
|
|
|
c5fdf97b98
|
rav：任务完成时释放货位以及库存
|
2024-05-20 09:23:24 +08:00 |
|
|
|
f22475a6ef
|
opt:优化空木箱出库，装箱区，子卷木箱分配相关逻辑。
|
2024-05-19 23:06:36 +08:00 |
|
|
|
c07a23e1e1
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-05-19 14:34:38 +08:00 |
|
|
|
ed68b654d8
|
fix:密码修改
|
2024-05-19 14:34:27 +08:00 |
|
zhouz
|
7b868f213c
|
fix:新增退货入库业务
|
2024-05-18 11:33:10 +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 |
|
|
|
0880386c3d
|
rev: 代码合并
|
2024-05-16 18:58:22 +08:00 |
|
|
|
738f5d7e28
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-16 18:57:46 +08:00 |
|
|
|
624e3ac2c9
|
rev: 仓位不区分库区
|
2024-05-16 18:57:33 +08:00 |
|
|
|
96515306bd
|
opt:修改入库木箱获取方式
|
2024-05-16 17:09:19 +08:00 |
|
|
|
a615fa19ce
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-05-16 17:08:48 +08:00 |
|
|
|
5fbe891da9
|
opt:修改入库木箱获取方式
|
2024-05-16 17:08:33 +08:00 |
|
|
|
f96ad6d54a
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-05-16 16:12:13 +08:00 |
|
|
|
d6fc326bcd
|
fix: 内包间任务下发参数字段名错误
|
2024-05-16 16:11:42 +08:00 |
|
zhouz
|
1971e6ced2
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-16 09:37:59 +08:00 |
|
zhouz
|
68f1aef4b0
|
fix:空木箱入库增加高度限制
|
2024-05-16 09:37:54 +08:00 |
|
|
|
2873820eb0
|
opt:获取纸管长度
|
2024-05-15 21:20:40 +08:00 |
|
zhouz
|
10f431ca71
|
fix:入库新增高度要求
|
2024-05-15 20:26:02 +08:00 |
|
|
|
8eb06a6dcc
|
opt:获取纸管长度
|
2024-05-15 19:50:31 +08:00 |
|
|
|
070946f905
|
opt:获取纸管长度
|
2024-05-15 19:49:41 +08:00 |
|
|
|
e6b3461cd9
|
opt:子卷装箱测试
|
2024-05-15 19:19:58 +08:00 |
|
|
|
92105c1cb3
|
rev：1.出库任务优化：任务完成后更新仓位、库存等信息，单据完成后则根据情况更新库存，情况1：虚拟库，完成单据更新虚拟区仓位、库存，情况2：超期发货：如果子卷超期且是超期发货则更新库存、仓位信息。2.移库任务下发优化：判断是从左边开始移库还是右边开始移库修改
|
2024-05-15 14:01:47 +08:00 |
|
|
|
cf60ace60f
|
fix: 角色权限分配不显示
|
2024-05-15 09:37:11 +08:00 |
|
zhouz
|
f4e308a50f
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-15 09:08:04 +08:00 |
|
zhouz
|
8ee4fb2f2d
|
fix:空托盘入库修改
|
2024-05-15 09:07:59 +08:00 |
|
|
|
68b6ddb793
|
opt:子卷装箱测试
|
2024-05-14 22:49:10 +08:00 |
|
zhouz
|
324d05fd5e
|
fix;新增载具类型
|
2024-05-14 16:03:07 +08:00 |
|
zhouz
|
48ba755ad9
|
fix:出入库任务类型给托盘类型，空木箱出库返回木箱号
|
2024-05-14 15:04:44 +08:00 |
|
zhouz
|
ad7c2ddd03
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-13 20:05:00 +08:00 |
|
zhouz
|
ec6a0553d4
|
fix:任务下发ACS增加托盘类型，新增空木箱入库的业务逻辑
|
2024-05-13 20:04:55 +08:00 |
|
|
|
be03e7a61e
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-05-13 13:25:57 +08:00 |
|
|
|
4414177cac
|
rev:返检、改切回传MES新增回传时间
|
2024-05-13 13:25:34 +08:00 |
|
|
|
7b771a0a9c
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-13 11:11:37 +08:00 |
|
|
|
3282f15af7
|
add: 输送机申请贴标demo
|
2024-05-13 11:10:46 +08:00 |
|
zhouz
|
30ad6db6ac
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-13 09:35:08 +08:00 |
|
zhouz
|
6c4170cd59
|
rev;木箱入库修改
|
2024-05-13 09:35:01 +08:00 |
|
|
|
6831a82a5a
|
opt:空木箱入库增加层数
|
2024-05-12 16:43:16 +08:00 |
|
|
|
a6b9e54572
|
opt:空木箱入库增加层数
|
2024-05-12 15:26:32 +08:00 |
|
zhouz
|
a296a4845d
|
rev:空木箱入库修改
|
2024-05-12 15:12:49 +08:00 |
|
zhouz
|
095809680d
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-12 15:12:04 +08:00 |
|
zhouz
|
28059f4269
|
rev:空木箱入库修改
|
2024-05-12 15:12:00 +08:00 |
|
|
|
9eea3bb5ea
|
opt:空木箱入库增加层数
|
2024-05-11 22:23:02 +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 |
|
