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 |
|
|
|
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 |
|
zhouz
|
cba03a45ad
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-06-27 11:04:21 +08:00 |
|
zhouz
|
590e7ec713
|
fix:websocket更新
|
2024-06-27 11:03:47 +08:00 |
|
zhouz
|
d1a269d284
|
fix:优化
|
2024-06-27 09:27:01 +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 |
|
|
|
18ea719b9f
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-27 08:49:12 +08:00 |
|
|
|
0fac3a2554
|
fix:修复前端子卷号重复校验
|
2024-06-27 08:48:41 +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 |
|
|
|
35d18e93b0
|
remove: 去除备注
|
2024-06-26 17:46:19 +08:00 |
|
|
|
0473d9529e
|
rev：空木箱入库：优先将相同木箱规格的木箱放在同一深浅货位
|
2024-06-26 17:13:34 +08:00 |
|
|
|
ea8b70ec38
|
fix:修复前端子卷规格无法显示问题
|
2024-06-26 14:17:15 +08:00 |
|
|
|
4d729392c9
|
fix:修复前端子卷规格无法显示问题，装箱对接位子卷装箱数量问题
|
2024-06-26 12:46:51 +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
|
431ceba003
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-06-24 16:25:46 +08:00 |
|
zhouz
|
87ebb39603
|
fix:MES对接相关代码优化
|
2024-06-24 16:25:41 +08:00 |
|
|
|
55cd804fa1
|
fix: 分切对接位区分区域
|
2024-06-24 15:29:49 +08:00 |
|
|
|
c86ee18d3a
|
feat: 内包间不套轴业务
|
2024-06-23 14:50:50 +08:00 |
|
|
|
74db7e79e0
|
fix: 修复分切下料AGV任务没校验禁用点位
|
2024-06-22 17:26:10 +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 |
|
