diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs index 81b0f35e..7b086dac 100644 --- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs @@ -113,4 +113,9 @@ public class BalanceRecordResponse /// 厂区 /// public string Factory { get; set; } + + /// + /// 人事范围 + /// + public string Werks { get; set; } } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 86d3dddc..8510f382 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -73,7 +73,9 @@ public class BalanceService : IBalanceService BusinessPlaceName = bplace.Name, CostDateTime = record.CostDateTime, Factory = record.TenantId, + ShiftType = record.ShiftType, Remark = record.Remark, + Werks = ga.Werks }) .ToPageListAsync(request); @@ -259,7 +261,7 @@ public class BalanceService : IBalanceService { Id = record.Id, No = record.No, - CurrentAmount = record.Amount, + CurrentAmount = SqlFunc.Abs(record.Amount), CostDate = record.CostDate, UserNo = record.UserNo, UserCode = record.UserCode,