Commit Graph

772 Commits

Author SHA1 Message Date
jiaoliming
97f23b2b0b no message
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-09-01 10:33:17 +08:00
jiaoliming
a25a51efa4 rev :lucene
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-09-01 10:32:42 +08:00
jiaoliming
f3e26048f2 rev:设备监控
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-09-01 10:32:04 +08:00
jiaoliming
1a2dcfc24c add:海柔
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-09-01 10:30:34 +08:00
jiaoliming
10adfb89f5 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-09-01 10:27:45 +08:00
jiaoliming
53c8103546 Revert "Revert "rev:系统配置,设备监控""
This reverts commit ff22772908.
2023-09-01 10:25:31 +08:00
jiaoliming
ff22772908 Revert "rev:系统配置,设备监控"
This reverts commit 408afd8e01.
2023-09-01 10:16:13 +08:00
jiaoliming
408afd8e01 rev:系统配置,设备监控
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-09-01 10:14:18 +08:00
zhangzhiqiang
036bdb25d7 Merge remote-tracking branch 'origin/master' 2023-09-01 10:11:34 +08:00
zhangzhiqiang
df9fdd85df add:仓库管理 2023-09-01 10:11:27 +08:00
jiaoliming
ba52db4d18 add:新增lms业务接口
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-09-01 10:10:36 +08:00
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
427a3084a4 add: 三线手持功能 : 半成品入库、半成品出库、空箱出库 2023-08-30 18:17:11 +08:00
f83dc77f98 rev:成品出库前端校验 2023-08-28 10:15:52 +08:00
zhangzhiqiang
2d88005fd1 opt:刻字输送线任务下发控制 2023-08-25 17:22:43 +08:00
zhangzhiqiang
b10f1d806a opt:刻字输送线任务下发控制 2023-08-25 16:01:17 +08:00
zhangzhiqiang
eeb28c7361 Merge remote-tracking branch 'origin/master' 2023-08-25 15:43:35 +08:00
zhangzhiqiang
7b215e061f add:设备运行记录 2023-08-25 15:43:30 +08:00
wangs
fe98a98ae0 rev opc读写共用一个server 2023-08-25 13:47:41 +08:00
909766d20e add:半成品出入库导出功能 2023-08-24 17:09:51 +08:00
zhangzhiqiang
25c51f7c6c add:半成品库添加入库类型 2023-08-24 14:45:15 +08:00
zhangzhiqiang
8da0e84f00 rev:刻字上料方案修改 2023-08-23 21:56:16 +08:00
zhangzhiqiang
ed6d5a535d Merge remote-tracking branch 'origin/master' 2023-08-23 18:43:22 +08:00
zhangzhiqiang
64dcbe1e79 add:添加空框送回按钮 2023-08-23 18:42:25 +08:00
68d7cca968 rev:大屏改造成mybatis以及代码优化 2023-08-23 17:28:02 +08:00
zhangzhiqiang
b18448e695 add:添加空框送回按钮 2023-08-23 16:58:13 +08:00
zhangzhiqiang
01d96359a6 rev:半成品库存导出修改 2023-08-23 16:24:18 +08:00
zhangzhiqiang
08cc55eb5d Merge branch 'master' into feature/三线需求_818 2023-08-23 14:18:52 +08:00
zhangzhiqiang
f5ae3ef903 rev:清洗相关功能优化 2023-08-23 11:01:29 +08:00
zhangzhiqiang
cc96dd2031 rev:清洗上料相关修改 2023-08-22 21:38:24 +08:00
zhangzhiqiang
53f318fa8e rev:清洗上料相关修改 2023-08-22 21:33:19 +08:00
zhangzhiqiang
4c6484bc2b Merge remote-tracking branch 'origin/master' 2023-08-22 15:05:58 +08:00
zhangzhiqiang
60a2138e97 rev:清洗机上料 2023-08-22 15:05:53 +08:00
87e67df718 rev:海柔半成品下发任务类型 2023-08-22 13:38:10 +08:00
zhangzhiqiang
c71642a66b Merge remote-tracking branch 'origin/master' 2023-08-22 13:36:12 +08:00
zhangzhiqiang
89fb5d375b opt:修改成品出库优先级 2023-08-22 13:35:11 +08:00
wangs
b4d06c541c rev opc读取时不建立新连接 2023-08-21 18:36:20 +08:00
zhangzhiqiang
4ce0359d16 rev:成品出库取消分配校验 2023-08-21 18:06:00 +08:00
zhangzhiqiang
626f7b7aad rev:修改mes 2023-08-20 17:56:56 +08:00
zhangzhiqiang
3aaa8b4944 add:数据库 2023-08-20 17:38:41 +08:00