jiaoliming
|
d7d4341684
|
rev：指令下发
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:08:22 +08:00 |
|
jiaoliming
|
4b8d2a7814
|
rev：lucene
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:07:22 +08:00 |
|
jiaoliming
|
7727ca0699
|
rev： 刻字机
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:06:02 +08:00 |
|
jiaoliming
|
57c10fd2fc
|
rev：清洗上料
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:05:42 +08:00 |
|
jiaoliming
|
99554a6376
|
rev：包装机
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:05:11 +08:00 |
|
jiaoliming
|
2ea54295a4
|
rev：机械手码垛
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:04:20 +08:00 |
|
jiaoliming
|
bb30c8e84c
|
rev：包装机
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:03:02 +08:00 |
|
jiaoliming
|
b20069eaa4
|
rev：刻字上料
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:01:55 +08:00 |
|
jiaoliming
|
1f07dab81f
|
rev：装箱机
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:01:03 +08:00 |
|
jiaoliming
|
01fd8b0d19
|
rev：清洗上、下料
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 09:58:08 +08:00 |
|
jiaoliming
|
79ab3099fa
|
rev：开箱机下发信号
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 09:56:56 +08:00 |
|
wangs
|
fe98a98ae0
|
rev opc读写共用一个server
|
2023-08-25 13:47:41 +08:00 |
|
wangs
|
b4d06c541c
|
rev opc读取时不建立新连接
|
2023-08-21 18:36:20 +08:00 |
|
wangs
|
908c8ed7c8
|
rev 更新单工ndc连接
|
2023-08-18 16:03:45 +08:00 |
|
USER-20220102CG\noblelift
|
17fe0e6447
|
rev 更新测试读、写未关闭链接
|
2023-08-16 10:55:06 +08:00 |
|
USER-20220102CG\noblelift
|
29f251f7d9
|
rev 更新底层写入信号逻辑
|
2023-08-11 16:49:55 +08:00 |
|
USER-20220102CG\noblelift
|
5f9f4ba30c
|
rev 优化舞台监控
|
2023-08-01 22:52:57 +08:00 |
|
USER-20220102CG\noblelift
|
2aedcf50fd
|
rev opc同步线程
|
2023-07-26 11:29:05 +08:00 |
|
jiaoliming
|
3b02e7bc1c
|
fix ：清洗上料，下料
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-07-25 11:03:20 +08:00 |
|
jiaoliming
|
240d5aa8b4
|
fix : 修改刻字上料输送线逻辑
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-07-22 11:53:32 +08:00 |
|
jiaoliming
|
415b980c51
|
add : 清洗后段
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-07-19 18:15:12 +08:00 |
|
|
|
4a0a36c091
|
rev:根据实际排产场景，修改销售订单内容
|
2023-07-17 16:29:29 +08:00 |
|
|
|
3d1b6119e1
|
add:刻字机取放货判断工作模式
|
2023-07-06 16:31:42 +08:00 |
|
周俊杰
|
39e9afae00
|
海亮海柔接口
|
2023-07-06 14:36:03 +08:00 |
|
|
|
1870c02e50
|
add：刻字称重
|
2023-07-05 11:04:04 +08:00 |
|
jiaoliming
|
d7104beb88
|
add : 合框称重
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-07-04 20:50:31 +08:00 |
|
jiaoliming
|
ea3b8caabc
|
fix:移除UnboxingOrderDto
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-07-04 19:18:00 +08:00 |
|
jiaoliming
|
bbc2b8b1c6
|
Revert "no message"
This reverts commit 337b1a0cdd.
|
2023-07-04 19:11:45 +08:00 |
|
jiaoliming
|
337b1a0cdd
|
no message
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-07-04 19:06:55 +08:00 |
|
jiaoliming
|
a27e76a7bd
|
add：清洗刻字包装
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-07-04 19:00:33 +08:00 |
|
|
|
3fb718b739
|
rev 缓存线出库数量
|
2023-06-28 08:49:59 +08:00 |
|
|
|
afec6749f7
|
rev 监控页面异常信息显示
|
2023-06-27 13:56:10 +08:00 |
|
|
|
a9547de830
|
rev 出缓存线数量
|
2023-06-26 14:30:31 +08:00 |
|
|
|
1c60718e8c
|
REV 单工NDC
|
2023-06-20 16:44:00 +08:00 |
|
|
|
3b1e1a7194
|
rev 清洗上料
|
2023-06-16 16:15:00 +08:00 |
|
|
|
edc2f84199
|
rev 监控显示信息
|
2023-06-16 09:36:56 +08:00 |
|
|
|
391a6a11ba
|
add ndc反馈smart200驱动
|
2023-06-14 20:26:48 +08:00 |
|
|
|
afe0866aed
|
rev 分页、下发plc两次
|
2023-06-13 09:39:26 +08:00 |
|
|
|
594eede6ce
|
add 取消指令清除phase值
|
2023-06-09 19:33:51 +08:00 |
|
|
|
756a2daf34
|
REV 专机设备、缓存线
|
2023-06-08 18:32:55 +08:00 |
|
jiaoliming
|
1d52b58d6a
|
fix：盘点完成清除任务号
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-06-06 17:38:15 +08:00 |
|
|
|
ce9e6e80a8
|
rev 缓存线反馈
|
2023-06-06 17:31:00 +08:00 |
|
jiaoliming
|
ee2b98ff01
|
Revert "fix:"
This reverts commit 4fed94c420.
|
2023-06-06 17:27:03 +08:00 |
|
jiaoliming
|
4fed94c420
|
fix:
|
2023-06-06 17:24:29 +08:00 |
|
|
|
35dc93da32
|
rev 缓存线、专机取放货条件更改
|
2023-06-02 14:35:57 +08:00 |
|
|
|
c02894484d
|
rev ndc驱动
|
2023-05-30 18:33:41 +08:00 |
|
|
|
9add7774cd
|
add 双工位AGV日志
|
2023-05-29 18:34:59 +08:00 |
|
|
|
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 |
|
