<modify>[normal]修改部分代码格式

This commit is contained in:
葛林强 2024-06-20 09:41:02 +08:00
parent acd744e046
commit 22fefead7c
47 changed files with 182 additions and 468 deletions

View File

@ -9,21 +9,19 @@ namespace WcsMain.ApiServe.Controllers.ThreeDController;
[ApiController] [ApiController]
public class TaskController(TaskService taskService) : ControllerBase public class TaskController(TaskService taskService) : ControllerBase
{ {
private readonly TaskService _taskService = taskService;
/// <summary> /// <summary>
/// 查询WMS任务 /// 查询WMS任务
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("getWmsTask")] [HttpGet("getWmsTask")]
public WcsApiResponse<List<AppWmsTask>> GetWmsTask() => _taskService.GetWmsTask(); public WcsApiResponse<List<AppWmsTask>> GetWmsTask() => taskService.GetWmsTask();
/// <summary> /// <summary>
/// 查询WMS任务 /// 查询WMS任务
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("getWmsTaskNotEnd")] [HttpGet("getWmsTaskNotEnd")]
public WcsApiResponse<List<AppWmsTask>> GetWmsTaskNoEnd() => _taskService.GetWmsTaskNoEnd(); public WcsApiResponse<List<AppWmsTask>> GetWmsTaskNoEnd() => taskService.GetWmsTaskNoEnd();
/// <summary> /// <summary>
/// 根据 plcId 查询任务 /// 根据 plcId 查询任务
@ -31,5 +29,5 @@ public class TaskController(TaskService taskService) : ControllerBase
/// <param name="plcId"></param> /// <param name="plcId"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("queryRunningTask")] [HttpGet("queryRunningTask")]
public WcsApiResponse<AppWcsTask> GetWcsTask([FromQuery(Name = "plcId")] int? plcId) => _taskService.GetWcsTask(plcId); public WcsApiResponse<AppWcsTask> GetWcsTask([FromQuery(Name = "plcId")] int? plcId) => taskService.GetWcsTask(plcId);
} }

View File

@ -13,12 +13,10 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
public class ApiAcceptController(ApiAcceptService apiAcceptService) : ControllerBase public class ApiAcceptController(ApiAcceptService apiAcceptService) : ControllerBase
{ {
private readonly ApiAcceptService _apiAcceptService = apiAcceptService;
/// <summary> /// <summary>
/// 查询所有的WCS任务 /// 查询所有的WCS任务
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost("getApiAcceptWithPage")] [HttpPost("getApiAcceptWithPage")]
public WcsApiResponse<List<AppApiAccept>> GetApiAcceptWithPage([FromBody] GetApiAcceptWithPageRequest request) => _apiAcceptService.GetApiAcceptWithPage(request); public WcsApiResponse<List<AppApiAccept>> GetApiAcceptWithPage([FromBody] GetApiAcceptWithPageRequest request) => apiAcceptService.GetApiAcceptWithPage(request);
} }

View File

@ -13,20 +13,18 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
public class ApiRequestController(ApiRequestService apiRequestService) : ControllerBase public class ApiRequestController(ApiRequestService apiRequestService) : ControllerBase
{ {
private readonly ApiRequestService _apiRequestService = apiRequestService;
/// <summary> /// <summary>
/// 查询所有的WCS请求其他系统的记录 /// 查询所有的WCS请求其他系统的记录
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("getApiRequest")] [HttpGet("getApiRequest")]
public WcsApiResponse<List<AppApiRequest>> GetApiRequest() => _apiRequestService.GetApiRequest(); public WcsApiResponse<List<AppApiRequest>> GetApiRequest() => apiRequestService.GetApiRequest();
/// <summary> /// <summary>
/// 查询所有的WCS任务 /// 查询所有的WCS任务
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost("getApiRequestWithPage")] [HttpPost("getApiRequestWithPage")]
public WcsApiResponse<List<AppApiRequest>> GetApiRequestWithPage([FromBody] GetApiRequestWithPageRequest request) => _apiRequestService.GetApiRequestWithPage(request); public WcsApiResponse<List<AppApiRequest>> GetApiRequestWithPage([FromBody] GetApiRequestWithPageRequest request) => apiRequestService.GetApiRequestWithPage(request);
} }

View File

@ -13,15 +13,13 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
public class ConfigController(ConfigService configService) : ControllerBase public class ConfigController(ConfigService configService) : ControllerBase
{ {
private readonly ConfigService _configService = configService;
/// <summary> /// <summary>
/// 查询配置项 /// 查询配置项
/// </summary> /// </summary>
/// <param name="configKey"></param> /// <param name="configKey"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("getConfig")] [HttpGet("getConfig")]
public WcsApiResponse<List<AppConfig>> GetConfig([FromQuery(Name = "configKey")] string? configKey) => _configService.GetConfig(configKey); public WcsApiResponse<List<AppConfig>> GetConfig([FromQuery(Name = "configKey")] string? configKey) => configService.GetConfig(configKey);
/// <summary> /// <summary>
/// 分页请求,获取配置项 /// 分页请求,获取配置项
@ -29,7 +27,7 @@ public class ConfigController(ConfigService configService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("getConfigWithPage")] [HttpPost("getConfigWithPage")]
public WcsApiResponse<List<AppConfig>> GetConfigWithPage([FromBody] GetConfigWithPageRequest request) => _configService.GetConfigWithPage(request); public WcsApiResponse<List<AppConfig>> GetConfigWithPage([FromBody] GetConfigWithPageRequest request) => configService.GetConfigWithPage(request);
/// <summary> /// <summary>
/// 添加或者修改配置项 /// 添加或者修改配置项
@ -37,5 +35,5 @@ public class ConfigController(ConfigService configService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("editeConfig")] [HttpPost("editeConfig")]
public WcsApiResponse EditeConfig([FromBody] EditeConfigRequest request) => _configService.EditeConfig(request); public WcsApiResponse EditeConfig([FromBody] EditeConfigRequest request) => configService.EditeConfig(request);
} }

View File

@ -16,14 +16,13 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
[WcsExceptionFilter] [WcsExceptionFilter]
public class ConveyTaskController(ConveyService conveyService) : ControllerBase public class ConveyTaskController(ConveyService conveyService) : ControllerBase
{ {
private readonly ConveyService _conveyService = conveyService;
/// <summary> /// <summary>
/// 分页查询箱式线任务 /// 分页查询箱式线任务
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost("queryConveyTaskWithPage")] [HttpPost("queryConveyTaskWithPage")]
public WcsApiResponse<int, List<AppConveyTask>> QueryConveyTaskWithPage([FromBody] QueryConveyTaskWithPageRequest request) => _conveyService.QueryConveyTaskWithPage(request); public WcsApiResponse<int, List<AppConveyTask>> QueryConveyTaskWithPage([FromBody] QueryConveyTaskWithPageRequest request) => conveyService.QueryConveyTaskWithPage(request);

View File

@ -19,19 +19,13 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
public class ElTagController(ElTagService elTagService) : ControllerBase public class ElTagController(ElTagService elTagService) : ControllerBase
{ {
private readonly ElTagService _elTagService = elTagService;
/// <summary> /// <summary>
/// 向标签发送显示数字 /// 向标签发送显示数字
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("showNum")] [HttpPost("showNum")]
public WcsApiResponse ShowNum([FromBody] ShowNumRequest request) public WcsApiResponse ShowNum([FromBody] ShowNumRequest request) => elTagService.ShowNum(request);
{
return _elTagService.ShowNum(request);
}
/// <summary> /// <summary>
/// 分页查询电子标签任务表 /// 分页查询电子标签任务表
@ -39,10 +33,7 @@ public class ElTagController(ElTagService elTagService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("queryTaskWithPage")] [HttpPost("queryTaskWithPage")]
public WcsApiResponse<int, List<AppElTagTask>> QueryTaskWithPage([FromBody] QueryTaskRequest request) public WcsApiResponse<int, List<AppElTagTask>> QueryTaskWithPage([FromBody] QueryTaskRequest request) => elTagService.QueryTaskWithPage(request);
{
return _elTagService.QueryTaskWithPage(request);
}
/// <summary> /// <summary>
/// 编辑电子标签任务信息 /// 编辑电子标签任务信息
@ -50,11 +41,7 @@ public class ElTagController(ElTagService elTagService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("editTaskInfo")] [HttpPost("editTaskInfo")]
public WcsApiResponse EditTaskInfo([FromBody] EditTaskInfoRequest request) public WcsApiResponse EditTaskInfo([FromBody] EditTaskInfoRequest request) => elTagService.EditTaskInfo(request);
{
return _elTagService.EditTaskInfo(request);
}
/// <summary> /// <summary>
/// 添加一个电子标签任务信息 /// 添加一个电子标签任务信息
@ -62,10 +49,7 @@ public class ElTagController(ElTagService elTagService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("addTask")] [HttpPost("addTask")]
public WcsApiResponse AddTaskInfo([FromBody] AddTaskInfoRequest request) public WcsApiResponse AddTaskInfo([FromBody] AddTaskInfoRequest request) => elTagService.AddTaskInfo(request);
{
return _elTagService.AddTaskInfo(request);
}
/// <summary> /// <summary>
/// 分页查询电子标签库位表 /// 分页查询电子标签库位表
@ -73,9 +57,6 @@ public class ElTagController(ElTagService elTagService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("queryLocationWithPage")] [HttpPost("queryLocationWithPage")]
public WcsApiResponse<int, List<AppElTagLocation>> QueryLocationWithPage([FromBody] QueryLocationWithPageRequest request) public WcsApiResponse<int, List<AppElTagLocation>> QueryLocationWithPage([FromBody] QueryLocationWithPageRequest request) => elTagService.QueryLocationWithPage(request);
{
return _elTagService.QueryLocationWithPage(request);
}
} }

View File

@ -16,18 +16,16 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
public class EquipmentController(EquipmentService equipmentService) : ControllerBase public class EquipmentController(EquipmentService equipmentService) : ControllerBase
{ {
private readonly EquipmentService _equipmentService = equipmentService;
[HttpGet("queryStackerInfo")] [HttpGet("queryStackerInfo")]
public WcsApiResponse<List<StackerStatusResponse>> GetStackerInfo() => _equipmentService.GetStackerInfo(); public WcsApiResponse<List<StackerStatusResponse>> GetStackerInfo() => equipmentService.GetStackerInfo();
/// <summary> /// <summary>
/// 查询库前输送机信息 /// 查询库前输送机信息
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("queryStackerConveyInfo")] [HttpGet("queryStackerConveyInfo")]
public WcsApiResponse<List<ConveyStatusResponse>> GetConveyInfo() => _equipmentService.GetConveyInfo(); public WcsApiResponse<List<ConveyStatusResponse>> GetConveyInfo() => equipmentService.GetConveyInfo();
/// <summary> /// <summary>
@ -36,7 +34,7 @@ public class EquipmentController(EquipmentService equipmentService) : Controller
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("resetStacker")] [HttpPost("resetStacker")]
public WcsApiResponse ResetStacker([FromBody] ResetStackerRequest request) => _equipmentService.ResetStacker(request); public WcsApiResponse ResetStacker([FromBody] ResetStackerRequest request) => equipmentService.ResetStacker(request);
/// <summary> /// <summary>
/// 堆垛机继续运行 /// 堆垛机继续运行
@ -44,5 +42,5 @@ public class EquipmentController(EquipmentService equipmentService) : Controller
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("stackerContinue")] [HttpPost("stackerContinue")]
public WcsApiResponse StackerContinue([FromBody] StackerContinueRequest request) => _equipmentService.StackerContinue(request); public WcsApiResponse StackerContinue([FromBody] StackerContinueRequest request) => equipmentService.StackerContinue(request);
} }

View File

@ -13,27 +13,19 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
public class LocationController(LocationService locationService) : ControllerBase public class LocationController(LocationService locationService) : ControllerBase
{ {
private readonly LocationService _locationService = locationService;
/// <summary> /// <summary>
/// 查询所有的点位状态 /// 查询所有的点位状态
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("getLocation")] [HttpGet("getLocation")]
public WcsApiResponse<List<AppLocation>> GetLocation() public WcsApiResponse<List<AppLocation>> GetLocation() => locationService.GetLocation();
{
return _locationService.GetLocation();
}
/// <summary> /// <summary>
/// 分页查询所有的点位状态 /// 分页查询所有的点位状态
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost("getLocationWithPage")] [HttpPost("getLocationWithPage")]
public WcsApiResponse<List<AppLocation>> GetLocationWithPage([FromBody] GetLocationWithPageRequest request) public WcsApiResponse<List<AppLocation>> GetLocationWithPage([FromBody] GetLocationWithPageRequest request) => locationService.GetLocationWithPage(request);
{
return _locationService.GetLocationWithPage(request);
}
/// <summary> /// <summary>
/// 更新点位信息 /// 更新点位信息
@ -41,8 +33,6 @@ public class LocationController(LocationService locationService) : ControllerBas
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("updateLocation")] [HttpPost("updateLocation")]
public WcsApiResponse UpdateLocation([FromBody] UpdateLocationRequest request) public WcsApiResponse UpdateLocation([FromBody] UpdateLocationRequest request) => locationService.UpdateLocation(request);
{
return _locationService.UpdateLocation(request);
}
} }

View File

@ -13,18 +13,13 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
public class MenuController(MenuService menuService) : ControllerBase public class MenuController(MenuService menuService) : ControllerBase
{ {
private readonly MenuService _menuService = menuService;
/// <summary> /// <summary>
/// 分页查询菜单 /// 分页查询菜单
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("getMenuWithPage")] [HttpPost("getMenuWithPage")]
public WcsApiResponse<List<AppMenu>> GetMenuWithPage([FromBody] GetMenuWithPageRequest request) public WcsApiResponse<List<AppMenu>> GetMenuWithPage([FromBody] GetMenuWithPageRequest request) => menuService.GetMenuWithPage(request);
{
return _menuService.GetMenuWithPage(request);
}
/// <summary> /// <summary>
/// 更新菜单信息 /// 更新菜单信息
@ -32,10 +27,7 @@ public class MenuController(MenuService menuService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("updateMenu")] [HttpPost("updateMenu")]
public WcsApiResponse UpdateMenu([FromBody] UpdateMenuRequest request) public WcsApiResponse UpdateMenu([FromBody] UpdateMenuRequest request) => menuService.UpdateMenu(request);
{
return _menuService.UpdateMenu(request);
}
/// <summary> /// <summary>
/// 添加菜单信息 /// 添加菜单信息
@ -43,10 +35,6 @@ public class MenuController(MenuService menuService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("addMenu")] [HttpPost("addMenu")]
public WcsApiResponse AddMenu([FromBody] AddMenuRequest request) public WcsApiResponse AddMenu([FromBody] AddMenuRequest request) => menuService.AddMenu(request);
{
return _menuService.AddMenu(request);
}
} }

View File

@ -13,17 +13,12 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
public class PlcController(PlcService plcService) : ControllerBase public class PlcController(PlcService plcService) : ControllerBase
{ {
private readonly PlcService _plcService = plcService;
/// <summary> /// <summary>
/// 查询plc /// 查询plc
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("getPlc")] [HttpGet("getPlc")]
public WcsApiResponse<List<AppPLC>> GetPlc() public WcsApiResponse<List<AppPLC>> GetPlc() => plcService.GetPlc();
{
return _plcService.GetPlc();
}
/// <summary> /// <summary>
/// 添加或者修改配置项 /// 添加或者修改配置项
@ -31,11 +26,7 @@ public class PlcController(PlcService plcService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("editePlc")] [HttpPost("editePlc")]
public WcsApiResponse EditePlc([FromBody] EditePLCRequest request) public WcsApiResponse EditePlc([FromBody] EditePLCRequest request) => plcService.EditePlc(request);
{
return _plcService.EditePlc(request);
}
/// <summary> /// <summary>
/// 添加或者修改配置项 /// 添加或者修改配置项
@ -43,8 +34,6 @@ public class PlcController(PlcService plcService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpDelete("deletePlc")] [HttpDelete("deletePlc")]
public WcsApiResponse DeletePlc([FromQuery(Name = "plcId")] int? plcId) public WcsApiResponse DeletePlc([FromQuery(Name = "plcId")] int? plcId) => plcService.DeletePlc(plcId);
{
return _plcService.DeletePlc(plcId);
}
} }

View File

@ -13,18 +13,12 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
public class PlcDbController(PlcDbService plcDbService) : ControllerBase public class PlcDbController(PlcDbService plcDbService) : ControllerBase
{ {
private readonly PlcDbService _plcDbService = plcDbService;
/// <summary> /// <summary>
/// 查询 db /// 查询 db
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("getDB")] [HttpGet("getDB")]
public WcsApiResponse<List<AppDB>> GetDB() public WcsApiResponse<List<AppDB>> GetDB() => plcDbService.GetDB();
{
return _plcDbService.GetDB();
}
/// <summary> /// <summary>
/// 添加或者修改db项 /// 添加或者修改db项
@ -32,10 +26,7 @@ public class PlcDbController(PlcDbService plcDbService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("addOrUpdate")] [HttpPost("addOrUpdate")]
public WcsApiResponse EditeDB([FromBody] EditeDBRequest request) public WcsApiResponse EditeDB([FromBody] EditeDBRequest request) => plcDbService.EditePlc(request);
{
return _plcDbService.EditePlc(request);
}
/// <summary> /// <summary>
/// 删除一个DB信息 /// 删除一个DB信息
@ -43,10 +34,7 @@ public class PlcDbController(PlcDbService plcDbService) : ControllerBase
/// <param name="dbName"></param> /// <param name="dbName"></param>
/// <returns></returns> /// <returns></returns>
[HttpDelete("deleteDB")] [HttpDelete("deleteDB")]
public WcsApiResponse DeleteDb([FromQuery(Name = "dbName")] string? dbName) public WcsApiResponse DeleteDb([FromQuery(Name = "dbName")] string? dbName) => plcDbService.DeleteDB(dbName);
{
return _plcDbService.DeleteDB(dbName);
}
/// <summary> /// <summary>
/// 查询 db 同时返回 PLC名称 /// 查询 db 同时返回 PLC名称
@ -54,9 +42,6 @@ public class PlcDbController(PlcDbService plcDbService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("getDBWithPlcName")] [HttpPost("getDBWithPlcName")]
public WcsApiResponse<List<GetDBWithPlcNameResponse>> GetDBWithPlcName(GetDBWithPlcNameRequest request) public WcsApiResponse<List<GetDBWithPlcNameResponse>> GetDBWithPlcName(GetDBWithPlcNameRequest request) => plcDbService.GetDBWithPlcName(request);
{
return _plcDbService.GetDBWithPlcName(request);
}
} }

View File

@ -11,22 +11,13 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
[WcsExceptionFilter] [WcsExceptionFilter]
public class RunningInfoController(RunningInfoService runningInfoService) : ControllerBase public class RunningInfoController(RunningInfoService runningInfoService) : ControllerBase
{ {
private readonly RunningInfoService _runningInfoService = runningInfoService;
/// <summary> /// <summary>
/// 获取日志的文件名称 /// 获取日志的文件名称
/// </summary> /// </summary>
/// <param name="logType"></param> /// <param name="logType"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("getLogFileName")] [HttpGet("getLogFileName")]
public WcsApiResponse<List<string>> GetLogFileName([FromQuery(Name = "logType")] string? logType) public WcsApiResponse<List<string>> GetLogFileName([FromQuery(Name = "logType")] string? logType) => runningInfoService.GetLogFileName(logType);
{
return _runningInfoService.GetLogFileName(logType);
}
/// <summary> /// <summary>
/// 验证下载文件是否存在 /// 验证下载文件是否存在
@ -34,11 +25,7 @@ public class RunningInfoController(RunningInfoService runningInfoService) : Cont
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("checkDownLoadLog")] [HttpPost("checkDownLoadLog")]
public WcsApiResponse CheckDownLoadLog([FromBody] LogRequest request) public WcsApiResponse CheckDownLoadLog([FromBody] LogRequest request) => runningInfoService.CheckDownLoadLog(request);
{
return _runningInfoService.CheckDownLoadLog(request);
}
/// <summary> /// <summary>
/// 下载文件 /// 下载文件
@ -46,10 +33,7 @@ public class RunningInfoController(RunningInfoService runningInfoService) : Cont
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("downLoadLog")] [HttpPost("downLoadLog")]
public FileContentResult DownLoadLog([FromBody] LogRequest request) public FileContentResult DownLoadLog([FromBody] LogRequest request) => runningInfoService.DownLoadLog(request, this);
{
return _runningInfoService.DownLoadLog(request, this);
}
} }

View File

@ -10,21 +10,13 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
[ApiController] [ApiController]
public class SettingController(SettingService settingService) : ControllerBase public class SettingController(SettingService settingService) : ControllerBase
{ {
private readonly SettingService _settingService = settingService;
/// <summary> /// <summary>
/// 查询设置项 /// 查询设置项
/// </summary> /// </summary>
/// <param name="settingKey"></param> /// <param name="settingKey"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("getSettings")] [HttpGet("getSettings")]
public WcsApiResponse<List<AppSettings>> GetConfig([FromQuery(Name = "settingKey")] string? settingKey) public WcsApiResponse<List<AppSettings>> GetConfig([FromQuery(Name = "settingKey")] string? settingKey) => settingService.GetConfig(settingKey);
{
return _settingService.GetConfig(settingKey);
}
/// <summary> /// <summary>
/// 添加或者修改配置项 /// 添加或者修改配置项
@ -32,8 +24,6 @@ public class SettingController(SettingService settingService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("editSettings")] [HttpPost("editSettings")]
public WcsApiResponse EditeConfig([FromBody] EditSettingsRequest request) public WcsApiResponse EditeConfig([FromBody] EditSettingsRequest request) => settingService.EditeConfig(request);
{
return _settingService.EditeConfig(request);
}
} }

View File

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using WcsMain.ApiServe.ControllerFilter.ExceptionFilter;
using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto;
using WcsMain.ApiServe.Controllers.Dto.WcsDto.Socket; using WcsMain.ApiServe.Controllers.Dto.WcsDto.Socket;
using WcsMain.ApiServe.Service.WcsService; using WcsMain.ApiServe.Service.WcsService;
@ -8,21 +9,15 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
[Route("api/wcs/socket")] [Route("api/wcs/socket")]
[ApiController] [ApiController]
[WcsExceptionFilter]
public class SocketController(SocketService socketService) : ControllerBase public class SocketController(SocketService socketService) : ControllerBase
{ {
private readonly SocketService _socketService = socketService;
/// <summary> /// <summary>
/// 查询 socket 连接信息 /// 查询 socket 连接信息
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("getSocket")] [HttpGet("getSocket")]
public WcsApiResponse<List<AppTcp>> GetDB() public WcsApiResponse<List<AppTcp>> GetDB() => socketService.GetDB();
{
return _socketService.GetDB();
}
/// <summary> /// <summary>
/// 编辑 socket /// 编辑 socket
@ -30,10 +25,7 @@ public class SocketController(SocketService socketService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("editSocket")] [HttpPost("editSocket")]
public WcsApiResponse EditSocket([FromBody] EditSocketRequest request) public WcsApiResponse EditSocket([FromBody] EditSocketRequest request) => socketService.EditSocket(request);
{
return _socketService.EditSocket(request);
}
/// <summary> /// <summary>
/// 删除一条信息 /// 删除一条信息
@ -41,8 +33,6 @@ public class SocketController(SocketService socketService) : ControllerBase
/// <param name="socketNoStr"></param> /// <param name="socketNoStr"></param>
/// <returns></returns> /// <returns></returns>
[HttpDelete("deleteSocket")] [HttpDelete("deleteSocket")]
public WcsApiResponse DeleteSocket([FromQuery(Name = "socketNo")] string? socketNoStr) public WcsApiResponse DeleteSocket([FromQuery(Name = "socketNo")] string? socketNoStr) => socketService.DeleteSocket(socketNoStr);
{
return _socketService.DeleteSocket(socketNoStr);
}
} }

View File

@ -12,29 +12,19 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
[WcsExceptionFilter] [WcsExceptionFilter]
public class StackerController(StackerService stackerService) : ControllerBase public class StackerController(StackerService stackerService) : ControllerBase
{ {
private readonly StackerService _stackerService = stackerService;
/// <summary> /// <summary>
/// 查询所有的 堆垛机信息 /// 查询所有的 堆垛机信息
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("getStacker")] [HttpGet("getStacker")]
public WcsApiResponse<List<AppStacker>> GetStacker() public WcsApiResponse<List<AppStacker>> GetStacker() => stackerService.GetStacker();
{
return _stackerService.GetStacker();
}
/// <summary> /// <summary>
/// 查询所有的 堆垛机状态信息 ---- 从设备返回 /// 查询所有的 堆垛机状态信息 ---- 从设备返回
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("getStackerStatus")] [HttpGet("getStackerStatus")]
public WcsApiResponse<List<GetStackerStatusResponse>> GetStackerStatus() public WcsApiResponse<List<GetStackerStatusResponse>> GetStackerStatus() => stackerService.GetStackerStatus();
{
return _stackerService.GetStackerStatus();
}
/// <summary> /// <summary>
/// 添加或者编辑堆垛机信息 /// 添加或者编辑堆垛机信息
@ -42,8 +32,6 @@ public class StackerController(StackerService stackerService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("editStacker")] [HttpPost("editStacker")]
public WcsApiResponse EditStacker([FromBody] EditStackerRequest request) public WcsApiResponse EditStacker([FromBody] EditStackerRequest request) => stackerService.EditStacker(request);
{
return _stackerService.EditStacker(request);
}
} }

View File

@ -12,9 +12,6 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
[WcsExceptionFilter] [WcsExceptionFilter]
public class UserController(UserService userService) : ControllerBase public class UserController(UserService userService) : ControllerBase
{ {
private readonly UserService _userService = userService;
/// <summary> /// <summary>
/// 用户登录 /// 用户登录
/// </summary> /// </summary>
@ -24,10 +21,7 @@ public class UserController(UserService userService) : ControllerBase
/// 若登录成功则返回用户名和用户菜单 /// 若登录成功则返回用户名和用户菜单
/// </remarks> /// </remarks>
[HttpPost("login")] [HttpPost("login")]
public WcsApiResponse<LoginResponse> Login([FromBody] LoginRequest request) public WcsApiResponse<LoginResponse> Login([FromBody] LoginRequest request) => userService.Login(request);
{
return _userService.Login(request);
}
/// <summary> /// <summary>
/// 分页查询所有用户信息 /// 分页查询所有用户信息
@ -35,10 +29,6 @@ public class UserController(UserService userService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("getUserWithPage")] [HttpPost("getUserWithPage")]
public WcsApiResponse<List<AppUser>> GetUserWithPage([FromBody] GetUserWithPageRequest request) public WcsApiResponse<List<AppUser>> GetUserWithPage([FromBody] GetUserWithPageRequest request) => userService.GetUserWithPage(request);
{
return _userService.GetUserWithPage(request);
}
} }

View File

@ -11,18 +11,12 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
public class UserGroupController(UserGroupService userGroupService) : ControllerBase public class UserGroupController(UserGroupService userGroupService) : ControllerBase
{ {
private readonly UserGroupService _userGroupService = userGroupService;
/// <summary> /// <summary>
/// 查询用户组 /// 查询用户组
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("getUserGroup")] [HttpGet("getUserGroup")]
public WcsApiResponse<List<AppUserGroup>> GetUserGroup() public WcsApiResponse<List<AppUserGroup>> GetUserGroup() => userGroupService.GetUserGroup();
{
return _userGroupService.GetUserGroup();
}
/// <summary> /// <summary>
/// 添加用户组 /// 添加用户组
@ -30,10 +24,7 @@ public class UserGroupController(UserGroupService userGroupService) : Controller
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("addUserGroup")] [HttpPost("addUserGroup")]
public WcsApiResponse AddUserGroup([FromBody] AddUserGroupRequest request) public WcsApiResponse AddUserGroup([FromBody] AddUserGroupRequest request) => userGroupService.AddUserGroup(request);
{
return _userGroupService.AddUserGroup(request);
}
/// <summary> /// <summary>
/// 删除用户组 /// 删除用户组
@ -41,10 +32,6 @@ public class UserGroupController(UserGroupService userGroupService) : Controller
/// <param name="groupId"></param> /// <param name="groupId"></param>
/// <returns></returns> /// <returns></returns>
[HttpDelete("deleteUserGroup")] [HttpDelete("deleteUserGroup")]
public WcsApiResponse DeleteUserGroup([FromQuery] string? groupId) public WcsApiResponse DeleteUserGroup([FromQuery] string? groupId) => userGroupService.DeleteUserGroup(groupId);
{
return _userGroupService.DeleteUserGroup(groupId);
}
} }

View File

@ -12,19 +12,12 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
[WcsExceptionFilter] [WcsExceptionFilter]
public class UserRuleController(UserRuleService userRuleService) : ControllerBase public class UserRuleController(UserRuleService userRuleService) : ControllerBase
{ {
private readonly UserRuleService _userRuleService = userRuleService;
/// <summary> /// <summary>
/// 获取用户权限 /// 获取用户权限
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("getUserRule")] [HttpGet("getUserRule")]
public WcsApiResponse<List<AppUserRule>> GetUserRule([FromQuery] string? groupId) public WcsApiResponse<List<AppUserRule>> GetUserRule([FromQuery] string? groupId) => userRuleService.GetUserRule(groupId);
{
return _userRuleService.GetUserRule(groupId);
}
/// <summary> /// <summary>
/// 更新用户权限 /// 更新用户权限
@ -32,8 +25,6 @@ public class UserRuleController(UserRuleService userRuleService) : ControllerBas
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("updateUserRule")] [HttpPost("updateUserRule")]
public WcsApiResponse UpdateUserRule([FromBody] UpdateUserRuleRequest request) public WcsApiResponse UpdateUserRule([FromBody] UpdateUserRuleRequest request) => userRuleService.UpdateUserRule(request);
{
return _userRuleService.UpdateUserRule(request);
}
} }

View File

@ -12,10 +12,6 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
[WcsExceptionFilter] [WcsExceptionFilter]
public class WcsTaskController(WcsTaskService wcsTaskService) : ControllerBase public class WcsTaskController(WcsTaskService wcsTaskService) : ControllerBase
{ {
private readonly WcsTaskService _wcsTaskService = wcsTaskService;
/// <summary> /// <summary>
/// 查询所有的正在运行的WCS任务 /// 查询所有的正在运行的WCS任务
/// </summary> /// </summary>
@ -23,7 +19,7 @@ public class WcsTaskController(WcsTaskService wcsTaskService) : ControllerBase
[HttpGet("getWcsTask")] [HttpGet("getWcsTask")]
public WcsApiResponse<List<AppWcsTask>> GetWcsTask() public WcsApiResponse<List<AppWcsTask>> GetWcsTask()
{ {
return _wcsTaskService.GetWcsTask(); return wcsTaskService.GetWcsTask();
} }
/// <summary> /// <summary>
@ -32,10 +28,7 @@ public class WcsTaskController(WcsTaskService wcsTaskService) : ControllerBase
/// <param name="taskId"></param> /// <param name="taskId"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("getWcsTaskWithTaskId")] [HttpGet("getWcsTaskWithTaskId")]
public WcsApiResponse<List<AppWcsTask>> GetWcsTaskWithTaskId([FromQuery(Name = "taskId")] string taskId) public WcsApiResponse<List<AppWcsTask>> GetWcsTaskWithTaskId([FromQuery(Name = "taskId")] string taskId) => wcsTaskService.GetWcsTaskWithTaskId(taskId);
{
return _wcsTaskService.GetWcsTaskWithTaskId(taskId);
}
/// <summary> /// <summary>
/// 分页查询正在运行的任务 /// 分页查询正在运行的任务
@ -43,10 +36,8 @@ public class WcsTaskController(WcsTaskService wcsTaskService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("getWcsTaskWithPage")] [HttpPost("getWcsTaskWithPage")]
public WcsApiResponse<List<AppWcsTask>> GetWcsTaskWithPage([FromBody] GetWcsTaskWithPageRequest request) public WcsApiResponse<List<AppWcsTask>> GetWcsTaskWithPage([FromBody] GetWcsTaskWithPageRequest request) => wcsTaskService.GetWcsTaskWithPage(request);
{
return _wcsTaskService.GetWcsTaskWithPage(request);
}
/// <summary> /// <summary>
/// 更新任务信息 /// 更新任务信息
@ -54,8 +45,6 @@ public class WcsTaskController(WcsTaskService wcsTaskService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("updateStatus")] [HttpPost("updateStatus")]
public WcsApiResponse UpdateWcsTaskStatus([FromBody] UpdateWcsTaskStatusRequest request) public WcsApiResponse UpdateWcsTaskStatus([FromBody] UpdateWcsTaskStatusRequest request) => wcsTaskService.UpdateWcsTaskStatus(request);
{
return _wcsTaskService.UpdateWcsTaskStatus(request);
}
} }

View File

@ -13,27 +13,19 @@ namespace WcsMain.ApiServe.Controllers.WcsController;
[WcsExceptionFilter] [WcsExceptionFilter]
public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase
{ {
private readonly WmsTaskService _wmsTaskService = wmsTaskService;
/// <summary> /// <summary>
/// 查询WMS任务 /// 查询WMS任务
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("getWmsTask")] [HttpGet("getWmsTask")]
public WcsApiResponse<List<AppWmsTask>> GetWmsTask() public WcsApiResponse<List<AppWmsTask>> GetWmsTask() => wmsTaskService.GetWmsTask();
{
return _wmsTaskService.GetWmsTask();
}
/// <summary> /// <summary>
/// 分页查询所有的Wms任务 /// 分页查询所有的Wms任务
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost("getWmsTaskWithPage")] [HttpPost("getWmsTaskWithPage")]
public WcsApiResponse<int, List<AppWmsTask>> GetWmsTaskWithPage([FromBody] GetWmsTaskWithPageRequest request) public WcsApiResponse<int, List<AppWmsTask>> GetWmsTaskWithPage([FromBody] GetWmsTaskWithPageRequest request) => wmsTaskService.GetWmsTaskWithPage(request);
{
return _wmsTaskService.GetWmsTaskWithPage(request);
}
/// <summary> /// <summary>
/// wcs前端向Wcs发送任务 /// wcs前端向Wcs发送任务
@ -41,10 +33,7 @@ public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("setStackerTask")] [HttpPost("setStackerTask")]
public WcsApiResponse GetStackerTask([FromBody] SetWmsTask request) public WcsApiResponse GetStackerTask([FromBody] SetWmsTask request) => wmsTaskService.GetStackerTask(request);
{
return _wmsTaskService.GetStackerTask(request);
}
/// <summary> /// <summary>
/// Wms向Wcs请求修改任务状态 /// Wms向Wcs请求修改任务状态
@ -52,9 +41,6 @@ public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("updateWmsTaskStatus")] [HttpPost("updateWmsTaskStatus")]
public WcsApiResponse UpdateStackerTaskStatus([FromBody] UpdateStackerTaskStatusRequest request) public WcsApiResponse UpdateStackerTaskStatus([FromBody] UpdateStackerTaskStatusRequest request) => wmsTaskService.UpdateStackerTaskStatus(request);
{
return _wmsTaskService.UpdateStackerTaskStatus(request);
}
} }

View File

@ -12,18 +12,20 @@ namespace WcsMain.ApiServe.Controllers.WmsController;
[WmsApiExceptionFilter] [WmsApiExceptionFilter]
public class ConveyController(ConveyService conveyService) : ControllerBase public class ConveyController(ConveyService conveyService) : ControllerBase
{ {
private readonly ConveyService _conveyService = conveyService;
/// <summary> /// <summary>
/// 接受上位系统发送过来的输送任务 /// 接受上位系统发送过来的输送任务
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("conveyTask")] [HttpPost("conveyTask")]
public WmsApiResponse GetConveyTask([FromBody] GetConveyTaskRequest request) => _conveyService.GetConveyTask(request); public WmsApiResponse GetConveyTask([FromBody] GetConveyTaskRequest request) => conveyService.GetConveyTask(request);
/// <summary>
/// 释放站台,放箱子离开
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost("disposeVehicle")] [HttpPost("disposeVehicle")]
public WmsApiResponse DisposeVehicle([FromBody] DisposeVehicleRequest request) => _conveyService.DisposeVehicle(request); public WmsApiResponse DisposeVehicle([FromBody] DisposeVehicleRequest request) => conveyService.DisposeVehicle(request);
} }

View File

@ -17,20 +17,12 @@ namespace WcsMain.ApiServe.Controllers.WmsController;
[WmsApiExceptionFilter] [WmsApiExceptionFilter]
public class ElTagController(ElTagService elTagService) : ControllerBase public class ElTagController(ElTagService elTagService) : ControllerBase
{ {
private readonly ElTagService _elTagService = elTagService;
/// <summary> /// <summary>
/// 接收 上位系统发来的 电子标签任务 /// 接收 上位系统发来的 电子标签任务
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("elTagTask")] [HttpPost("elTagTask")]
public WmsApiResponse GetElTagTask([FromBody] GetElTagTaskRequest request) public WmsApiResponse GetElTagTask([FromBody] GetElTagTaskRequest request) => elTagService.GetElTagTask(request);
{
return _elTagService.GetElTagTask(request);
}
} }

View File

@ -16,28 +16,20 @@ namespace WcsMain.ApiServe.Controllers.WmsController
public class EquipmentController(EquipmentService equipmentService) : ControllerBase public class EquipmentController(EquipmentService equipmentService) : ControllerBase
{ {
private readonly EquipmentService _equipmentService = equipmentService;
/// <summary> /// <summary>
/// 查询站台是否允许动作 /// 查询站台是否允许动作
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("queryStandStatus")] [HttpPost("queryStandStatus")]
public WmsApiResponse<QueryStandStatusResponse> QueryStandStatus([FromBody] QueryStandStatusRequest request) public WmsApiResponse<QueryStandStatusResponse> QueryStandStatus([FromBody] QueryStandStatusRequest request) => equipmentService.QueryStandStatus(request);
{
return _equipmentService.QueryStandStatus(request);
}
/// <summary> /// <summary>
/// 通知输送机卸货完成 /// 通知输送机卸货完成
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost("unloadSuccess")] [HttpPost("unloadSuccess")]
public WmsApiResponse UnloadSuccess() public WmsApiResponse UnloadSuccess() => equipmentService.UnloadSuccess();
{
return _equipmentService.UnloadSuccess();
}
} }
} }

View File

@ -16,20 +16,13 @@ namespace WcsMain.ApiServe.Controllers.WmsController;
[WmsApiExceptionFilter] [WmsApiExceptionFilter]
public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase
{ {
private readonly WmsTaskService _wmsTaskService = wmsTaskService;
/// <summary> /// <summary>
/// Wms向Wcs发送任务 /// Wms向Wcs发送任务
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("setStackerTask")] [HttpPost("setStackerTask")]
public WmsApiResponse<List<GetStackerRequest>> GetStackerTask([FromBody] List<GetStackerRequest> request) public WmsApiResponse<List<GetStackerRequest>> GetStackerTask([FromBody] List<GetStackerRequest> request) => wmsTaskService.GetStackerTask(request);
{
return _wmsTaskService.GetStackerTask(request);
}
/// <summary> /// <summary>
/// Wms向Wcs请求修改任务状态 /// Wms向Wcs请求修改任务状态
@ -37,10 +30,7 @@ public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("changeTaskStatus")] [HttpPost("changeTaskStatus")]
public WmsApiResponse UpdateStackerTaskStatus([FromBody] UpdateStackerTaskStatusRequest request) public WmsApiResponse UpdateStackerTaskStatus([FromBody] UpdateStackerTaskStatusRequest request) => wmsTaskService.UpdateStackerTaskStatus(request);
{
return _wmsTaskService.UpdateStackerTaskStatus(request);
}
/// <summary> /// <summary>
/// WMS向WCS发送任务新终点卸货位置有货的时候 /// WMS向WCS发送任务新终点卸货位置有货的时候
@ -48,13 +38,6 @@ public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("setStackerTaskNewDestination")] [HttpPost("setStackerTaskNewDestination")]
public WmsApiResponse GetStackerTaskNewDestination([FromBody] GetStackerTaskNewDestinationRequest request) public WmsApiResponse GetStackerTaskNewDestination([FromBody] GetStackerTaskNewDestinationRequest request) => wmsTaskService.GetStackerTaskNewDestination(request);
{
return _wmsTaskService.GetStackerTaskNewDestination(request);
}
} }

View File

@ -9,16 +9,13 @@ namespace WcsMain.ApiServe.Service.TreeDService;
[Service] [Service]
public class TaskService(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao) public class TaskService(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao)
{ {
private readonly AppWcsTaskDao _wcsTaskDao = wcsTaskDao;
private readonly AppWmsTaskDao _wmsTaskDao = wmsTaskDao;
/// <summary> /// <summary>
/// 查询WMS任务 /// 查询WMS任务
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppWmsTask>> GetWmsTask() public WcsApiResponse<List<AppWmsTask>> GetWmsTask()
{ {
List<AppWmsTask>? wmsTasks = _wmsTaskDao.SelectToWeb(); List<AppWmsTask>? wmsTasks = wmsTaskDao.SelectToWeb();
return WcsApiResponseFactory.Success(wmsTasks); return WcsApiResponseFactory.Success(wmsTasks);
} }
@ -28,7 +25,7 @@ public class TaskService(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao)
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppWmsTask>> GetWmsTaskNoEnd() public WcsApiResponse<List<AppWmsTask>> GetWmsTaskNoEnd()
{ {
List<AppWmsTask>? wmsTasks = _wmsTaskDao.SelectWmsTaskNotEnd(); List<AppWmsTask>? wmsTasks = wmsTaskDao.SelectWmsTaskNotEnd();
return WcsApiResponseFactory.Success(wmsTasks); return WcsApiResponseFactory.Success(wmsTasks);
} }
@ -43,7 +40,7 @@ public class TaskService(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao)
{ {
return WcsApiResponseFactory.RequestErr<AppWcsTask>(default, $"无法识别查询的 plcId ,值为:{plcId}"); return WcsApiResponseFactory.RequestErr<AppWcsTask>(default, $"无法识别查询的 plcId ,值为:{plcId}");
} }
List<AppWcsTask>? queryResult = _wcsTaskDao.Select(new AppWcsTask() { PlcId = plcId }); List<AppWcsTask>? queryResult = wcsTaskDao.Select(new AppWcsTask() { PlcId = plcId });
if (queryResult == default || queryResult.Count < 1) if (queryResult == default || queryResult.Count < 1)
{ {
return WcsApiResponseFactory.Fail<AppWcsTask>(default, $"未找到该 plcId 对应的任务,值为:{plcId}"); return WcsApiResponseFactory.Fail<AppWcsTask>(default, $"未找到该 plcId 对应的任务,值为:{plcId}");

View File

@ -10,8 +10,6 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class ApiAcceptService(AppApiAcceptDao apiAcceptDao) public class ApiAcceptService(AppApiAcceptDao apiAcceptDao)
{ {
private readonly AppApiAcceptDao _apiAcceptDao = apiAcceptDao;
/// <summary> /// <summary>
/// 分页查询API接收记录 /// 分页查询API接收记录
/// </summary> /// </summary>
@ -19,7 +17,7 @@ public class ApiAcceptService(AppApiAcceptDao apiAcceptDao)
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppApiAccept>> GetApiAcceptWithPage(GetApiAcceptWithPageRequest request) public WcsApiResponse<List<AppApiAccept>> GetApiAcceptWithPage(GetApiAcceptWithPageRequest request)
{ {
var (apiRequests, totalRows) = _apiAcceptDao.SelectPage(request); var (apiRequests, totalRows) = apiAcceptDao.SelectPage(request);
if(apiRequests == default) if(apiRequests == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppApiAccept>>(); return WcsApiResponseFactory.DataBaseErr<List<AppApiAccept>>();

View File

@ -10,15 +10,13 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class ApiRequestService(AppApiRequestDao apiRequestDao) public class ApiRequestService(AppApiRequestDao apiRequestDao)
{ {
private readonly AppApiRequestDao _apiRequestDao = apiRequestDao;
/// <summary> /// <summary>
/// 获取所有API请求记录 /// 获取所有API请求记录
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppApiRequest>> GetApiRequest() public WcsApiResponse<List<AppApiRequest>> GetApiRequest()
{ {
List<AppApiRequest>? apiRequests = _apiRequestDao.Select(); List<AppApiRequest>? apiRequests = apiRequestDao.Select();
if(apiRequests == default) if(apiRequests == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppApiRequest>>(); return WcsApiResponseFactory.DataBaseErr<List<AppApiRequest>>();
@ -33,7 +31,7 @@ public class ApiRequestService(AppApiRequestDao apiRequestDao)
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppApiRequest>> GetApiRequestWithPage(GetApiRequestWithPageRequest request) public WcsApiResponse<List<AppApiRequest>> GetApiRequestWithPage(GetApiRequestWithPageRequest request)
{ {
var (apiRequests, totalRows) = _apiRequestDao.SelectPage(request); var (apiRequests, totalRows) = apiRequestDao.SelectPage(request);
if(apiRequests == default) if(apiRequests == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppApiRequest>>(); return WcsApiResponseFactory.DataBaseErr<List<AppApiRequest>>();

View File

@ -11,8 +11,6 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class ConfigService(AppConfigDao configDao) public class ConfigService(AppConfigDao configDao)
{ {
private readonly AppConfigDao _configDao = configDao;
/// <summary> /// <summary>
/// 查询配置项,若查询参数为空则返回所有信息 /// 查询配置项,若查询参数为空则返回所有信息
/// </summary> /// </summary>
@ -20,7 +18,7 @@ public class ConfigService(AppConfigDao configDao)
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppConfig>> GetConfig(string? configKey) public WcsApiResponse<List<AppConfig>> GetConfig(string? configKey)
{ {
var configs = _configDao.GetAllConfig(configKey); var configs = configDao.GetAllConfig(configKey);
if(configs == default) if(configs == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppConfig>>(); return WcsApiResponseFactory.DataBaseErr<List<AppConfig>>();
@ -35,7 +33,7 @@ public class ConfigService(AppConfigDao configDao)
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppConfig>> GetConfigWithPage(GetConfigWithPageRequest request) public WcsApiResponse<List<AppConfig>> GetConfigWithPage(GetConfigWithPageRequest request)
{ {
var (configs, totalNumber) = _configDao.GetAllConfigWithPage(request); var (configs, totalNumber) = configDao.GetAllConfigWithPage(request);
if (configs == default) if (configs == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppConfig>>(); return WcsApiResponseFactory.DataBaseErr<List<AppConfig>>();
@ -66,12 +64,12 @@ public class ConfigService(AppConfigDao configDao)
}; };
if (request.IsEdite) // 修改信息 if (request.IsEdite) // 修改信息
{ {
var result = _configDao.Update(config); var result = configDao.Update(config);
return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }
else // 添加信息 else // 添加信息
{ {
var result = _configDao.Insert(config); var result = configDao.Insert(config);
return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }

View File

@ -10,8 +10,6 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class ConveyService(AppConveyTaskDao conveyTaskDao) public class ConveyService(AppConveyTaskDao conveyTaskDao)
{ {
private readonly AppConveyTaskDao _conveyTaskDao = conveyTaskDao;
/// <summary> /// <summary>
/// 分页查询箱式线任务 /// 分页查询箱式线任务
/// </summary> /// </summary>
@ -19,7 +17,7 @@ public class ConveyService(AppConveyTaskDao conveyTaskDao)
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<int, List<AppConveyTask>> QueryConveyTaskWithPage(QueryConveyTaskWithPageRequest request) public WcsApiResponse<int, List<AppConveyTask>> QueryConveyTaskWithPage(QueryConveyTaskWithPageRequest request)
{ {
(List<AppConveyTask>? conveyTasks, int totalRows) = _conveyTaskDao.QueryConveyTaskWithPage(request); (List<AppConveyTask>? conveyTasks, int totalRows) = conveyTaskDao.QueryConveyTaskWithPage(request);
if (conveyTasks == default) if (conveyTasks == default)
{ {
return WcsApiResponseFactory.DataBaseErr<int, List<AppConveyTask>>(); return WcsApiResponseFactory.DataBaseErr<int, List<AppConveyTask>>();

View File

@ -13,10 +13,6 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class ElTagService(AppElTagTaskDao tagTaskDao, DataBaseData dataBaseData, AppElTagLocationDao tagLocationDao) public class ElTagService(AppElTagTaskDao tagTaskDao, DataBaseData dataBaseData, AppElTagLocationDao tagLocationDao)
{ {
private readonly DataBaseData _dataBaseData = dataBaseData;
private readonly AppElTagTaskDao _tagTaskDao = tagTaskDao;
private readonly AppElTagLocationDao _tagLocationDao = tagLocationDao;
/// <summary> /// <summary>
/// 展示电子标签的数字 /// 展示电子标签的数字
/// </summary> /// </summary>
@ -34,7 +30,7 @@ public class ElTagService(AppElTagTaskDao tagTaskDao, DataBaseData dataBaseData,
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<int, List<AppElTagTask>> QueryTaskWithPage(QueryTaskRequest request) public WcsApiResponse<int, List<AppElTagTask>> QueryTaskWithPage(QueryTaskRequest request)
{ {
(List<AppElTagTask>? elTagTasks, int totalRows) = _tagTaskDao.QueryWithPage(request); (List<AppElTagTask>? elTagTasks, int totalRows) = tagTaskDao.QueryWithPage(request);
if (elTagTasks == default) if (elTagTasks == default)
{ {
return WcsApiResponseFactory.DataBaseErr<int, List<AppElTagTask>>(); return WcsApiResponseFactory.DataBaseErr<int, List<AppElTagTask>>();
@ -50,7 +46,7 @@ public class ElTagService(AppElTagTaskDao tagTaskDao, DataBaseData dataBaseData,
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<int, List<AppElTagLocation>> QueryLocationWithPage(QueryLocationWithPageRequest request) public WcsApiResponse<int, List<AppElTagLocation>> QueryLocationWithPage(QueryLocationWithPageRequest request)
{ {
(List<AppElTagLocation>? elTagLocations, int totalRows) = _tagLocationDao.QueryWithPage(request); (List<AppElTagLocation>? elTagLocations, int totalRows) = tagLocationDao.QueryWithPage(request);
if (elTagLocations == default) if (elTagLocations == default)
{ {
return WcsApiResponseFactory.DataBaseErr<int, List<AppElTagLocation>>(); return WcsApiResponseFactory.DataBaseErr<int, List<AppElTagLocation>>();
@ -88,7 +84,7 @@ public class ElTagService(AppElTagTaskDao tagTaskDao, DataBaseData dataBaseData,
elTagTask.Remark = "WCS变更信息 - 熄灭"; elTagTask.Remark = "WCS变更信息 - 熄灭";
break; break;
} }
var updateResult = _tagTaskDao.Update(elTagTask); var updateResult = tagTaskDao.Update(elTagTask);
return updateResult > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return updateResult > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }
@ -100,9 +96,9 @@ public class ElTagService(AppElTagTaskDao tagTaskDao, DataBaseData dataBaseData,
public WcsApiResponse AddTaskInfo(AddTaskInfoRequest request) public WcsApiResponse AddTaskInfo(AddTaskInfoRequest request)
{ {
if (!CheckData.CheckDataRules(request)) return WcsApiResponseFactory.RequestErr(); if (!CheckData.CheckDataRules(request)) return WcsApiResponseFactory.RequestErr();
if(string.IsNullOrEmpty(request.TaskId)) request.TaskId = _dataBaseData.GetNewUUID(); if(string.IsNullOrEmpty(request.TaskId)) request.TaskId = dataBaseData.GetNewUUID();
if(string.IsNullOrEmpty(request.TaskGroup)) request.TaskGroup = _dataBaseData.GetNewUUID2(); if(string.IsNullOrEmpty(request.TaskGroup)) request.TaskGroup = dataBaseData.GetNewUUID2();
var insertResult = _tagTaskDao.Insert(new AppElTagTask var insertResult = tagTaskDao.Insert(new AppElTagTask
{ {
TaskId = request.TaskId, TaskId = request.TaskId,
TaskGroup = request.TaskGroup, TaskGroup = request.TaskGroup,

View File

@ -11,15 +11,13 @@ namespace WcsMain.ApiServe.Service.WcsService;
public class LocationService(AppLocationDao locationDao) public class LocationService(AppLocationDao locationDao)
{ {
private readonly AppLocationDao _locationDao = locationDao;
/// <summary> /// <summary>
/// 查询所有的点位状态 /// 查询所有的点位状态
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppLocation>> GetLocation() public WcsApiResponse<List<AppLocation>> GetLocation()
{ {
List<AppLocation>? locations = _locationDao.Select(); List<AppLocation>? locations = locationDao.Select();
if (locations == default) if (locations == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppLocation>>(); return WcsApiResponseFactory.DataBaseErr<List<AppLocation>>();
@ -34,7 +32,7 @@ public class LocationService(AppLocationDao locationDao)
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppLocation>> GetLocationWithPage(GetLocationWithPageRequest request) public WcsApiResponse<List<AppLocation>> GetLocationWithPage(GetLocationWithPageRequest request)
{ {
(List<AppLocation>? locations, int totalRows) = _locationDao.SelectPage(request); (List<AppLocation>? locations, int totalRows) = locationDao.SelectPage(request);
if(locations == default) if(locations == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppLocation>>(); return WcsApiResponseFactory.DataBaseErr<List<AppLocation>>();
@ -66,7 +64,7 @@ public class LocationService(AppLocationDao locationDao)
Explain = request.Explain, Explain = request.Explain,
Remark = request.Remark Remark = request.Remark
}; };
var result = _locationDao.Update(updateEntity); var result = locationDao.Update(updateEntity);
return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }
} }

View File

@ -10,8 +10,6 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class MenuService(AppMenuDao menuDao) public class MenuService(AppMenuDao menuDao)
{ {
private readonly AppMenuDao _menuDao = menuDao;
/// <summary> /// <summary>
/// 分页查询菜单信息 /// 分页查询菜单信息
/// </summary> /// </summary>
@ -19,7 +17,7 @@ public class MenuService(AppMenuDao menuDao)
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppMenu>> GetMenuWithPage(GetMenuWithPageRequest request) public WcsApiResponse<List<AppMenu>> GetMenuWithPage(GetMenuWithPageRequest request)
{ {
var (menus, totalRows) = _menuDao.SelectPage(request); var (menus, totalRows) = menuDao.SelectPage(request);
if (menus == default) if (menus == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppMenu>>(); return WcsApiResponseFactory.DataBaseErr<List<AppMenu>>();
@ -46,7 +44,7 @@ public class MenuService(AppMenuDao menuDao)
MenuStatus = request.MenuStatus, MenuStatus = request.MenuStatus,
Remark = request.Remark Remark = request.Remark
}; };
var result = _menuDao.Update(menuData); var result = menuDao.Update(menuData);
return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }
@ -70,7 +68,7 @@ public class MenuService(AppMenuDao menuDao)
MenuStatus = request.MenuStatus, MenuStatus = request.MenuStatus,
Remark = request.Remark Remark = request.Remark
}; };
var result = _menuDao.Insert(menuData); var result = menuDao.Insert(menuData);
return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }

View File

@ -11,7 +11,6 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class PlcDbService(AppDBDao dBDao) public class PlcDbService(AppDBDao dBDao)
{ {
private readonly AppDBDao _dBDao = dBDao;
/// <summary> /// <summary>
/// 查询所有的Db地址信息 /// 查询所有的Db地址信息
@ -19,7 +18,7 @@ public class PlcDbService(AppDBDao dBDao)
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppDB>> GetDB() public WcsApiResponse<List<AppDB>> GetDB()
{ {
List<AppDB>? dbs = _dBDao.Select(); List<AppDB>? dbs = dBDao.Select();
if(dbs == default) if(dbs == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppDB>>(); return WcsApiResponseFactory.DataBaseErr<List<AppDB>>();
@ -49,7 +48,7 @@ public class PlcDbService(AppDBDao dBDao)
IsSystem = request.IsSystem, IsSystem = request.IsSystem,
Remark = request.Remark Remark = request.Remark
}; };
List<AppDB>? dBs = _dBDao.Select(new AppDB { DBName = request.DbName}); List<AppDB>? dBs = dBDao.Select(new AppDB { DBName = request.DbName});
if(dBs == default) if(dBs == default)
{ {
return WcsApiResponseFactory.DataBaseErr(); return WcsApiResponseFactory.DataBaseErr();
@ -57,13 +56,13 @@ public class PlcDbService(AppDBDao dBDao)
if (dBs.Count > 0) if (dBs.Count > 0)
{ {
// 修改信息 // 修改信息
var result = _dBDao.Update(db); var result = dBDao.Update(db);
return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }
else else
{ {
// 添加信息 // 添加信息
var result = _dBDao.Insert(db); var result = dBDao.Insert(db);
return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }
@ -80,7 +79,7 @@ public class PlcDbService(AppDBDao dBDao)
{ {
return WcsApiResponseFactory.RequestErr(); return WcsApiResponseFactory.RequestErr();
} }
var result = _dBDao.Delete(new AppDB() { DBName = dbName }); var result = dBDao.Delete(new AppDB() { DBName = dbName });
return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }

View File

@ -12,13 +12,9 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class PlcService(AppPLCDao pLCDao) public class PlcService(AppPLCDao pLCDao)
{ {
private readonly AppPLCDao _plcDao = pLCDao;
public WcsApiResponse<List<AppPLC>> GetPlc() public WcsApiResponse<List<AppPLC>> GetPlc()
{ {
List<AppPLC>? plcs = _plcDao.Query(); List<AppPLC>? plcs = pLCDao.Query();
if (plcs == default) if (plcs == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppPLC>>(); return WcsApiResponseFactory.DataBaseErr<List<AppPLC>>();
@ -51,7 +47,7 @@ public class PlcService(AppPLCDao pLCDao)
Remark = request.Remark Remark = request.Remark
}; };
/* 判断这个编号是否存在 */ /* 判断这个编号是否存在 */
List <AppPLC>? appPLCs = _plcDao.Query(new AppPLC { PLCId = request.PlcId}); List <AppPLC>? appPLCs = pLCDao.Query(new AppPLC { PLCId = request.PlcId});
if (appPLCs == default) if (appPLCs == default)
{ {
return WcsApiResponseFactory.DataBaseErr(); return WcsApiResponseFactory.DataBaseErr();
@ -59,13 +55,13 @@ public class PlcService(AppPLCDao pLCDao)
if (appPLCs.Count > 0) if (appPLCs.Count > 0)
{ {
// 修改信息 // 修改信息
var result = _plcDao.Update(plc); var result = pLCDao.Update(plc);
return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }
else else
{ {
// 添加信息 // 添加信息
var result = _plcDao.Insert(plc); var result = pLCDao.Insert(plc);
return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }
} }
@ -78,7 +74,7 @@ public class PlcService(AppPLCDao pLCDao)
public WcsApiResponse DeletePlc(int? plcId) public WcsApiResponse DeletePlc(int? plcId)
{ {
if(plcId == default) return WcsApiResponseFactory.RequestErr(); if(plcId == default) return WcsApiResponseFactory.RequestErr();
var result = _plcDao.Delete(new AppPLC { PLCId = plcId }); var result = pLCDao.Delete(new AppPLC { PLCId = plcId });
return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }
} }

View File

@ -11,9 +11,6 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class SettingService(AppSettingsDao settingsDao) public class SettingService(AppSettingsDao settingsDao)
{ {
private readonly AppSettingsDao _settingsDao = settingsDao;
/// <summary> /// <summary>
/// 根据键名查询设置项 /// 根据键名查询设置项
/// </summary> /// </summary>
@ -21,7 +18,7 @@ public class SettingService(AppSettingsDao settingsDao)
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppSettings>> GetConfig(string? settingKey) public WcsApiResponse<List<AppSettings>> GetConfig(string? settingKey)
{ {
List<AppSettings>? configs = _settingsDao.Select(new AppSettings() { SettingKey = settingKey }); List<AppSettings>? configs = settingsDao.Select(new AppSettings() { SettingKey = settingKey });
if(configs == default) if(configs == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppSettings>>(); return WcsApiResponseFactory.DataBaseErr<List<AppSettings>>();
@ -41,7 +38,7 @@ public class SettingService(AppSettingsDao settingsDao)
{ {
return WcsApiResponseFactory.RequestErr(); return WcsApiResponseFactory.RequestErr();
} }
int updateRows = _settingsDao.Update(new AppSettings() int updateRows = settingsDao.Update(new AppSettings()
{ {
SettingKey = request.SettingKey, SettingKey = request.SettingKey,
SettingName = request.SettingName, SettingName = request.SettingName,

View File

@ -12,16 +12,13 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class SocketService(AppTcpDao socketDao) public class SocketService(AppTcpDao socketDao)
{ {
private readonly AppTcpDao _socketDao = socketDao;
/// <summary> /// <summary>
/// 查询 socket 连接信息 /// 查询 socket 连接信息
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppTcp>> GetDB() public WcsApiResponse<List<AppTcp>> GetDB()
{ {
List<AppTcp>? sockets = _socketDao.Query(); List<AppTcp>? sockets = socketDao.Query();
if (sockets == default) if (sockets == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppTcp>>(); return WcsApiResponseFactory.DataBaseErr<List<AppTcp>>();
@ -58,14 +55,14 @@ public class SocketService(AppTcpDao socketDao)
TcpStatus = socketStatus, TcpStatus = socketStatus,
Remark = request.Remark, Remark = request.Remark,
}; };
int updateRows = _socketDao.Update(socket); int updateRows = socketDao.Update(socket);
return updateRows > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return updateRows > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }
else else
{ {
// 新增一条记录 // 新增一条记录
/* 校验这个编号是否已经存在 */ /* 校验这个编号是否已经存在 */
List<AppTcp>? checks = _socketDao.Query(new AppTcp() { TcpId = socketNo }); List<AppTcp>? checks = socketDao.Query(new AppTcp() { TcpId = socketNo });
if (checks == default) if (checks == default)
{ {
return WcsApiResponseFactory.DataBaseErr(); return WcsApiResponseFactory.DataBaseErr();
@ -83,7 +80,7 @@ public class SocketService(AppTcpDao socketDao)
TcpStatus = socketStatus, TcpStatus = socketStatus,
Remark = request.Remark, Remark = request.Remark,
}; };
int insertRows = _socketDao.Insert(socket); int insertRows = socketDao.Insert(socket);
return insertRows > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return insertRows > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }
} }
@ -101,7 +98,7 @@ public class SocketService(AppTcpDao socketDao)
return WcsApiResponseFactory.RequestErr(); return WcsApiResponseFactory.RequestErr();
} }
int socketNo = Convert.ToInt32(socketNoStr); int socketNo = Convert.ToInt32(socketNoStr);
int deleteRows = _socketDao.Delete(new AppTcp() { TcpId = socketNo }); int deleteRows = socketDao.Delete(new AppTcp() { TcpId = socketNo });
return deleteRows > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return deleteRows > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }
} }

View File

@ -13,17 +13,13 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class StackerService(AppStackerDao stackerDao, StackerOperation stackerOperation) public class StackerService(AppStackerDao stackerDao, StackerOperation stackerOperation)
{ {
private readonly AppStackerDao _stackerDao = stackerDao;
private readonly StackerOperation _stackerOperation = stackerOperation;
/// <summary> /// <summary>
/// 查询所有的 堆垛机信息 /// 查询所有的 堆垛机信息
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppStacker>> GetStacker() public WcsApiResponse<List<AppStacker>> GetStacker()
{ {
List<AppStacker>? stackers = _stackerDao.Select(new AppStacker()); List<AppStacker>? stackers = stackerDao.Select(new AppStacker());
if(stackers == default) if(stackers == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppStacker>>(); return WcsApiResponseFactory.DataBaseErr<List<AppStacker>>();
@ -37,7 +33,7 @@ public class StackerService(AppStackerDao stackerDao, StackerOperation stackerOp
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<GetStackerStatusResponse>> GetStackerStatus() public WcsApiResponse<List<GetStackerStatusResponse>> GetStackerStatus()
{ {
List<AppStacker>? stackers = _stackerDao.Select(new AppStacker()); List<AppStacker>? stackers = stackerDao.Select(new AppStacker());
if (stackers == default) if (stackers == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<GetStackerStatusResponse>>(); return WcsApiResponseFactory.DataBaseErr<List<GetStackerStatusResponse>>();
@ -53,7 +49,7 @@ public class StackerService(AppStackerDao stackerDao, StackerOperation stackerOp
ForkStatus = stacker.ForkStatus, ForkStatus = stacker.ForkStatus,
}; };
/* 获取堆垛机状态 */ /* 获取堆垛机状态 */
var (errMsg, stackerInfo) = _stackerOperation.GetStackerInfo((int)stacker.StackerId!); var (errMsg, stackerInfo) = stackerOperation.GetStackerInfo((int)stacker.StackerId!);
if(string.IsNullOrEmpty(errMsg) && stackerInfo != default) if(string.IsNullOrEmpty(errMsg) && stackerInfo != default)
{ {
stackerStatusResponse.Message = "查询成功"; stackerStatusResponse.Message = "查询成功";
@ -88,14 +84,14 @@ public class StackerService(AppStackerDao stackerDao, StackerOperation stackerOp
return WcsApiResponseFactory.RequestErr(); return WcsApiResponseFactory.RequestErr();
} }
/* 查询是否存在这个编号的堆垛机,若存在则更新数据,若不存在则添加 */ /* 查询是否存在这个编号的堆垛机,若存在则更新数据,若不存在则添加 */
List<AppStacker>? appStackers = _stackerDao.Select(new AppStacker { StackerId = request.StackerId }); List<AppStacker>? appStackers = stackerDao.Select(new AppStacker { StackerId = request.StackerId });
if (appStackers == default) if (appStackers == default)
{ {
return WcsApiResponseFactory.DataBaseErr(); return WcsApiResponseFactory.DataBaseErr();
} }
if (appStackers.Count == 0) // 没有数据,新增一条新的 if (appStackers.Count == 0) // 没有数据,新增一条新的
{ {
var insertResult = _stackerDao.Insert(new AppStacker var insertResult = stackerDao.Insert(new AppStacker
{ {
StackerId = request.StackerId, StackerId = request.StackerId,
StackerName = request.StackerName, StackerName = request.StackerName,
@ -110,7 +106,7 @@ public class StackerService(AppStackerDao stackerDao, StackerOperation stackerOp
} }
else // 存在,更新数据 else // 存在,更新数据
{ {
var updateResult = _stackerDao.Update(new AppStacker var updateResult = stackerDao.Update(new AppStacker
{ {
StackerId = request.StackerId, StackerId = request.StackerId,
StackerName = request.StackerName, StackerName = request.StackerName,

View File

@ -11,15 +11,13 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class UserGroupService(AppUserGroupDao userGroupDao) public class UserGroupService(AppUserGroupDao userGroupDao)
{ {
private readonly AppUserGroupDao _userGroupDao = userGroupDao;
/// <summary> /// <summary>
/// 查询用户组 /// 查询用户组
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppUserGroup>> GetUserGroup() public WcsApiResponse<List<AppUserGroup>> GetUserGroup()
{ {
var userGroup = _userGroupDao.Query(); var userGroup = userGroupDao.Query();
if(userGroup == default) if(userGroup == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppUserGroup>>(); return WcsApiResponseFactory.DataBaseErr<List<AppUserGroup>>();
@ -42,7 +40,7 @@ public class UserGroupService(AppUserGroupDao userGroupDao)
return WcsApiResponseFactory.RequestErr(); return WcsApiResponseFactory.RequestErr();
} }
// 检查该用户组是否存在 // 检查该用户组是否存在
List<AppUserGroup>? checkUserGroup = _userGroupDao.Query(new AppUserGroup { GroupId = request.GroupId }); List<AppUserGroup>? checkUserGroup = userGroupDao.Query(new AppUserGroup { GroupId = request.GroupId });
if (checkUserGroup == default) if (checkUserGroup == default)
{ {
return WcsApiResponseFactory.DataBaseErr(); return WcsApiResponseFactory.DataBaseErr();
@ -58,7 +56,7 @@ public class UserGroupService(AppUserGroupDao userGroupDao)
GroupName = request.GroupName, GroupName = request.GroupName,
GroupStatus = request.GroupStatus GroupStatus = request.GroupStatus
}; };
var result = _userGroupDao.Insert(userGroup); var result = userGroupDao.Insert(userGroup);
return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();
} }
@ -76,7 +74,7 @@ public class UserGroupService(AppUserGroupDao userGroupDao)
return WcsApiResponseFactory.RequestErr(); return WcsApiResponseFactory.RequestErr();
} }
// 检查该用户组是否存在 // 检查该用户组是否存在
List<AppUserGroup>? checkUserGroup = _userGroupDao.Query(new AppUserGroup { GroupId = groupId }); List<AppUserGroup>? checkUserGroup = userGroupDao.Query(new AppUserGroup { GroupId = groupId });
if (checkUserGroup == default) if (checkUserGroup == default)
{ {
return WcsApiResponseFactory.DataBaseErr(); return WcsApiResponseFactory.DataBaseErr();
@ -86,7 +84,7 @@ public class UserGroupService(AppUserGroupDao userGroupDao)
return WcsApiResponseFactory.DataRepetition("该用户组不存在"); return WcsApiResponseFactory.DataRepetition("该用户组不存在");
} }
// 删除用户组 // 删除用户组
var result = _userGroupDao.Delete(new AppUserGroup { GroupId = groupId }); var result = userGroupDao.Delete(new AppUserGroup { GroupId = groupId });
return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr();

View File

@ -11,15 +11,13 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class UserRuleService(AppUserRuleDao userRuleDao) public class UserRuleService(AppUserRuleDao userRuleDao)
{ {
private readonly AppUserRuleDao _userRuleDao = userRuleDao;
/// <summary> /// <summary>
/// 获取用户组权限 /// 获取用户组权限
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppUserRule>> GetUserRule(string? groupId) public WcsApiResponse<List<AppUserRule>> GetUserRule(string? groupId)
{ {
var userRule = _userRuleDao.Query(new AppUserRule() { GroupId = groupId }); var userRule = userRuleDao.Query(new AppUserRule() { GroupId = groupId });
if(userRule == default) if(userRule == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppUserRule>>(); return WcsApiResponseFactory.DataBaseErr<List<AppUserRule>>();
@ -39,7 +37,7 @@ public class UserRuleService(AppUserRuleDao userRuleDao)
{ {
return WcsApiResponseFactory.RequestErr(); return WcsApiResponseFactory.RequestErr();
} }
bool result = _userRuleDao.UpdateUserRule(request); bool result = userRuleDao.UpdateUserRule(request);
return result ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.Fail(); return result ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.Fail();
} }

View File

@ -12,9 +12,6 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class UserService(AppUserDao appUserDao, AppMenuDao menuDao) public class UserService(AppUserDao appUserDao, AppMenuDao menuDao)
{ {
private readonly AppUserDao _userDao = appUserDao;
private readonly AppMenuDao _menuDao = menuDao;
/// <summary> /// <summary>
/// 登录请求的具体实现 /// 登录请求的具体实现
/// </summary> /// </summary>
@ -30,7 +27,7 @@ public class UserService(AppUserDao appUserDao, AppMenuDao menuDao)
} }
string encryptPwd = Md5Encrypt.EncryptPassword(request.UserPassword); string encryptPwd = Md5Encrypt.EncryptPassword(request.UserPassword);
/* 判断用户账户ID和密码是否正确 */ /* 判断用户账户ID和密码是否正确 */
List<AppUser>? loginUser = _userDao.Query(new AppUser { UserId = request.UserId, UserPassword = encryptPwd }); List<AppUser>? loginUser = appUserDao.Query(new AppUser { UserId = request.UserId, UserPassword = encryptPwd });
if (loginUser == default) if (loginUser == default)
{ {
return WcsApiResponseFactory.DataBaseErr<LoginResponse>(); return WcsApiResponseFactory.DataBaseErr<LoginResponse>();
@ -51,7 +48,7 @@ public class UserService(AppUserDao appUserDao, AppMenuDao menuDao)
/// <returns></returns> /// <returns></returns>
private LoginResponse? GetUserMenu(AppUser user) private LoginResponse? GetUserMenu(AppUser user)
{ {
var menus = _menuDao.GetMenuWithGroupId(user.UserGroup!); var menus = menuDao.GetMenuWithGroupId(user.UserGroup!);
if (menus == default || menus.Count < 1) if (menus == default || menus.Count < 1)
{ {
return default; return default;
@ -99,7 +96,7 @@ public class UserService(AppUserDao appUserDao, AppMenuDao menuDao)
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppUser>> GetUserWithPage(GetUserWithPageRequest request) public WcsApiResponse<List<AppUser>> GetUserWithPage(GetUserWithPageRequest request)
{ {
var (users, total) = _userDao.QueryWithPage(request); var (users, total) = appUserDao.QueryWithPage(request);
return WcsApiResponseFactory.Success(users, total.ToString()); return WcsApiResponseFactory.Success(users, total.ToString());
} }

View File

@ -13,15 +13,13 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class WcsTaskService(AppWcsTaskDao wcsTaskDao) public class WcsTaskService(AppWcsTaskDao wcsTaskDao)
{ {
private readonly AppWcsTaskDao _wcsTaskDao = wcsTaskDao;
/// <summary> /// <summary>
/// 查询所有的Wcs任务列表 /// 查询所有的Wcs任务列表
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppWcsTask>> GetWcsTask() public WcsApiResponse<List<AppWcsTask>> GetWcsTask()
{ {
List<AppWcsTask>? wcsTasks = _wcsTaskDao.Select(); List<AppWcsTask>? wcsTasks = wcsTaskDao.Select();
if(wcsTasks == default) if(wcsTasks == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppWcsTask>>(); return WcsApiResponseFactory.DataBaseErr<List<AppWcsTask>>();
@ -37,7 +35,7 @@ public class WcsTaskService(AppWcsTaskDao wcsTaskDao)
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppWcsTask>> GetWcsTaskWithTaskId(string taskId) public WcsApiResponse<List<AppWcsTask>> GetWcsTaskWithTaskId(string taskId)
{ {
List<AppWcsTask>? wcsTasks = _wcsTaskDao.GetAllTasksWithBakData(taskId); List<AppWcsTask>? wcsTasks = wcsTaskDao.GetAllTasksWithBakData(taskId);
if (wcsTasks == default) if (wcsTasks == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppWcsTask>>(); return WcsApiResponseFactory.DataBaseErr<List<AppWcsTask>>();
@ -52,7 +50,7 @@ public class WcsTaskService(AppWcsTaskDao wcsTaskDao)
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppWcsTask>> GetWcsTaskWithPage([FromBody] GetWcsTaskWithPageRequest request) public WcsApiResponse<List<AppWcsTask>> GetWcsTaskWithPage([FromBody] GetWcsTaskWithPageRequest request)
{ {
(List<AppWcsTask>? wcsTasks, int totalRows) = _wcsTaskDao.SelectPage(request); (List<AppWcsTask>? wcsTasks, int totalRows) = wcsTaskDao.SelectPage(request);
if (wcsTasks == default) if (wcsTasks == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppWcsTask>>(); return WcsApiResponseFactory.DataBaseErr<List<AppWcsTask>>();
@ -72,7 +70,7 @@ public class WcsTaskService(AppWcsTaskDao wcsTaskDao)
{ {
return WcsApiResponseFactory.RequestErr(); return WcsApiResponseFactory.RequestErr();
} }
var taskData = _wcsTaskDao.Select(new AppWcsTask() { PlcId = request.PlcId }); var taskData = wcsTaskDao.Select(new AppWcsTask() { PlcId = request.PlcId });
if (taskData == default) if (taskData == default)
{ {
return WcsApiResponseFactory.DataBaseErr(); return WcsApiResponseFactory.DataBaseErr();
@ -81,7 +79,7 @@ public class WcsTaskService(AppWcsTaskDao wcsTaskDao)
{ {
return WcsApiResponseFactory.Fail("找不到该任务,可能该任务不存在或者已经完结"); return WcsApiResponseFactory.Fail("找不到该任务,可能该任务不存在或者已经完结");
} }
int updateRows = _wcsTaskDao.Update(new AppWcsTask() int updateRows = wcsTaskDao.Update(new AppWcsTask()
{ {
PlcId = request.PlcId, PlcId = request.PlcId,
TaskStatus = request.TaskStatus, TaskStatus = request.TaskStatus,

View File

@ -16,18 +16,13 @@ namespace WcsMain.ApiServe.Service.WcsService;
[Service] [Service]
public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDao, DataBaseData dataBaseData) public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDao, DataBaseData dataBaseData)
{ {
private readonly DataBaseData _dataBaseData = dataBaseData;
private readonly WmsTaskAction _wmsTaskAction = wmsTaskAction;
private readonly AppWmsTaskDao _wmsTaskDao = wmsTaskDao;
/// <summary> /// <summary>
/// 查询Wms 任务表 /// 查询Wms 任务表
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<List<AppWmsTask>> GetWmsTask() public WcsApiResponse<List<AppWmsTask>> GetWmsTask()
{ {
List<AppWmsTask>? wmsTasks = _wmsTaskDao.SelectToWeb(); List<AppWmsTask>? wmsTasks = wmsTaskDao.SelectToWeb();
if(wmsTasks == default) if(wmsTasks == default)
{ {
return WcsApiResponseFactory.DataBaseErr<List<AppWmsTask>>(); return WcsApiResponseFactory.DataBaseErr<List<AppWmsTask>>();
@ -43,7 +38,7 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa
/// <returns></returns> /// <returns></returns>
public WcsApiResponse<int, List<AppWmsTask>> GetWmsTaskWithPage(GetWmsTaskWithPageRequest request) public WcsApiResponse<int, List<AppWmsTask>> GetWmsTaskWithPage(GetWmsTaskWithPageRequest request)
{ {
(List<AppWmsTask>? wmsTasks, int totalRows) = _wmsTaskDao.SelectPage(request); (List<AppWmsTask>? wmsTasks, int totalRows) = wmsTaskDao.SelectPage(request);
if(wmsTasks == default) if(wmsTasks == default)
{ {
return WcsApiResponseFactory.DataBaseErr<int, List<AppWmsTask>>(); return WcsApiResponseFactory.DataBaseErr<int, List<AppWmsTask>>();
@ -58,7 +53,7 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa
/// <returns></returns> /// <returns></returns>
public WcsApiResponse GetStackerTask(SetWmsTask request) public WcsApiResponse GetStackerTask(SetWmsTask request)
{ {
request.TaskId = _dataBaseData.GetNewUUID(); request.TaskId = dataBaseData.GetNewUUID();
bool checkData = CheckData.CheckDataRules(request); bool checkData = CheckData.CheckDataRules(request);
if (!checkData) if (!checkData)
{ {
@ -82,8 +77,8 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa
CreatePerson = StaticString.WCS, CreatePerson = StaticString.WCS,
}; };
/* 插入任务数据 */ /* 插入任务数据 */
//int insertRows = _wmsTaskDao.Insert(wmsTasks.ToArray()); // ---- 直接插入任务数据 //int insertRows = wmsTaskDao.Insert(wmsTasks.ToArray()); // ---- 直接插入任务数据
int insertRows = _wmsTaskDao.InsertTaskAndMarkErr(wmsTask); // ---- 先清除这个料箱之前未作的任务,然后插入新数据 int insertRows = wmsTaskDao.InsertTaskAndMarkErr(wmsTask); // ---- 先清除这个料箱之前未作的任务,然后插入新数据
if (insertRows > 0) if (insertRows > 0)
{ {
return WcsApiResponseFactory.Success($"任务创建成功,任务号:{request.TaskId}"); return WcsApiResponseFactory.Success($"任务创建成功,任务号:{request.TaskId}");
@ -104,7 +99,7 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa
return WcsApiResponseFactory.RequestErr(); return WcsApiResponseFactory.RequestErr();
} }
/* 校验任务是否存在 */ /* 校验任务是否存在 */
var tasks = _wmsTaskDao.Select(new AppWmsTask { TaskId = request.TaskId }); var tasks = wmsTaskDao.Select(new AppWmsTask { TaskId = request.TaskId });
if (tasks == default) if (tasks == default)
{ {
// 查询失败 // 查询失败
@ -119,13 +114,13 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa
switch (status) switch (status)
{ {
case 0: case 0:
string resetErrText = _wmsTaskAction.ResetWmsTaskStatus(request.TaskId, request.Destination, StaticString.WCS); // 重置任务 string resetErrText = wmsTaskAction.ResetWmsTaskStatus(request.TaskId, request.Destination, StaticString.WCS); // 重置任务
return string.IsNullOrEmpty(resetErrText) ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.Fail(resetErrText); return string.IsNullOrEmpty(resetErrText) ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.Fail(resetErrText);
case 3: case 3:
string completeErrText = _wmsTaskAction.CompleteWmsTaskStatus(request.TaskId, StaticString.WCS); // 完成任务 string completeErrText = wmsTaskAction.CompleteWmsTaskStatus(request.TaskId, StaticString.WCS); // 完成任务
return string.IsNullOrEmpty(completeErrText) ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.Fail(completeErrText); return string.IsNullOrEmpty(completeErrText) ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.Fail(completeErrText);
case 999: case 999:
string deleteErrText = _wmsTaskAction.DeleteWmsTaskStatus(request.TaskId, StaticString.WCS); // 删除任务 string deleteErrText = wmsTaskAction.DeleteWmsTaskStatus(request.TaskId, StaticString.WCS); // 删除任务
return string.IsNullOrEmpty(deleteErrText) ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.Fail(deleteErrText); return string.IsNullOrEmpty(deleteErrText) ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.Fail(deleteErrText);
default: default:
return WcsApiResponseFactory.Fail($"任务状态不支持:任务状态:{request.TaskStatus}"); return WcsApiResponseFactory.Fail($"任务状态不支持:任务状态:{request.TaskStatus}");

View File

@ -15,10 +15,6 @@ namespace WcsMain.ApiServe.Service.WmsService;
[Service] [Service]
public class ConveyService(DataBaseData dataBaseData, AppConveyTaskDao conveyTaskDao, ConveyOperation conveyOperation) public class ConveyService(DataBaseData dataBaseData, AppConveyTaskDao conveyTaskDao, ConveyOperation conveyOperation)
{ {
private readonly DataBaseData _databseData = dataBaseData;
private readonly AppConveyTaskDao _conveyTaskDao = conveyTaskDao;
private readonly ConveyOperation _conveyOperation = conveyOperation;
/// <summary> /// <summary>
/// 接收WMS发送过来的输送线任务 /// 接收WMS发送过来的输送线任务
/// </summary> /// </summary>
@ -32,7 +28,7 @@ public class ConveyService(DataBaseData dataBaseData, AppConveyTaskDao conveyTas
} }
if (request.TaskGroup == default) if (request.TaskGroup == default)
{ {
request.TaskGroup = _databseData.GetNewUUID2(); // 当任务组为空时生成一个新的 request.TaskGroup = dataBaseData.GetNewUUID2(); // 当任务组为空时生成一个新的
} }
List<AppConveyTask> conveyTasks = []; List<AppConveyTask> conveyTasks = [];
DateTime now = DateTime.Now; DateTime now = DateTime.Now;
@ -40,7 +36,7 @@ public class ConveyService(DataBaseData dataBaseData, AppConveyTaskDao conveyTas
{ {
conveyTasks.Add(new AppConveyTask conveyTasks.Add(new AppConveyTask
{ {
TaskId = _databseData.GetNewUUID(), TaskId = dataBaseData.GetNewUUID(),
TaskGroup = request.TaskGroup, TaskGroup = request.TaskGroup,
VehicleNo = request.VehicleNo, VehicleNo = request.VehicleNo,
TaskType = request.TaskType, TaskType = request.TaskType,
@ -50,7 +46,7 @@ public class ConveyService(DataBaseData dataBaseData, AppConveyTaskDao conveyTas
CreateTime = now, CreateTime = now,
}); });
} }
var insertResult = _conveyTaskDao.Insert(conveyTasks); var insertResult = conveyTaskDao.Insert(conveyTasks);
return insertResult > 0 ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.DataBaseErr(); return insertResult > 0 ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.DataBaseErr();
} }
@ -62,7 +58,7 @@ public class ConveyService(DataBaseData dataBaseData, AppConveyTaskDao conveyTas
public WmsApiResponse DisposeVehicle(DisposeVehicleRequest request) public WmsApiResponse DisposeVehicle(DisposeVehicleRequest request)
{ {
if(string.IsNullOrEmpty(request.Location)) return WmsApiResponseFactory.RequestErr("存在必填项未填"); if(string.IsNullOrEmpty(request.Location)) return WmsApiResponseFactory.RequestErr("存在必填项未填");
var writeResult = _conveyOperation.DisposeVehicle(request.Location); var writeResult = conveyOperation.DisposeVehicle(request.Location);
if(string.IsNullOrEmpty(writeResult)) return WmsApiResponseFactory.Success(); if(string.IsNullOrEmpty(writeResult)) return WmsApiResponseFactory.Success();
return WmsApiResponseFactory.Fail(writeResult); return WmsApiResponseFactory.Fail(writeResult);
} }

View File

@ -14,9 +14,6 @@ namespace WcsMain.ApiServe.Service.WmsService;
[Service] [Service]
public class ElTagService(DataBaseData dataBaseData, AppElTagTaskDao elTagTaskDao) public class ElTagService(DataBaseData dataBaseData, AppElTagTaskDao elTagTaskDao)
{ {
private readonly DataBaseData _dataBaseData = dataBaseData;
private readonly AppElTagTaskDao _elTagTaskDao = elTagTaskDao;
/// <summary> /// <summary>
/// 接收电子标签任务 /// 接收电子标签任务
/// </summary> /// </summary>
@ -37,7 +34,7 @@ public class ElTagService(DataBaseData dataBaseData, AppElTagTaskDao elTagTaskDa
} }
if(request.TaskGroup == default) if(request.TaskGroup == default)
{ {
request.TaskGroup = _dataBaseData.GetNewUUID2(); request.TaskGroup = dataBaseData.GetNewUUID2();
} }
/* 插入任务 */ /* 插入任务 */
List<AppElTagTask> elTagTasks = []; List<AppElTagTask> elTagTasks = [];
@ -46,7 +43,7 @@ public class ElTagService(DataBaseData dataBaseData, AppElTagTaskDao elTagTaskDa
{ {
elTagTasks.Add(new AppElTagTask() elTagTasks.Add(new AppElTagTask()
{ {
TaskId = string.IsNullOrEmpty(elTagTask.TaskId) ? _dataBaseData.GetNewUUID() : elTagTask.TaskId, TaskId = string.IsNullOrEmpty(elTagTask.TaskId) ? dataBaseData.GetNewUUID() : elTagTask.TaskId,
TaskGroup = request.TaskGroup, TaskGroup = request.TaskGroup,
TaskType = request.TaskType, TaskType = request.TaskType,
Location = elTagTask.Location, Location = elTagTask.Location,
@ -60,7 +57,7 @@ public class ElTagService(DataBaseData dataBaseData, AppElTagTaskDao elTagTaskDa
CreateTime = now CreateTime = now
}); });
} }
var insertResult = _elTagTaskDao.Insert(elTagTasks.ToArray()); var insertResult = elTagTaskDao.Insert(elTagTasks.ToArray());
return insertResult > 0 ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.DataBaseErr(); return insertResult > 0 ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.DataBaseErr();
} }
} }

View File

@ -19,12 +19,8 @@ namespace WcsMain.ApiServe.Service.WmsService;
/// Wms任务接口逻辑 /// Wms任务接口逻辑
/// </summary> /// </summary>
[Service] [Service]
public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao) public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDao)
{ {
private readonly AppWmsTaskDao _wmsTaskDao = wmsTaskDao;
private readonly WmsTaskAction _wmsTaskAction = wmsTaskAction;
private readonly AppWcsTaskDao _wcsTaskDao = wcsTaskDao;
/// <summary> /// <summary>
/// 接收WMS任务数据处理 /// 接收WMS任务数据处理
/// </summary> /// </summary>
@ -101,7 +97,7 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa
foreach (var checkEntity in wmsTasks) foreach (var checkEntity in wmsTasks)
{ {
/* 检查任务号是否重复 */ /* 检查任务号是否重复 */
List<AppWmsTask>? checkSame = _wmsTaskDao.Select(new AppWmsTask() { TaskId = checkEntity.TaskId }); List<AppWmsTask>? checkSame = wmsTaskDao.Select(new AppWmsTask() { TaskId = checkEntity.TaskId });
if (checkSame == default) return WmsApiResponseFactory.DataBaseErr(errRequest); if (checkSame == default) return WmsApiResponseFactory.DataBaseErr(errRequest);
if (checkSame.Count > 0 || taskIds.Exists(e => e == checkEntity.TaskId)) if (checkSame.Count > 0 || taskIds.Exists(e => e == checkEntity.TaskId))
{ {
@ -110,8 +106,8 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa
taskIds.Add(checkEntity.TaskId); taskIds.Add(checkEntity.TaskId);
} }
/* 插入任务数据 */ /* 插入任务数据 */
//int insertRows = _wmsTaskDao.Insert(wmsTasks.ToArray()); // ---- 直接插入任务数据 //int insertRows = wmsTaskDao.Insert(wmsTasks.ToArray()); // ---- 直接插入任务数据
int insertRows = _wmsTaskDao.InsertTaskAndMarkErr([.. wmsTasks]); // ---- 先清除这个料箱之前未作的任务,然后插入新数据 int insertRows = wmsTaskDao.InsertTaskAndMarkErr([.. wmsTasks]); // ---- 先清除这个料箱之前未作的任务,然后插入新数据
if (insertRows > 0) return WmsApiResponseFactory.Success(errRequest, $"任务创建成功,任务号:{string.Join(',', taskIds)}"); if (insertRows > 0) return WmsApiResponseFactory.Success(errRequest, $"任务创建成功,任务号:{string.Join(',', taskIds)}");
return WmsApiResponseFactory.Fail(errRequest, "数据插入失败,请稍后重试或者联系我们"); return WmsApiResponseFactory.Fail(errRequest, "数据插入失败,请稍后重试或者联系我们");
} }
@ -135,20 +131,20 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa
bool checkData = CheckData.CheckDataRules(request); bool checkData = CheckData.CheckDataRules(request);
if (!checkData) return WmsApiResponseFactory.RequestErr(); if (!checkData) return WmsApiResponseFactory.RequestErr();
/* 校验任务是否存在 */ /* 校验任务是否存在 */
var tasks = _wmsTaskDao.Select(new AppWmsTask { TaskId = request.TaskId }); var tasks = wmsTaskDao.Select(new AppWmsTask { TaskId = request.TaskId });
if (tasks == default) return WmsApiResponseFactory.DataBaseErr(); // 数据库连接失败 if (tasks == default) return WmsApiResponseFactory.DataBaseErr(); // 数据库连接失败
if (tasks.Count == 0) return WmsApiResponseFactory.RequestErr($"任务:{request.TaskId} 不存在"); if (tasks.Count == 0) return WmsApiResponseFactory.RequestErr($"任务:{request.TaskId} 不存在");
int? status = request.TaskStatus; int? status = request.TaskStatus;
switch(status) switch(status)
{ {
case 0: case 0:
string resetErrText = _wmsTaskAction.ResetWmsTaskStatus(request.TaskId, request.Destination, StaticString.WMS); // 重置任务 string resetErrText = wmsTaskAction.ResetWmsTaskStatus(request.TaskId, request.Destination, StaticString.WMS); // 重置任务
return string.IsNullOrEmpty(resetErrText) ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.Fail(resetErrText); return string.IsNullOrEmpty(resetErrText) ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.Fail(resetErrText);
case 2: case 2:
string completeErrText = _wmsTaskAction.CompleteWmsTaskStatus(request.TaskId, StaticString.WMS); // 完成任务 string completeErrText = wmsTaskAction.CompleteWmsTaskStatus(request.TaskId, StaticString.WMS); // 完成任务
return string.IsNullOrEmpty(completeErrText) ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.Fail(completeErrText); return string.IsNullOrEmpty(completeErrText) ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.Fail(completeErrText);
case 1: case 1:
string deleteErrText = _wmsTaskAction.DeleteWmsTaskStatus(request.TaskId, StaticString.WMS); // 删除任务 string deleteErrText = wmsTaskAction.DeleteWmsTaskStatus(request.TaskId, StaticString.WMS); // 删除任务
return string.IsNullOrEmpty(deleteErrText) ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.Fail(deleteErrText); return string.IsNullOrEmpty(deleteErrText) ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.Fail(deleteErrText);
default: default:
return WmsApiResponseFactory.RequestErr($"不支持的任务状态:{request.TaskStatus}"); return WmsApiResponseFactory.RequestErr($"不支持的任务状态:{request.TaskStatus}");

View File

@ -7,8 +7,6 @@ namespace WcsMain.StartAction;
/// </summary> /// </summary>
public class HostService(ServiceStart serverStart) : IHostedLifecycleService public class HostService(ServiceStart serverStart) : IHostedLifecycleService
{ {
private readonly ServiceStart _serverStart = serverStart;
public Task StartAsync(CancellationToken cancellationToken) public Task StartAsync(CancellationToken cancellationToken)
{ {
return Task.CompletedTask; return Task.CompletedTask;
@ -23,7 +21,7 @@ public class HostService(ServiceStart serverStart) : IHostedLifecycleService
{ {
return Task.Run(() => return Task.Run(() =>
{ {
_serverStart.LoadingData(); // 加载必要参数 serverStart.LoadingData(); // 加载必要参数
string? loadingResult = LoadingRunningData.GetResult(); string? loadingResult = LoadingRunningData.GetResult();
if (!string.IsNullOrEmpty(loadingResult)) if (!string.IsNullOrEmpty(loadingResult))
{ {
@ -43,7 +41,7 @@ public class HostService(ServiceStart serverStart) : IHostedLifecycleService
} }
else else
{ {
_serverStart.Start(); serverStart.Start();
} }
ConsoleLog.Success("WCS服务启动完成"); ConsoleLog.Success("WCS服务启动完成");
}, cancellationToken); }, cancellationToken);

View File

@ -21,17 +21,6 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs
AppStackerDao appStackerDao, AppLocationDao appLocationDao, AppConfigDao appConfigDao, ConnectPlcServe connectPlcServe, AppStackerDao appStackerDao, AppLocationDao appLocationDao, AppConfigDao appConfigDao, ConnectPlcServe connectPlcServe,
ConnectOprServe connectOprServe, AppElTagLocationDao appElTagBaseDao, AppConveyStandDao conveyStandDao) ConnectOprServe connectOprServe, AppElTagLocationDao appElTagBaseDao, AppConveyStandDao conveyStandDao)
{ {
private readonly AppConfigDao _appconfigDao = appConfigDao;
private readonly AppLocationDao _applocationDao = appLocationDao;
private readonly AppStackerDao _appStackerDao = appStackerDao;
private readonly SocketOperation _socketOperation = socketOperation;
private readonly ConnectPLCs _connectPlcs = connectPLCs;
private readonly WcsCirculation _wcsCirculation = wcsCirculation;
private readonly ConnectPlcServe _connectPlcServe = connectPlcServe;
private readonly ConnectOprServe _connectOprServe = connectOprServe;
private readonly AppElTagLocationDao _appElTagBaseDao = appElTagBaseDao;
private readonly AppConveyStandDao _conveyStandDao = conveyStandDao;
private static string _errMsg = string.Empty; private static string _errMsg = string.Empty;
/// <summary> /// <summary>
@ -73,7 +62,7 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs
{ {
if (CommonData.AppConfig.UseConnectPlc == "1") // 1 表示允许连接PLC if (CommonData.AppConfig.UseConnectPlc == "1") // 1 表示允许连接PLC
{ {
_connectPlcs.ConnectPlc(); connectPLCs.ConnectPlc();
} }
} }
@ -84,7 +73,7 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs
{ {
if (CommonData.AppConfig.UseSocket == "1") // 1 表示允许开启Socket if (CommonData.AppConfig.UseSocket == "1") // 1 表示允许开启Socket
{ {
_socketOperation.Connect(); socketOperation.Connect();
} }
} }
@ -95,8 +84,8 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs
{ {
if (CommonData.AppConfig.UseOpr == "1") // 1 表示允许连接电子标签 if (CommonData.AppConfig.UseOpr == "1") // 1 表示允许连接电子标签
{ {
_connectOprServe.SetBaseAction(); connectOprServe.SetBaseAction();
_connectOprServe.Connect(); connectOprServe.Connect();
} }
} }
@ -104,8 +93,8 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs
public void CreateTcpClient() public void CreateTcpClient()
{ {
_connectPlcServe.SetBaseAction(); connectPlcServe.SetBaseAction();
_connectPlcServe.ConnectPlc(); connectPlcServe.ConnectPlc();
} }
@ -116,15 +105,15 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs
{ {
if (CommonData.AppConfig.UseCirculation == "1") // 1 表示允许开启 定时器 if (CommonData.AppConfig.UseCirculation == "1") // 1 表示允许开启 定时器
{ {
_wcsCirculation.ExceptionHandler += (methodDescription, ex) => wcsCirculation.ExceptionHandler += (methodDescription, ex) =>
{ {
ConsoleLog.Error($"定时器:{methodDescription} 发生异常,异常信息:{ex}"); ConsoleLog.Error($"定时器:{methodDescription} 发生异常,异常信息:{ex}");
}; };
_wcsCirculation.MessageHandler += (msg) => wcsCirculation.MessageHandler += (msg) =>
{ {
//ConsoleLog.Tip(msg); //ConsoleLog.Tip(msg);
}; };
_wcsCirculation.StartAssemblyCirculation(GetType().Assembly); wcsCirculation.StartAssemblyCirculation(GetType().Assembly);
} }
} }
@ -136,7 +125,7 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs
{ {
if (!string.IsNullOrEmpty(_errMsg)) return; if (!string.IsNullOrEmpty(_errMsg)) return;
//ConsoleLog.Info("正在加载数据库配置信息..."); //ConsoleLog.Info("正在加载数据库配置信息...");
List<AppConfig>? Configs = _appconfigDao.Query(); List<AppConfig>? Configs = appConfigDao.Query();
if (Configs == default) if (Configs == default)
{ {
_errMsg = "加载 Config 资源失败,请检查数据库服务器连接是否正常"; _errMsg = "加载 Config 资源失败,请检查数据库服务器连接是否正常";
@ -171,7 +160,7 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs
{ {
if (!string.IsNullOrEmpty(_errMsg)) return; if (!string.IsNullOrEmpty(_errMsg)) return;
//ConsoleLog.Info("正在加载堆垛机参数信息..."); //ConsoleLog.Info("正在加载堆垛机参数信息...");
List<AppStacker>? appStackers = _appStackerDao.Select(); List<AppStacker>? appStackers = appStackerDao.Select();
if (appStackers == default) if (appStackers == default)
{ {
_errMsg = "加载堆垛机参数信息失败,请检查数据库服务器连接是否正常"; _errMsg = "加载堆垛机参数信息失败,请检查数据库服务器连接是否正常";
@ -189,7 +178,7 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs
{ {
if (!string.IsNullOrEmpty(_errMsg)) return; if (!string.IsNullOrEmpty(_errMsg)) return;
//ConsoleLog.Info("正在加载库位信息..."); //ConsoleLog.Info("正在加载库位信息...");
List<AppLocation>? appLocations = _applocationDao.Select(); List<AppLocation>? appLocations = appLocationDao.Select();
if (appLocations == default) if (appLocations == default)
{ {
_errMsg = "加载库位信息失败,请检查数据库服务器连接是否正常"; _errMsg = "加载库位信息失败,请检查数据库服务器连接是否正常";
@ -206,7 +195,7 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs
{ {
if (!string.IsNullOrEmpty(_errMsg)) return; if (!string.IsNullOrEmpty(_errMsg)) return;
//ConsoleLog.Info("正在电子标签基础资料信息..."); //ConsoleLog.Info("正在电子标签基础资料信息...");
List<AppElTagLocation>? eltags = _appElTagBaseDao.Query(); List<AppElTagLocation>? eltags = appElTagBaseDao.Query();
if (eltags == default) if (eltags == default)
{ {
_errMsg = "加载电子标签基础信息失败,请检查数据库服务器连接是否正常"; _errMsg = "加载电子标签基础信息失败,请检查数据库服务器连接是否正常";
@ -224,7 +213,7 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs
{ {
if (!string.IsNullOrEmpty(_errMsg)) return; if (!string.IsNullOrEmpty(_errMsg)) return;
//ConsoleLog.Info("正在加载输送线基础资料信息..."); //ConsoleLog.Info("正在加载输送线基础资料信息...");
List<AppConveyStand>? appConveyStands = _conveyStandDao.Query(); List<AppConveyStand>? appConveyStands = conveyStandDao.Query();
if (appConveyStands == default) if (appConveyStands == default)
{ {
_errMsg = "加载输送线站台基础资料信息失败,请检查数据库服务器连接是否正常"; _errMsg = "加载输送线站台基础资料信息失败,请检查数据库服务器连接是否正常";