23 Commits (9b1e7f447ec1122f6e783d0c861fdbe1e08ebf0b)
 

Author SHA1 Message Date
CaesarBao 9b1e7f447e 合并代码 4 months ago
CaesarBao 3730109cf6 合并代码 4 months ago
CaesarBao c7d55e9fc0 合并 4 months ago
CaesarBao be7cf5e199 提交 4 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
4 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
4 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
4 months ago
SoulStar d0c0083986 add - 添加报文长度判断,更改日志路径 4 months ago
SoulStar 0b6b31a706 add - TCP信号接收 4 months ago
CaesarBao 0908de22e9 新增机械臂状态显示 4 months ago
SoulStar 2feda5b29b add - 添加状态请求数据库插入 4 months ago
SoulStar fd50736e08 debug - 数据库连不上问题解决 4 months ago
SoulStar ef1c87e84e change - 修改报错 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 9419ec6e28 add - 接口测试方法 4 months ago
SoulStar 4edefeec12 add - 添加六个接口(两个我方提供,四个向对方请求) 4 months ago
CaesarBao 63b59cca10 新增获取等待任务逻辑 5 months ago
wenjy d66333989c change - Index页面参数绑定 5 months ago
CaesarBao bd30cb1446 提交数据库 5 months ago
CaesarBao c2673fe083 新增任务查询业务 5 months ago
wenjy 4c4d214185 add - 监控界面 5 months ago
CaesarBao 4747aa7413 框架搭建 5 months ago
baogq e508d04eee Initial commit 5 months ago