From 5f9399969946968b94a0888652ca9e5b53f86adb Mon Sep 17 00:00:00 2001
From: zhaoxinyu <89237069@qq.com>
Date: Fri, 15 Mar 2024 09:01:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseDatas/EquipmentController.cs          | 23 ++++++++++++++++++-
 .../Equipments/IEquipmentLocAppService.cs     |  2 +-
 .../Equipments/EquipmentLocAppService.cs      | 17 +++++++++++---
 .../Equipments/EquipmentPartCode.cs           |  6 +----
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/EquipmentController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/EquipmentController.cs
index b0b52c481..cff5f59f1 100644
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/EquipmentController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/EquipmentController.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
@@ -16,13 +17,20 @@ namespace Win_in.Sfs.Wms.Pda.Controllers.BaseDatas;
 public class EquipmentController : AbpController
 {
     private readonly IEquipmentAppService _dictApp;
+    private readonly IEquipmentLocAppService _locApp;
 
     /// <summary>
     /// 
     /// </summary>
     /// <param name="dictApp"></param>
-    public EquipmentController(IEquipmentAppService dictApp,IOptions<AbpJsonOptions> options)
+    public EquipmentController(IEquipmentAppService dictApp,
+
+    
+         IEquipmentLocAppService locApp,
+
+    IOptions<AbpJsonOptions> options)
     {
+        _locApp = locApp;   
         _dictApp = dictApp;
         var str = options.Value.DefaultDateTimeFormat;
         Console.WriteLine(str);
@@ -40,4 +48,17 @@ public class EquipmentController : AbpController
 
         return dtos;
     }
+    [HttpGet("getLocs")]
+    
+
+      public virtual async Task<List<string>> GetLocsAsync()
+    {
+        var dtos = await _locApp.GetLocsAsync().ConfigureAwait(false);
+
+        return dtos;
+    }
+
+
+
+
 }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/IEquipmentLocAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/IEquipmentLocAppService.cs
index 6278b4aa3..0966b0b7a 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/IEquipmentLocAppService.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/IEquipmentLocAppService.cs
@@ -15,7 +15,7 @@ public interface IEquipmentLocAppService
 
 
     Task<List<EquipmentLocDTO>> GetEquipmentLocAsync(List<string> p_ls);
-  
+    Task<List<string>> GetLocsAsync();
 
     //Task<bool> CheckItemIsAvailable(string itemCode);
     //[HttpGet("check-item-is-available-no-select-sql")]
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentLocAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentLocAppService.cs
index d51a9a303..4ca8b9718 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentLocAppService.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentLocAppService.cs
@@ -30,7 +30,7 @@ public class EquipmentLocAppService
     : SfsBaseDataWithCodeAppServiceBase<EquipmentLoc, EquipmentLocDTO, SfsBaseDataRequestInputBase, EquipmentLocEditInput, EquipmentLocImportInput>
         , IEquipmentLocAppService
 {
-    //private readonly ItemValidator _itemValidator;
+
     private readonly IEquipmentLocManager _manager;
     private new readonly IEquipmentLocRepository _repository;
     private readonly IExportImportService _importService;
@@ -39,13 +39,11 @@ public class EquipmentLocAppService
         IEquipmentLocRepository repository,
         IDistributedCache<EquipmentLocDTO> cache,
         IExportImportService importService,
-       // ItemValidator itemValidator,
         IEquipmentLocManager manager)
         : base(repository, cache)
     {
         _importService=importService;
         _repository = repository;
-        //_itemValidator = itemValidator;
         _manager = manager;
         base.CreatePolicyName = EquipmentPermissions.Create;
         base.UpdatePolicyName = EquipmentPermissions.Update;
@@ -92,4 +90,17 @@ public class EquipmentLocAppService
        var list =query.Where(p => p_ls.Contains(p.Code));
        return  ObjectMapper.Map< List<EquipmentLoc> ,List<EquipmentLocDTO>>(list.ToList());
     }
+    [HttpGet]
+    [Route("GetLocs")]
+    public async Task<List<string>> GetLocsAsync()
+    {
+        var query = await _repository.GetQueryableAsync().ConfigureAwait(false);
+        var list = query.Select(p => p.LocCode).Distinct().ToList();
+        return list;
+    }
+
+
+
+
+
 }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentPartCode.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentPartCode.cs
index 4bf934a80..27834ba14 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentPartCode.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentPartCode.cs
@@ -8,14 +8,10 @@ using Win_in.Sfs.Shared.Domain.Shared.Enums.Basedata;
 namespace Win_in.Sfs.Basedata.Domain;
 
 /// <summary>
-/// 器具基本信息
+/// 器具零件关系信息
 /// </summary>
 public class EquipmentPartCode : SfsBaseDataAggregateRootBase, IHasCode
 {
-   
-    /// <summary>
-    /// 器具编号
-    /// </summary>
     public string Code { get; set; }
     ///// <summary>
     ///// 类型