CaesarBao
|
06b6dc503c
|
新增视觉交互
|
10 months ago |
|
CaesarBao
|
702d3dcba5
|
新增视觉交互
|
10 months ago |
SoulStar
|
3499eacfc1
|
add - Tcp十个接口写完 功能测试正常
|
10 months ago |
|
CaesarBao
|
9b1e7f447e
|
合并代码
|
10 months ago |
|
CaesarBao
|
3730109cf6
|
合并代码
|
10 months ago |
|
CaesarBao
|
c7d55e9fc0
|
合并
|
10 months ago |
|
CaesarBao
|
be7cf5e199
|
提交
|
10 months ago |
|
SoulStar
|
f075976712
|
Merge branch 'master' of http://175.27.215.92:3000/baogq/HightWay_AirPot_WCS
# Conflicts:
# SlnMesnac.Config/AppConfig.cs
# SlnMesnac.TouchSocket/TcpServer.cs
# SlnMesnac.WPF/ViewModel/IndexPage/IndexContentViewModel.cs
# SlnMesnac.WPF/appsettings.json
|
10 months ago |
|
SoulStar
|
42d0097363
|
Merge branch 'dep_wangsr'
# Conflicts:
# SlnMesnac.Config/AppConfig.cs
# SlnMesnac.Repository/service/Impl/AGVStateServiceImpl.cs
# SlnMesnac.TouchSocket/TcpServer.cs
# SlnMesnac.WPF/ViewModel/IndexPage/IndexContentViewModel.cs
# SlnMesnac.WPF/appsettings.json
|
10 months ago |
|
SoulStar
|
7c0c98059a
|
Merge branch 'master' into dep_wangsr
# Conflicts:
# SlnMesnac.Config/AppConfig.cs
# SlnMesnac.Repository/service/Impl/AGVStateServiceImpl.cs
# SlnMesnac.TouchSocket/TcpServer.cs
# SlnMesnac.WPF/ViewModel/IndexPage/IndexContentViewModel.cs
# SlnMesnac.WPF/appsettings.json
|
10 months ago |
|
SoulStar
|
d0c0083986
|
add - 添加报文长度判断，更改日志路径
|
10 months ago |
|
SoulStar
|
0b6b31a706
|
add - TCP信号接收
|
10 months ago |
|
CaesarBao
|
0908de22e9
|
新增机械臂状态显示
|
10 months ago |
|
SoulStar
|
2feda5b29b
|
add - 添加状态请求数据库插入
|
10 months ago |
|
SoulStar
|
fd50736e08
|
debug - 数据库连不上问题解决
|
10 months ago |
|
SoulStar
|
ef1c87e84e
|
change - 修改报错
|
10 months ago |
|
SoulStar
|
32b2acc58e
|
Merge branch 'master' into dep_wangsr
# Conflicts:
# SlnMesnac.Model/domain/AGVState.cs
# SlnMesnac.Model/domain/AirportTask.cs
# SlnMesnac.Quartz/QuartzSetUp.cs
# SlnMesnac.Quartz/SlnMesnac.Quartz.csproj
# SlnMesnac.Repository/service/IAirportTaskService.cs
# SlnMesnac.Repository/service/Impl/AirportTaskServiceImpl.cs
# SlnMesnac.WPF/MainWindow.xaml
# SlnMesnac.WPF/appsettings.json
|
10 months ago |
|
SoulStar
|
9419ec6e28
|
add - 接口测试方法
|
10 months ago |
|
SoulStar
|
4edefeec12
|
add - 添加六个接口（两个我方提供，四个向对方请求）
|
10 months ago |
|
CaesarBao
|
63b59cca10
|
新增获取等待任务逻辑
|
10 months ago |
 wenjy
|
d66333989c
|
change - Index页面参数绑定
|
10 months ago |
|
CaesarBao
|
bd30cb1446
|
提交数据库
|
10 months ago |
|
CaesarBao
|
c2673fe083
|
新增任务查询业务
|
10 months ago |
|
wenjy
|
4c4d214185
|
add - 监控界面
|
10 months ago |
|
CaesarBao
|
4747aa7413
|
框架搭建
|
10 months ago |
 baogq
|
e508d04eee
|
Initial commit
|
10 months ago |