7 Commits (702d3dcba56c91f3193bf52db0326eeb6494e71c)

Author SHA1 Message Date
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
4 months ago
CaesarBao 0908de22e9 新增机械臂状态显示 4 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
4 months ago
SoulStar 4edefeec12 add - 添加六个接口(两个我方提供,四个向对方请求) 4 months ago
CaesarBao 63b59cca10 新增获取等待任务逻辑 5 months ago
CaesarBao c2673fe083 新增任务查询业务 5 months ago
baogq e508d04eee Initial commit 5 months ago