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;
///
///
///
///
- public EquipmentController(IEquipmentAppService dictApp,IOptions options)
+ public EquipmentController(IEquipmentAppService dictApp,
+
+
+ IEquipmentLocAppService locApp,
+
+ IOptions 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> 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> GetEquipmentLocAsync(List p_ls);
-
+ Task> GetLocsAsync();
//Task 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
, 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 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 ,List>(list.ToList());
}
+ [HttpGet]
+ [Route("GetLocs")]
+ public async Task> 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;
///
-/// 器具基本信息
+/// 器具零件关系信息
///
public class EquipmentPartCode : SfsBaseDataAggregateRootBase, IHasCode
{
-
- ///
- /// 器具编号
- ///
public string Code { get; set; }
/////
///// 类型