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

fix 优化数据问题

Browse Source
This commit is contained in:
liguoyang
2024-04-16 12:36:21 +08:00
parent 8ee16d5e95
commit b51b93f273
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs
View File

@@ -35,13 +35,14 @@ public class DevicePageResponse
/// <summary>
/// 设备功能 DeviceFuncEnumType
/// </summary>
public List<DeviceFuncEnumType> Funcs
public List<string> Funcs
{
get
{
if (FuncsStr.IsEmpty()) FuncsStr = "[]";
return FuncsStr.ToObject<List<DeviceFuncEnumType>>();
var func = FuncsStr.ToObject<List<DeviceFuncEnumType>>();
return func.Select(x => x.GetDescription()).ToList();
}
}

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

@@ -169,19 +169,22 @@ public class BalanceService : IBalanceService
balanceInfo.Status = BalanceRecordStatusEnumType.Obsolute;
balanceInfo.Remark += request.Reason;
var newBalanceRecord = balanceInfo.Adapt<BalanceRecordEntity>();
newBalanceRecord.Id = 0;
newBalanceRecord.No = SnowFlakeHelper.Instance.NextId().ToString();
newBalanceRecord.Amount = request.Amount;
newBalanceRecord.Remark = balanceInfo.No + ":" + request.Reason;
newBalanceRecord.Status = BalanceRecordStatusEnumType.Valid;
await _dbContext.Client.Ado.BeginTranAsync();
try
{
await _dbContext.UpdateAsync(balanceInfo);
await _dbContext.InsertAsync(newBalanceRecord);
//不为空则插入记录
if (request.Amount != 0)
{
var newBalanceRecord = balanceInfo.Adapt<BalanceRecordEntity>();
newBalanceRecord.Id = 0;
newBalanceRecord.No = SnowFlakeHelper.Instance.NextId().ToString();
newBalanceRecord.Amount = request.Amount;
newBalanceRecord.Remark = balanceInfo.No + ":" + request.Reason;
newBalanceRecord.Status = BalanceRecordStatusEnumType.Valid;
await _dbContext.InsertAsync(newBalanceRecord);
}
await _dbContext.Client.Ado.CommitTranAsync();
}