zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改 导出

dev_DY_CC
郑勃旭 9 months ago
parent
3dd9a961fe
commit
95911911e6
5 changed files with 117 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/DTOs/BalanceDTO.cs
  2. 19
      be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/DTOs/BalanceExportDTO.cs
  3. 28
      be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs
  4. 6
      be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAutoMapperProfile.cs
  5. 52
      build/src/docker/publish/conf/settings/appsettings.Development.json

11
be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/DTOs/BalanceDTO.cs
View File

@ -19,7 +19,6 @@ public class BalanceDTO : SfsBasicDTOBase
, IHasPacking , IHasPacking
, IHasInventoryStatus , IHasInventoryStatus
{ {
/// <summary> /// <summary>
/// 箱标签 /// 箱标签
/// </summary> /// </summary>
@ -32,11 +31,13 @@ public class BalanceDTO : SfsBasicDTOBase
/// </summary> /// </summary>
[Display(Name = "物品名称")] [Display(Name = "物品名称")]
public string ItemName { get; set; } public string ItemName { get; set; }
/// <summary> /// <summary>
/// 物品描述1 /// 物品描述1
/// </summary> /// </summary>
[Display(Name = "物品描述1")] [Display(Name = "物品描述1")]
public string ItemDesc1 { get; set; } public string ItemDesc1 { get; set; }
/// <summary> /// <summary>
/// 物品描述2 /// 物品描述2
/// </summary> /// </summary>
@ -212,18 +213,16 @@ public class BalanceDTO : SfsBasicDTOBase
/// </summary> /// </summary>
[Display(Name = "最后事务号")] [Display(Name = "最后事务号")]
public string LastTransNumber { get; set; } public string LastTransNumber { get; set; }
/// <summary> /// <summary>
/// 标准成本单价 /// 标准成本单价
/// </summary> /// </summary>
[Display(Name = "标准成本单价")] [Display(Name = "标准成本单价")]
public decimal StdCostPrice { get; set; } public decimal StdCostPrice { get; set; }
/// <summary> /// <summary>
/// 标准成本价格 /// 标准成本价格
/// </summary> /// </summary>
[Display(Name = "标准成本价格")] [Display(Name = "标准成本价格")]
public decimal StdCost public decimal StdCost => StdCostPrice * Qty;
{
get { return StdCostPrice *Qty; }
}
} }

19
be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/DTOs/BalanceExportDTO.cs
View File

@ -0,0 +1,19 @@
using System;
using System.ComponentModel.DataAnnotations;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Shared.Domain.Shared;
namespace Win_in.Sfs.Wms.Inventory.Application.Contracts;
/// <summary>
/// 实体DTO
/// </summary>
[Display(Name = "实体DTO")]
public class BalanceExportDTO : BalanceDTO
{
/// <summary>
/// ERP料号类型
/// </summary>
[Display(Name = "ERP料号类型")]
public string Type { get; set; }
}

28
be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs
View File

@ -954,7 +954,8 @@ public class BalanceAppService
: p => true; : p => true;
var entities = await _repository.GetPagedListAsync(expression, input.SkipCount, input.MaxResultCount, var entities = await _repository.GetPagedListAsync(expression, input.SkipCount, input.MaxResultCount,
input.Sorting, true).ConfigureAwait(false); input.Sorting, true).ConfigureAwait(false);
var list = ObjectMapper.Map<List<Balance>, List<BalanceDTO>>(entities); var list = ObjectMapper.Map<List<Balance>, List<BalanceExportDTO>>(entities);
//var hasDetails = typeof(TEntity) is SfsMasterAggregateRootBase<TDetail> detailEntity; //var hasDetails = typeof(TEntity) is SfsMasterAggregateRootBase<TDetail> detailEntity;
var tt = typeof(Balance).GetBaseClasses(typeof(SfsMasterAggregateRootBase<EmptyDetail>)); var tt = typeof(Balance).GetBaseClasses(typeof(SfsMasterAggregateRootBase<EmptyDetail>));
var hasDetails = tt.Length > 0 ? true : false; var hasDetails = tt.Length > 0 ? true : false;
@ -962,11 +963,32 @@ public class BalanceAppService
{ {
var itemCodes = list.Select(t => t.ItemCode).Distinct(); var itemCodes = list.Select(t => t.ItemCode).Distinct();
var itemBasicDtos = await _itemBasicAppService.GetByCodesWithPostAsync(itemCodes).ConfigureAwait(false); var itemBasicDtos = await _itemBasicAppService.GetByCodesWithPostAsync(itemCodes).ConfigureAwait(false);
if (itemBasicDtos.Count > 0) if (itemBasicDtos.Any())
{ {
list.ForEach(item => list.ForEach(item =>
{ {
item.Configuration = itemBasicDtos.FirstOrDefault(t => t.Code == item.ItemCode)?.Configuration; var itembaseDto=itemBasicDtos.FirstOrDefault(t => t.Code == item.ItemCode);
item.Configuration = itembaseDto.Configuration;
//10C01成品、10C02原料、10C03物料、10C04半成品
switch (itembaseDto.Type)
{
case "10C01":
item.Type = "成品";
break;
case "10C02":
item.Type = "原料";
break;
case "10C03":
item.Type = "物料";
break;
case "10C04":
item.Type = "半成品";
break;
default:
item.Type = "未知类型";
break;
}
}); });
} }
} }

6
be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAutoMapperProfile.cs
View File

@ -35,5 +35,11 @@ public partial class InventoryApplicationAutoMapperProfile : Profile
.Ignore(x => x.JobNumber) .Ignore(x => x.JobNumber)
.Ignore(x => x.Worker); .Ignore(x => x.Worker);
CreateMap<Balance, BalanceExportDTO>()
.Ignore(x => x.Configuration)
.Ignore(x => x.StdCostPrice)
.Ignore(x => x.StdCost)
.Ignore(x => x.Type);
} }
} }

52
build/src/docker/publish/conf/settings/appsettings.Development.json
View File

@ -61,7 +61,7 @@
}, },
"AuthServer": { "AuthServer": {
"Audience": "Auth", "Audience": "Auth",
"Authority": "http://dev.ccwin-in.com:60083/", "Authority": "http://10.164.233.5:60083/",
//"Authority": "http://localhost:59093/", //"Authority": "http://localhost:59093/",
"ClientId": "Auth_App", "ClientId": "Auth_App",
"ClientSecret": "1q2w3E*", "ClientSecret": "1q2w3E*",
@ -91,28 +91,28 @@
// "Store": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;" // "Store": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;"
// }, // },
"ConnectionStrings": { "ConnectionStrings": {
"AbpAuditLogging": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "AbpAuditLogging": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpBackgroundJobs": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "AbpBackgroundJobs": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpBlobStoring": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "AbpBlobStoring": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpFeatureManagement": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "AbpFeatureManagement": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpIdentity": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "AbpIdentity": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpIdentityServer": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "AbpIdentityServer": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpPermissionManagement": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "AbpPermissionManagement": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpSettingManagement": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "AbpSettingManagement": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpTenantManagement": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "AbpTenantManagement": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"Auth": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "Auth": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"Basedata": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "Basedata": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"DataExchange": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "DataExchange": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"FileStorage": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "FileStorage": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"Inventory": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "Inventory": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"Job": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "Job": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"Label": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "Label": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"Message": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;", "Message": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"Store": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;" "Store": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;"
}, },
"IdentityClients": { "IdentityClients": {
"Default": { "Default": {
"Authority": "http://dev.ccwin-in.com:60083", "Authority": "http://10.164.233.5:60083",
//"Authority": "http://localhost:59093", //"Authority": "http://localhost:59093",
"ClientId": "Auth_App", "ClientId": "Auth_App",
"ClientSecret": "1q2w3E*", "ClientSecret": "1q2w3E*",
@ -129,19 +129,19 @@
}, },
"RemoteServices": { "RemoteServices": {
"Auth": { "Auth": {
"BaseUrl": "http://dev.ccwin-in.com:60083/" "BaseUrl": "http://10.164.233.5:60083/"
//"BaseUrl": "http://localhost:59093/" //"BaseUrl": "http://localhost:59093/"
}, },
"BaseData": { "BaseData": {
//"BaseUrl": "http://dev.ccwin-in.com:60084/" //"BaseUrl": "http://10.164.233.5:60084/"
"BaseUrl": "http://localhost:59094/" "BaseUrl": "http://localhost:59094/"
}, },
"Default": { "Default": {
"BaseUrl": "http://dev.ccwin-in.com:60083/" "BaseUrl": "http://10.164.233.5:60083/"
//"BaseUrl": "http://localhost:59093/" //"BaseUrl": "http://localhost:59093/"
}, },
"FileStorage": { "FileStorage": {
"BaseUrl": "http://dev.ccwin-in.com:60082/" "BaseUrl": "http://10.164.233.5:60082/"
//"BaseUrl": "http://localhost:59092/" //"BaseUrl": "http://localhost:59092/"
}, },
"Inventory": { "Inventory": {
@ -151,11 +151,11 @@
"BaseUrl": "http://localhost:59095/" "BaseUrl": "http://localhost:59095/"
}, },
"Label": { "Label": {
"BaseUrl": "http://dev.ccwin-in.com:60082/" "BaseUrl": "http://10.164.233.5:60082/"
//"BaseUrl": "http://localhost:59092/" //"BaseUrl": "http://localhost:59092/"
}, },
"Message": { "Message": {
"BaseUrl": "http://dev.ccwin-in.com:60082/" "BaseUrl": "http://10.164.233.5:60082/"
//"BaseUrl": "http://localhost:59092/" //"BaseUrl": "http://localhost:59092/"
}, },
"Store": { "Store": {

Write Preview
Loading…
Cancel
Save