From 8400a992fc8b7cdf8b1329fd569e7c7fd07675fb Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 18 Apr 2024 16:15:20 +0800 Subject: [PATCH] =?UTF-8?q?fix=20werks=E6=95=B0=E6=8D=AE=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs | 6 ++++-- Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index de376b0f..bcf897c1 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -211,7 +211,8 @@ public class OrderService : BaseOrderService, IOrderService IsOffline = request.IsOffline, IsCostCrossTenant = await GetSettingAsync(businessPlaceInfo.TenantId, CanteenSettingItemEnumType.AllowCrossTenant), - OriginTenantId = gainfo.Factory,//人员可能跨基地消费 + OriginTenantId = gainfo.Factory, + Werks = gainfo.Werks, //餐别异常处理 Status = BalanceRecordStatusEnumType.Valid, @@ -363,7 +364,8 @@ public class OrderService : BaseOrderService, IOrderService IsOffline = request.IsOffline, IsCostCrossTenant = await GetSettingAsync(businessPlaceInfo.TenantId, CanteenSettingItemEnumType.AllowCrossTenant), - OriginTenantId = gainfo.Factory,//人员可能跨基地消费 + OriginTenantId = gainfo.Factory, + Werks = gainfo.Werks, //餐别异常处理 Status = shift == null ? BalanceRecordStatusEnumType.Doubtful : BalanceRecordStatusEnumType.Valid, diff --git a/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs index 5f2ef274..6910ccef 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs @@ -147,6 +147,11 @@ public class BalanceRecordEntity : SugarBaseEntity, ISoftDeleted, ITenantId public string TenantId { get; set; } + /// + /// 人事范围 + /// + public string Werks { get; set; } + [SugarColumn(ColumnDataType = "bit")] public bool IsDeleted { get; set; }