yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

Browse Source
This commit is contained in:
liguoyang
2024-03-12 10:51:23 +08:00
parent a5f80a0ef4 f53ca84776
commit f7f6a8686f
7 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs
View File

@@ -104,4 +104,15 @@ public class BusinessPlacesController : ControllerBase
{
return await _businessPlaceShiftService.GetDevicesByCode(request);
}
/// <summary>
/// 营业点增加配置设备接口
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost("disposition")]
public async Task DispositionDeviceAsync([FromQuery] DispositionDeviceRequest request)
{
await _businessPlaceShiftService.DispositionDeviceAsync(request);
}
}

9
Src/Dlhis.Basic/BusinessPlace/Request/DispositionDeviceRequest.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Dlhis.Basic.BusinessPlace.Request
{
public class DispositionDeviceRequest
{
public string PlaceCode { get; set; }
public List<string> UniqueNos { get; set; }
}
}

2
Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs
View File

@@ -19,4 +19,6 @@ public interface IBusinessPlaceShiftService : IScopeDependency
Task<BusinessPlaceWithShiftResponse> GetShiftsByPlaceCustomCodeAsync(string placeCustomCode);
Task<Pagination<DeviceCodeNameDetail>> GetDevicesByCode(BusinessPlaceGetByCodeRequest request);
Task DispositionDeviceAsync(DispositionDeviceRequest request);
}

33
Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
View File

@@ -232,6 +232,39 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
return pagination;
}
public async Task DispositionDeviceAsync(DispositionDeviceRequest request)
{
var places = await _dbContext.Queryable<BusinessPlaceEntity>().ToListAsync();
var place = places.Where(x => x.Code.ToString() == request.PlaceCode).First();
place.ThrowIfNull($"{request.PlaceCode}:该营业点不存在");
var devices = await _dbContext.Queryable<DeviceEntity>().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<DeviceRegistryEntity>()
.Where(x => request.UniqueNos.Contains(x.DeviceUniqueNo))
.ToListAsync();
var list = new List<DeviceRegistryEntity>();
foreach (var regis in regiss)
{
regis.BusinessPlaceCode = place.Code;
regis.BusinessPlaceCustomCode = place.CustomCode;
list.Add(regis);
}
await _dbContext.UpdateAsync(list);
}
//*********************************************** help methods ***************************************************//
/// <summary>

11
Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
View File

@@ -181,17 +181,6 @@ public class BalancesController : ControllerBase
}
/// <summary>
/// 营业点增加配置设备接口
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost("disposition")]
public async Task DispositionDeviceAsync([FromQuery] DispositionDeviceRequest request)
{
await _balanceService.DispositionDeviceAsync(request);
}
/// <summary>
/// 电子餐券申请记录查询

2
Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
View File

@@ -33,8 +33,6 @@ public interface IBalanceService : IScopeDependency
Task<Pagination<DevicePageResponse>> GetConsumeDeviceAsync(GetConsumeDeviceRequest request);
Task DispositionDeviceAsync(DispositionDeviceRequest request);
Task<Pagination<OaEMealVoucherResponse>> GetOaEMealVoucherAsync([FromQuery] OaEMealVoucherRequest request);

32
Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
View File

@@ -854,38 +854,6 @@ public class BalanceService : IBalanceService
}
public async Task DispositionDeviceAsync(DispositionDeviceRequest request)
{
var places = await _dbContext.Queryable<BusinessPlaceEntity>().ToListAsync();
var place = places.Where(x => x.Code.ToString() == request.PlaceCode).First();
place.ThrowIfNull($"{request.PlaceCode}:该营业点不存在");
var devices = await _dbContext.Queryable<DeviceEntity>().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<DeviceRegistryEntity>()
.Where(x => request.UniqueNos.Contains(x.DeviceUniqueNo))
.ToListAsync();
var list = new List<DeviceRegistryEntity>();
foreach (var regis in regiss)
{
regis.BusinessPlaceCode = place.Code;
regis.BusinessPlaceCustomCode = place.CustomCode;
list.Add(regis);
}
await _dbContext.UpdateAsync(list);
}
public async Task<Pagination<OaEMealVoucherResponse>> GetOaEMealVoucherAsync(OaEMealVoucherRequest request)
{
var page = await _dbContext.Queryable<OaEMealVoucherEntity>()