|
|
c8c1335329
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-07-02 14:02:32 +08:00 |
|
|
|
90572dc622
|
rev：增加捆扎相关校验
|
2024-07-02 14:02:15 +08:00 |
|
|
|
f10d468c21
|
opt:优化子卷按子卷规格排序
|
2024-07-02 14:00:34 +08:00 |
|
|
|
2f6cbfd9c1
|
rev： 立库堆垛机相关任务下发时 给托盘号
|
2024-07-02 13:29:00 +08:00 |
|
|
|
5826a97da2
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-07-02 13:12:51 +08:00 |
|
|
|
1a72a6cb78
|
opt:优化一楼装箱区任务类相关校验
|
2024-07-02 13:12:34 +08:00 |
|
|
|
a84a6544f9
|
fix: 手持菜单区分与清除暂存修改
|
2024-07-02 09:27:01 +08:00 |
|
|
|
1cf2e6305d
|
fix: 删除子卷包装关系，异常包裹
|
2024-07-01 22:00:58 +08:00 |
|
|
|
58f243053a
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-07-01 17:35:47 +08:00 |
|
|
|
5871c91af5
|
fix: 套轴过滤一期分切计划
|
2024-07-01 17:34:31 +08:00 |
|
|
|
04ecf56d51
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-07-01 16:48:17 +08:00 |
|
zhouz
|
b3227f1a8d
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-01 16:45:18 +08:00 |
|
|
|
8ef3d51a8b
|
feat: 分切拼接、区域注释
|
2024-07-01 16:42:18 +08:00 |
|
zhouz
|
efafb265eb
|
fix:MES相关接口优化
|
2024-07-01 16:42:00 +08:00 |
|
|
|
7f201dba96
|
rev：代码合并
|
2024-07-01 15:13:51 +08:00 |
|
|
|
69b58c9d06
|
Merge branch 'master' into master_merge
|
2024-07-01 15:13:07 +08:00 |
|
|
|
e9f415d8cf
|
rev：改切入库回传
|
2024-07-01 15:10:58 +08:00 |
|
|
|
a546856fda
|
fix: 气胀轴代数校验位置改为分切计划表2
|
2024-07-01 14:04:17 +08:00 |
|
|
|
b00a5a23ef
|
fix: 气胀轴代数校验位置改为分切计划表
|
2024-07-01 14:04:15 +08:00 |
|
|
|
4c07bdbfca
|
Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/BstIvtBoxinfo.java
|
2024-07-01 13:58:54 +08:00 |
|
|
|
ea5bfbf40e
|
rev：捆扎相关修改
|
2024-07-01 13:53:48 +08:00 |
|
|
|
a6536eb7ad
|
fix: 气胀轴代数校验位置改为分切计划表2
|
2024-07-01 09:38:40 +08:00 |
|
|
|
c0d837711e
|
fix: 气胀轴代数校验位置改为分切计划表
|
2024-07-01 09:28:02 +08:00 |
|
zhouz
|
729afce407
|
fix:WQL数据新增，入烘箱优化
|
2024-06-30 18:54:13 +08:00 |
|
|
|
9ecc870369
|
opt:优化子卷装箱校验逻辑
|
2024-06-30 18:10:59 +08:00 |
|
|
|
1206370204
|
fix: 字符拼接
|
2024-06-30 17:56:23 +08:00 |
|
|
|
7caf3d0f97
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-06-30 16:05:34 +08:00 |
|
zhouz
|
1b3075007d
|
Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge
|
2024-06-30 15:19:00 +08:00 |
|
zhouz
|
35ccff0564
|
fix:重量校验
|
2024-06-30 15:18:44 +08:00 |
|
|
|
17032c858a
|
opt: 备货区与气胀轴库优化-前端
|
2024-06-30 14:24:14 +08:00 |
|
|
|
eb95498a07
|
opt: 备货区与气胀轴库优化
|
2024-06-30 14:22:54 +08:00 |
|
|
|
8c8c08b8f3
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-06-30 10:43:33 +08:00 |
|
|
|
170f925202
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-30 09:49:43 +08:00 |
|
|
|
274fd9f624
|
feat: 套轴异常处理情况v1
|
2024-06-30 09:49:31 +08:00 |
|
zhouz
|
c0ba71e24b
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-06-29 21:53:14 +08:00 |
|
zhouz
|
79d0e10a43
|
fix:WQL文件修改
|
2024-06-29 21:52:46 +08:00 |
|
zhouz
|
371cc4abee
|
Merge branch 'refs/heads/b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls
|
2024-06-29 19:10:34 +08:00 |
|
zhouz
|
236ef6bedb
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-29 19:09:52 +08:00 |
|
zhouz
|
3ca403632d
|
fix:WQL合并
|
2024-06-29 19:09:29 +08:00 |
|
|
|
964ce2a306
|
fix: 备货纸管扣除
|
2024-06-29 18:12:21 +08:00 |
|
zhouz
|
9e32eca116
|
fix:WQL修改
|
2024-06-29 17:55:59 +08:00 |
|
|
|
3886dce826
|
fix: 纸管信息
|
2024-06-29 17:34:46 +08:00 |
|
zhouz
|
2e69177359
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-06-29 16:50:20 +08:00 |
|
|
|
0fd7a3cf64
|
add:增加二次分配请求频繁处理
|
2024-06-29 16:45:31 +08:00 |
|
zhouz
|
23c7d3ab4a
|
fix:WQL优化
|
2024-06-29 16:40:24 +08:00 |
|
zhouz
|
f8d9ad12e4
|
fix:MES变更库区
|
2024-06-29 16:37:34 +08:00 |
|
|
|
c79bd1a186
|
add:增加二次分配请求频繁处理
|
2024-06-29 15:49:55 +08:00 |
|
|
|
d851b6c6ba
|
fix: 备货区任务修改
|
2024-06-29 14:10:32 +08:00 |
|
zhouz
|
898b1ab452
|
fix:下发电气信号添加区域
|
2024-06-29 13:59:56 +08:00 |
|
zhouz
|
a96df9b8a6
|
fix:套管优化
|
2024-06-29 13:19:49 +08:00 |
|
