|
|
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 |
|
zhouz
|
ad068ed538
|
Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge
|
2024-06-29 10:48:28 +08:00 |
|
zhouz
|
946857d454
|
fix:问题优化
|
2024-06-29 10:48:17 +08:00 |
|
|
|
1a86159e34
|
add:增加自动执行等待的桁架任务
|
2024-06-29 09:21:25 +08:00 |
|
|
|
830a523d56
|
rev：木箱类型
|
2024-06-28 16:31:32 +08:00 |
|
|
|
956e6c99df
|
add：木箱类型
|
2024-06-28 15:13:10 +08:00 |
|
|
|
66212b6ed4
|
fix: 手持下拉框
|
2024-06-28 14:59:21 +08:00 |
|
|
|
e17eed36ca
|
fix: 手持点位下拉框过滤
|
2024-06-28 14:49:30 +08:00 |
|
|
|
a7bd40dcbd
|
fix: 备货区反馈acs纸管信息改为string
|
2024-06-28 14:44:17 +08:00 |
|
|
|
b9cf783ccd
|
fix: 97信号校验
|
2024-06-28 13:58:52 +08:00 |
|
|
|
142fc1dfea
|
rev: 二期出库报错修改
|
2024-06-28 10:31:23 +08:00 |
|
|
|
c053f7a2dd
|
fix：二期出库完成报错bug修复
|
2024-06-28 10:13:23 +08:00 |
|
|
|
217e8d86d2
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
|
2024-06-28 09:19:18 +08:00 |
|
|
|
b0d72c6db7
|
fix: 1、分切下料缓存
2、内包间新增97信号直接套轴完成
3、手持分切暂存送料到内包间
4、手持清理分切暂存数据
|
2024-06-28 09:06:08 +08:00 |
|
|
|
2874439aa1
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-28 01:30:16 +08:00 |
|
|
|
a9ef3d8f69
|
fix:增加二次分配任务重复校验
|
2024-06-28 01:30:03 +08:00 |
|
zhouz
|
2a370376be
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-06-27 17:00:21 +08:00 |
|
zhouz
|
430f4c795a
|
fix:WQL更新
|
2024-06-27 16:58:02 +08:00 |
|
|
|
e88415bada
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-06-27 16:00:57 +08:00 |
|
zhouz
|
cd7c68d61d
|
fix:代码合并
|
2024-06-27 15:56:08 +08:00 |
|
zhouz
|
cab08052ec
|
代码合并
|
2024-06-27 15:23:15 +08:00 |
|
|
|
1cbbe0a9fd
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-27 15:20:06 +08:00 |
|
|
|
c9c93cd2cc
|
fix: api错误
|
2024-06-27 15:19:36 +08:00 |
|
|
|
a714b8e2d6
|
fix:修复前端子卷号重复校验
|
2024-06-27 15:11:31 +08:00 |
|
|
|
39f10ae18f
|
rev：代码合并
|
2024-06-27 15:09:32 +08:00 |
|
|
|
07452b1630
|
Merge branch 'b_lms' into master_merge
|
2024-06-27 15:08:28 +08:00 |
|
|
|
cf0368756e
|
fix：二期出库打印无法打印发货单
|
2024-06-27 15:05:42 +08:00 |
|
