diff --git a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs index 887dfe09..09b347a6 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs +++ b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs @@ -104,4 +104,15 @@ public class BusinessPlacesController : ControllerBase { return await _businessPlaceShiftService.GetDevicesByCode(request); } + + /// + /// 营业点增加配置设备接口 + /// + /// + /// + [HttpPost("disposition")] + public async Task DispositionDeviceAsync([FromQuery] DispositionDeviceRequest request) + { + await _businessPlaceShiftService.DispositionDeviceAsync(request); + } } diff --git a/Src/Dlhis.Basic/BusinessPlace/Request/DispositionDeviceRequest.cs b/Src/Dlhis.Basic/BusinessPlace/Request/DispositionDeviceRequest.cs new file mode 100644 index 00000000..bf940fca --- /dev/null +++ b/Src/Dlhis.Basic/BusinessPlace/Request/DispositionDeviceRequest.cs @@ -0,0 +1,9 @@ +namespace Dlhis.Basic.BusinessPlace.Request +{ + public class DispositionDeviceRequest + { + public string PlaceCode { get; set; } + + public List UniqueNos { get; set; } + } +} diff --git a/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs index ba4e1114..e5808234 100644 --- a/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs +++ b/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs @@ -19,4 +19,6 @@ public interface IBusinessPlaceShiftService : IScopeDependency Task GetShiftsByPlaceCustomCodeAsync(string placeCustomCode); Task> GetDevicesByCode(BusinessPlaceGetByCodeRequest request); + + Task DispositionDeviceAsync(DispositionDeviceRequest request); } diff --git a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs index 6df8324d..ed7a576d 100644 --- a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs +++ b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs @@ -232,6 +232,39 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService return pagination; } + + public async Task DispositionDeviceAsync(DispositionDeviceRequest request) + { + var places = await _dbContext.Queryable().ToListAsync(); + var place = places.Where(x => x.Code.ToString() == request.PlaceCode).First(); + place.ThrowIfNull($"{request.PlaceCode}:该营业点不存在"); + + var devices = await _dbContext.Queryable().ToListAsync(); + + if (request.UniqueNos != null && request.UniqueNos.Count > 0) + { + foreach (var no in request.UniqueNos) + { + var device = devices.Where(x => x.UniqueNo == no).First(); + device.ThrowIfNull($"{no}:设备不存在"); + } + } + + var regiss = await _dbContext.Queryable() + .Where(x => request.UniqueNos.Contains(x.DeviceUniqueNo)) + .ToListAsync(); + + var list = new List(); + + foreach (var regis in regiss) + { + regis.BusinessPlaceCode = place.Code; + regis.BusinessPlaceCustomCode = place.CustomCode; + list.Add(regis); + } + await _dbContext.UpdateAsync(list); + } + //*********************************************** help methods ***************************************************// /// diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs index 0cbaa8ef..796f8e44 100644 --- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs +++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs @@ -181,17 +181,6 @@ public class BalancesController : ControllerBase } - /// - /// 营业点增加配置设备接口 - /// - /// - /// - [HttpPost("disposition")] - public async Task DispositionDeviceAsync([FromQuery] DispositionDeviceRequest request) - { - await _balanceService.DispositionDeviceAsync(request); - } - /// /// 电子餐券申请记录查询 diff --git a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs index 8302795d..d7d55ca4 100644 --- a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs @@ -33,8 +33,6 @@ public interface IBalanceService : IScopeDependency Task> GetConsumeDeviceAsync(GetConsumeDeviceRequest request); - Task DispositionDeviceAsync(DispositionDeviceRequest request); - Task> GetOaEMealVoucherAsync([FromQuery] OaEMealVoucherRequest request); diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 61d48341..e5748cef 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -854,38 +854,6 @@ public class BalanceService : IBalanceService } - public async Task DispositionDeviceAsync(DispositionDeviceRequest request) - { - var places = await _dbContext.Queryable().ToListAsync(); - var place = places.Where(x => x.Code.ToString() == request.PlaceCode).First(); - place.ThrowIfNull($"{request.PlaceCode}:该营业点不存在"); - - var devices = await _dbContext.Queryable().ToListAsync(); - - if (request.UniqueNos != null && request.UniqueNos.Count > 0) - { - foreach (var no in request.UniqueNos) - { - var device = devices.Where(x => x.UniqueNo == no).First(); - device.ThrowIfNull($"{no}:设备不存在"); - } - } - - var regiss = await _dbContext.Queryable() - .Where(x => request.UniqueNos.Contains(x.DeviceUniqueNo)) - .ToListAsync(); - - var list = new List(); - - foreach (var regis in regiss) - { - regis.BusinessPlaceCode = place.Code; - regis.BusinessPlaceCustomCode = place.CustomCode; - list.Add(regis); - } - await _dbContext.UpdateAsync(list); - } - public async Task> GetOaEMealVoucherAsync(OaEMealVoucherRequest request) { var page = await _dbContext.Queryable()