|
|
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 |
|
|
|
c9c93cd2cc
|
fix: api错误
|
2024-06-27 15:19:36 +08:00 |
|
|
|
39f10ae18f
|
rev：代码合并
|
2024-06-27 15:09:32 +08:00 |
|
|
|
2ae476a67a
|
Merge pull request 'b_lms_master_merge' (#3) from b_lms into master_merge
Reviewed-on: http://121.40.234.130:8899/root/lanzhouhailiang_one/pulls/3
|
2024-06-27 08:54:19 +08:00 |
|
zhouz
|
6240eb9a72
|
代码合并
|
2024-06-26 23:09:09 +08:00 |
|
zhouz
|
32188cc4fe
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-06-26 21:49:24 +08:00 |
|
zhouz
|
2fad0075c6
|
fix:MES相关优化
|
2024-06-26 21:49:19 +08:00 |
|
|
|
bd153c9044
|
add:增加二次分配代码逻辑
|
2024-06-25 19:06:07 +08:00 |
|
|
|
fb6fe5f0b5
|
Merge remote-tracking branch 'remotes/origin/b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java
# lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java
# lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
# lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
# lms/nladmin-ui/src/views/wms/basedata/st/struct/structattr.js
|
2024-06-25 17:41:06 +08:00 |
|
|
|
2f396a9a71
|
add：仓位页面新增 巷道管理
|
2024-06-25 17:10:06 +08:00 |
|
|
|
94aa93b096
|
Merge branch 'b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
|
2024-06-24 17:47:15 +08:00 |
|
|
|
0814124414
|
rev：二次分配修改
|
2024-06-24 17:39:45 +08:00 |
|
zhouz
|
87ebb39603
|
fix:MES对接相关代码优化
|
2024-06-24 16:25:41 +08:00 |
|
zhouz
|
c11f1ed3af
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-06-22 10:48:49 +08:00 |
|
zhouz
|
23a1787e7e
|
fix:发货任务优化
|
2024-06-22 10:48:42 +08:00 |
|
|
|
5a70b02fc3
|
rev：合并修改
|
2024-06-21 18:29:43 +08:00 |
|
|
|
3a9e0275e9
|
Merge branch 'b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java
# lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
|
2024-06-21 18:14:34 +08:00 |
|
|
|
387f5a77f8
|
add:发货新增扩展字段
|
2024-06-21 18:04:20 +08:00 |
|
|
|
6aa375f195
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-21 11:40:28 +08:00 |
|
|
|
a9d3f7d1cc
|
add:增加二次分配代码逻辑
|
2024-06-21 11:40:03 +08:00 |
|
zhouz
|
d95ecd0405
|
fix:出入库代码优化
|
2024-06-21 11:01:02 +08:00 |
|
|
|
7bb3955a40
|
主分支合并
|
2024-06-21 10:32:26 +08:00 |
|
|
|
413f876247
|
Merge branch 'master' into master_merge
|
2024-06-21 10:30:00 +08:00 |
|
|
|
b8620f0973
|
Merge branch 'b_lms' into master_merge
|
2024-06-21 10:24:13 +08:00 |
|
|
|
cbfec25a9f
|
rev：发货区修改
|
2024-06-21 10:23:38 +08:00 |
|
|
|
43baf68a46
|
rev： 改切出库修改
|
2024-06-21 10:04:42 +08:00 |
|
|
|
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 |
|
|
|
ee7a406d81
|
add：1.新增木箱称重校验功能2.输送任务反馈执行中更新木箱毛重
|
2024-06-20 17:07:40 +08:00 |
|
|
|
de4d79e4a7
|
Merge branch 'b_lms' into master_merge
|
2024-06-20 09:40:21 +08:00 |
|
|
|
3c2da9058f
|
rev：发货任务二次分配修改
|
2024-06-20 09:39:22 +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 |
|
|
|
daa1a8a64e
|
fix:修复区域问题
|
2024-06-18 18:20:29 +08:00 |
|
|
|
ceb0bac497
|
opt:只显示存在点位的子卷信息
|
2024-06-18 17:17:57 +08:00 |
|
|
|
ec5279cf93
|
Merge commit '9186ce137f2a67a4d8d7bb1cbfcc40cf69729d22' into master_merge
|
2024-06-18 16:37:40 +08:00 |
|
zhouz
|
e12a436783
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-06-18 10:04:49 +08:00 |
|
zhouz
|
e8dec156d5
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-18 10:04:19 +08:00 |
|
zhouz
|
212b14008f
|
fix:BUG修改
|
2024-06-18 10:04:10 +08:00 |
|
zhouz
|
57defd4e0d
|
fix:BUG修改
|
2024-06-18 10:03:24 +08:00 |
|
|
|
fd7f0e488b
|
opt:6.15上线装箱区代码修改
|
2024-06-17 21:26:41 +08:00 |
|
|
|
61d28d7138
|
rev：库存报表入库时间更新
|
2024-06-17 15:38:33 +08:00 |
|
