fix 处理营业点分配功能问题

This commit is contained in:
2024-07-02 15:53:55 +08:00
parent 38ab947790
commit 2cea51232f
9 changed files with 46 additions and 91 deletions

View File

@@ -1,4 +1,5 @@
using Dlhis.Basic.BusinessShift.Services;
using Dlhis.Basic.Device.Filters;
using Dlhis.Basic.Places.Request;
using Dlhis.Basic.Places.Response;
using Dlhis.Basic.Places.Services;
@@ -109,12 +110,12 @@ public class BusinessPlacesController : ControllerBase
/// <summary>
/// 根据营业点获取下面的设备
/// </summary>
/// <param name="request"></param>
/// <param name="code"></param>
/// <returns></returns>
[HttpGet("devicenos")]
public async Task<Pagination<DeviceCodeNameDetail>> GetDevicesByCode([FromQuery] BusinessPlaceGetByCodeRequest request)
[HttpGet("device/assignments")]
public async Task<List<DeviceCodeNameDetail>> GetAssignments(Guid code)
{
return await _businessPlaceShiftService.GetDevicesByCode(request);
return await _businessPlaceShiftService.GetAssignmentsAsync(code);
}
/// <summary>
@@ -122,9 +123,11 @@ public class BusinessPlacesController : ControllerBase
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost("disposition")]
public async Task DispositionDeviceAsync(DispositionDeviceRequest request)
[HttpPost("device/assign")]
[AssignPermissionLimit]
[DataPermission]
public async Task Assign(DispositionDeviceRequest request)
{
await _businessPlaceShiftService.DispositionDeviceAsync(request);
await _businessPlaceShiftService.AssignAsync(request);
}
}

View File

@@ -1,14 +0,0 @@
using System.ComponentModel.DataAnnotations;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Basic.Places.Request
{
public class BusinessPlaceGetByCodeRequest : PageDto
{
/// <summary>
/// 营业点号
/// </summary>
[Required(ErrorMessage = "营业点号不能为空")]
public string Code { get; set; }
}
}

View File

@@ -1,8 +1,7 @@
namespace Dlhis.Basic.Places.Response
namespace Dlhis.Basic.Places.Response;
public class DeviceCodeNameDetail
{
public class DeviceCodeNameDetail
{
public string UniqueNo { get; set; }
public string UniqueName { get; set; }
}
}
public string UniqueNo { get; set; }
public string UniqueName { get; set; }
}