|
|
01bf0d484b
|
opt:修改查询木箱信息
|
2024-05-27 16:11:32 +08:00 |
|
zhouz
|
b3b82e2352
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-25 15:49:31 +08:00 |
|
zhouz
|
a44c225026
|
fix:出库任务给托盘类型
|
2024-05-25 15:49:27 +08:00 |
|
|
|
38e3302e40
|
opt:修改退货入库逻辑
|
2024-05-25 15:47:06 +08:00 |
|
zhouz
|
b284be33ea
|
fix:入库优化
|
2024-05-24 15:31:02 +08:00 |
|
zhouz
|
dc785a42eb
|
fix:下发任务给高度类型
|
2024-05-24 13:50:13 +08:00 |
|
zhouz
|
28b990e002
|
fix:获取木箱高度类型修改
|
2024-05-23 17:30:19 +08:00 |
|
zhouz
|
192bdb52cb
|
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/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java
|
2024-05-23 17:25:13 +08:00 |
|
zhouz
|
d1731ab7f3
|
fix:MES接口相关修改
|
2024-05-23 17:21:19 +08:00 |
|
|
|
ff125b673e
|
feat: 增加存储acs反馈的子卷重量,修复了已知的问题
|
2024-05-23 15:02:16 +08:00 |
|
|
|
16cb0f8da4
|
opt: 子卷判断是送到废品还是成品称重的优化
|
2024-05-23 10:10:10 +08:00 |
|
zhouz
|
8e5fcb1006
|
fix:高度校验
|
2024-05-22 16:09:52 +08:00 |
|
zhouz
|
fbf5640d2d
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-22 11:23:36 +08:00 |
|
zhouz
|
c9a45ea457
|
fix：位置校验
|
2024-05-22 11:23:32 +08:00 |
|
|
|
ffc2323379
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-05-21 15:07:53 +08:00 |
|
|
|
a854cb2ecc
|
fix: 气胀轴送暂存区代数校验错误
|
2024-05-21 15:07:24 +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 |
|
|
|
9d6fb3c4fa
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-05-20 17:30:17 +08:00 |
|
|
|
ca892b7644
|
opt:修改输送线到满轴位四个点任务逻辑；
|
2024-05-20 17:30:01 +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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
