From 6fcb73f7a98ea83a1e9161a2c00ae024772f97fe Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 14 Mar 2024 18:42:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=90=A5=E4=B8=9A=E7=82=B9=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86(=E6=89=BF=E5=8C=85?=
 =?UTF-8?q?=E5=95=86)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessPlace/Request/BusinessPlaceSaveRequest.cs      | 5 +++++
 .../BusinessPlace/Response/BusinessPlaceResponse.cs        | 6 ++++++
 .../Services/Implements/BusinessPlaceService.cs            | 5 +++--
 Src/Dlhis.Entity/Basic/Entity/BusinessPlaceEntity.cs       | 7 +++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceSaveRequest.cs b/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceSaveRequest.cs
index 15abe478..35c7cb27 100644
--- a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceSaveRequest.cs
+++ b/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceSaveRequest.cs
@@ -25,6 +25,11 @@ public class BusinessPlaceSaveRequest
     [Required(ErrorMessage = "营业点名称不能为空")]
     public string Name { get; set; }
 
+    /// <summary>
+    /// 供应商
+    /// </summary>
+    public string Supplier { get; set; }
+
     /// <summary>
     /// 状态 CanteenBusinessPlaceStatusEnumType
     /// </summary>
diff --git a/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceResponse.cs b/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceResponse.cs
index c954462a..ae186627 100644
--- a/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceResponse.cs
+++ b/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceResponse.cs
@@ -23,6 +23,12 @@ public class BusinessPlaceResponse
     /// </summary>
     public string Name { get; set; }
 
+
+    /// <summary>
+    /// 供应商
+    /// </summary>
+    public string Supplier { get; set; }
+
     /// <summary>
     /// 状态,停用/启用
     /// </summary>
diff --git a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs b/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs
index a49ecf44..17e4f88e 100644
--- a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs
+++ b/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs
@@ -25,7 +25,7 @@ public class BusinessPlaceService : IBusinessPlaceService
         var page = await _dbContext.Queryable<BusinessPlaceEntity>()
             .LeftJoin<BusinessPlaceShiftRelationshipEntity>((x, ps) => x.Code == ps.PlaceCode)
             .LeftJoin<BusinessShiftEntity>((x, ps, s) => s.Code == ps.ShiftCode)
-             .WhereIF(request.Search.IsPresent(), x => x.CustomCode.Contains(request.Search) 
+             .WhereIF(request.Search.IsPresent(), x => x.CustomCode.Contains(request.Search)
              || x.Code.ToString().Contains(request.Search) || x.Name.Contains(request.Search))
              .WhereIF(request.Catalog.HasValue, x => x.Catalog == request.Catalog)
              .WhereIF(request.Status.HasValue, x => x.Status == request.Status)
@@ -39,7 +39,7 @@ public class BusinessPlaceService : IBusinessPlaceService
                  Catalog = x.Catalog,
                  CustomCode = x.CustomCode,
                  Source = x.Source,
-
+                 Supplier = x.Supplier,
                  ShiftCode = s.Code,
                  ShiftName = s.Name
              })
@@ -65,6 +65,7 @@ public class BusinessPlaceService : IBusinessPlaceService
         if (!request.Id.HasValue)
         {
             var entity = request.Adapt<BusinessPlaceEntity>();
+            entity.CustomCode = request.CustomCode;
             entity.Code = Guid.NewGuid();
             await _dbContext.InsertAsync(entity);
         }
diff --git a/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceEntity.cs b/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceEntity.cs
index 866f030a..429930a1 100644
--- a/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceEntity.cs
@@ -1,6 +1,7 @@
 using Dlhis.Entity.Canteen.Enums;
 using Kurisu.Core.DataAccess.Entity;
 using Kurisu.SqlSugar;
+using Mapster;
 using SqlSugar;
 using SqlSugar.DbConvert;
 
@@ -21,9 +22,15 @@ public class BusinessPlaceEntity : SugarBaseEntity, ITenantId
     /// <summary>
     /// 自定义代号
     /// </summary>
+    [AdaptIgnore(MemberSide.Destination)]
     [SugarColumn(ColumnDescription = "自定义手工号")]
     public string CustomCode { get; set; }
 
+    /// <summary>
+    /// 供应商
+    /// </summary>
+    [SugarColumn(ColumnDescription = "供应商")]
+    public string Supplier { get; set; }
 
     /// <summary>
     /// 营业点名称