Commit Graph

15 Commits (d46e20ede0e37d604755a6fc82289f25ded625c6)

Author SHA1 Message Date
CaesarBao d46e20ede0 Merge branch 'master' of http://175.27.215.92:3000/baogq/HightWay_AirPot_WCS
CaesarBao 750eb80fa8 修改任务实体,新增AGV任务编号
SoulStar 38ed1f0a4d change - 优化AirportHttpClient类
SoulStar 6abe7bf5c6 add - 添加AGV接口类
SoulStar 3d3b1cae2e debug - 修改乱码问题,解决新接口不适配老服务类问题
CaesarBao 702d3dcba5 新增视觉交互
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
CaesarBao 0908de22e9 新增机械臂状态显示
SoulStar 2feda5b29b add - 添加状态请求数据库插入
SoulStar ef1c87e84e change - 修改报错
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
SoulStar 4edefeec12 add - 添加六个接口(两个我方提供,四个向对方请求)
CaesarBao 63b59cca10 新增获取等待任务逻辑
CaesarBao c2673fe083 新增任务查询业务
baogq e508d04eee Initial commit