|
|
ce340a9951
|
rev 反馈mes取放倒完成
|
2023-05-26 15:53:03 +08:00 |
|
|
|
0cf19a531f
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
# mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/controller/saleOrder/MpsSaleOrderController.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/IMpsSaleOrderService.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/MpsSaleOrderMapper.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/xml/MpsSaleOrderMapper.xml
# mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/impl/MpsSaleOrderServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/util/ChangeIvtUtil.java
# mes/qd/src/views/wms/storage_manage/product/productIn/AddDtl.vue
# mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
# mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue
# mes/qd/src/views/wms/storage_manage/product/productOut/productout.js
|
2023-05-25 20:40:39 +08:00 |
|
|
|
db98481387
|
REV 修改
|
2023-05-25 19:56:34 +08:00 |
|
|
|
22d4222e1f
|
add 智能车间
|
2023-05-25 19:38:31 +08:00 |
|
USER-20220102CG\noblelift
|
f73fdf49e6
|
add 老车间包装
|
2023-05-25 19:27:14 +08:00 |
|
|
|
13dbaca2ba
|
rev ndc执行状态
|
2023-05-23 17:30:24 +08:00 |
|
USER-20220102CG\noblelift
|
2eba078ddb
|
add 老车间包装线驱动
|
2023-05-23 12:26:30 +08:00 |
|
USER-20220102CG\noblelift
|
b5aca2b6a8
|
add 老车间驱动
|
2023-05-19 17:15:48 +08:00 |
|
USER-20220102CG\noblelift
|
9e60ebfbfa
|
add 老车间设备驱动
|
2023-05-18 21:25:04 +08:00 |
|
USER-20220102CG\noblelift
|
e96c97aefd
|
fix 日志
|
2023-05-17 20:47:30 +08:00 |
|
|
|
f6abc2cd3e
|
rev 请求标记复位
|
2023-05-17 17:27:57 +08:00 |
|
|
|
a72caf0a31
|
rev 修复删除设备报错 分页显示问题
|
2023-05-17 17:26:50 +08:00 |
|
|
|
f6c8f65177
|
add lucene
|
2023-05-09 15:37:26 +08:00 |
|
|
|
9b8d295fe7
|
rev 在线状态
|
2023-05-09 14:35:18 +08:00 |
|
|
|
e3031c5267
|
add 封箱拆箱线, rev 测试读写
|
2023-05-08 11:04:52 +08:00 |
|
|
|
a23eae3cf2
|
rev 工作模式
|
2023-04-27 14:21:16 +08:00 |
|
|
|
778d8fb7df
|
rev 封箱拆箱
|
2023-04-27 13:33:04 +08:00 |
|
|
|
d1ac61df70
|
rev 联调问题修改
|
2023-04-25 17:30:25 +08:00 |
|
|
|
2313d80660
|
rev 信号类型
|
2023-04-25 11:10:19 +08:00 |
|
|
|
d4a63d1619
|
rev 缓存线有任务时不下发调度
|
2023-04-18 12:00:00 +08:00 |
|
|
|
9deeb8b14c
|
rev 更新细节
|
2023-04-17 08:50:26 +08:00 |
|
|
|
6f84106578
|
rev 更新同一点位有任务不能请求mes
|
2023-04-06 20:19:07 +08:00 |
|
|
|
19656f89f0
|
rev 修改手动创建指令
|
2023-04-06 19:57:48 +08:00 |
|
USER-20220102CG\noblelift
|
72491a513e
|
fix 包装请求参数
|
2023-04-06 16:25:48 +08:00 |
|
|
|
10f0b26339
|
rev 更新
|
2023-04-06 15:17:46 +08:00 |
|
USER-20220102CG\noblelift
|
ef7553bc6f
|
rev acs工单更新
|
2023-04-06 15:04:38 +08:00 |
|
|
|
a2a817ad24
|
rev 修改
|
2023-04-06 10:40:52 +08:00 |
|
|
|
eda9ba4614
|
rev 修改
|
2023-04-06 10:40:37 +08:00 |
|
|
|
a267bc14ea
|
更新
|
2023-03-25 17:18:19 +08:00 |
|
|
|
3a09875f8d
|
更新
|
2023-03-24 16:17:23 +08:00 |
|
|
|
f7ea420462
|
更新
|
2023-03-24 11:14:31 +08:00 |
|
|
|
ad1230b6bb
|
更新
|
2023-03-23 15:01:39 +08:00 |
|
|
|
de46a6b23a
|
更新
|
2023-03-23 09:04:05 +08:00 |
|
USER-20220102CG\noblelift
|
c5077035c1
|
更新最新ACS
|
2023-03-21 20:24:04 +08:00 |
|
|
|
22ff161288
|
更新
|
2022-11-30 12:51:53 +08:00 |
|
|
|
3bfe8438d1
|
更新
|
2022-09-22 17:31:25 +08:00 |
|
|
|
ce6ce0717b
|
更新
|
2022-09-02 14:08:43 +08:00 |
|
|
|
6ea0f433ce
|
更新
|
2022-08-08 19:36:21 +08:00 |
|
ldj_willow
|
02f5ec1bd3
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
# mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql
|
2022-08-08 17:10:06 +08:00 |
|
|
|
6a21976711
|
更新
|
2022-08-05 12:15:35 +08:00 |
|
|
|
7cb9051a20
|
更新
|
2022-08-04 19:47:16 +08:00 |
|
|
|
f0fbf69345
|
更新
|
2022-08-03 21:49:31 +08:00 |
|
loujf
|
e02a6c8cff
|
驱动更新
|
2022-08-03 10:23:38 +08:00 |
|
loujf
|
7f27dbd120
|
海量三个新驱动创建，导出smartCSV文件更新
|
2022-08-02 19:34:14 +08:00 |
|
|
|
b5c04b33cc
|
更新
|
2022-08-02 18:11:04 +08:00 |
|
|
|
7be750398e
|
更新导出协议
|
2022-07-29 18:01:37 +08:00 |
|
|
|
fed6636a3e
|
agv
|
2022-07-29 09:42:36 +08:00 |
|
|
|
332ee8d089
|
更新
|
2022-07-25 17:19:42 +08:00 |
|
ldj_willow
|
baf747802e
|
舞台编辑功能更新
|
2022-07-18 16:37:38 +08:00 |
|
USER-20220102CG\noblelift
|
d1c4d6cce9
|
更新
|
2022-07-18 14:56:07 +08:00 |
|
