diff --git a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile1.pubxml b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile1.pubxml
new file mode 100644
index 000000000..c238ca481
--- /dev/null
+++ b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile1.pubxml
@@ -0,0 +1,16 @@
+
+
+
+
+ False
+ False
+ True
+ Release
+ Any CPU
+ FileSystem
+ D:\~all-publish\WMS2.0_东阳\Win_in.Sfs.Wms.Store.HttpApi.Host
+ FileSystem
+
+
\ No newline at end of file
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDTO.cs
index b7687a573..093d7f25f 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDTO.cs
@@ -29,7 +29,7 @@ public class UnplannedIssueRequestDTO : SfsStoreRequestDTOBase Details { get; set; }
- [Display(Name = "领料类别", Order = 0)]
+ [Display(Name = "领料类别")]
public EnumUnplannedIssueType UnplannedIssueType { get; set; }
#endregion
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
index c56528a51..15ca3ba7d 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
@@ -14,6 +14,7 @@ using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
using Win_in.Sfs.Wms.Inventory.Application.Contracts;
using Win_in.Sfs.Wms.Store.Application.Contracts;
using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Domain.Acl.TransactionType;
namespace Win_in.Sfs.Wms.Store.Application;
@@ -24,17 +25,21 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
private readonly IBalanceAppService _balanceAppService;
private readonly IDepartmentAppService _departmentAppService;
private readonly ILocationAppService _locationAppService;
+ private readonly ITransactionTypeAclService _transactionTypeAclService;
public UnplannedIssueRequestForDongyangAppService(IUnplannedIssueRequestRepository repository,
IUnplannedIssueRequestManager unplannedIssueRequestManager,
- IDepartmentAppService departmentApp, IBalanceAppService balanceAppService, IDepartmentAppService departmentAppService, ILocationAppService locationAppService) : base(repository, unplannedIssueRequestManager)
+ IDepartmentAppService departmentApp, IBalanceAppService balanceAppService, IDepartmentAppService departmentAppService, ILocationAppService locationAppService,
+ ITransactionTypeAclService transactionTypeAclService
+ ) : base(repository, unplannedIssueRequestManager)
{
_unplannedIssueRequestManager = unplannedIssueRequestManager;
_departmentApp = departmentApp;
_balanceAppService = balanceAppService;
_departmentAppService = departmentAppService;
_locationAppService = locationAppService;
+ _transactionTypeAclService = transactionTypeAclService;
}
///
@@ -89,6 +94,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
// ItemCode = detail.ItemCode,
//});
+ unplannedIssueRequest.DirectCreateNote = true; //线边 直接生成记录
}
@@ -229,8 +235,9 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
///
private async Task SetRequestAutoPropertiesAsync(UnplannedIssueRequest entity)
{
- var tranType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.UnplannedIssue, EnumTransSubType.None).ConfigureAwait(false);
-
+ //var tranType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.UnplannedIssue, EnumTransSubType.None).ConfigureAwait(false);
+ var tranType = await _transactionTypeAclService.GetByTransTypeAsync(EnumTransType.UnplannedIssue, EnumTransSubType.None).ConfigureAwait(false);
+
Check.NotNull(tranType, "事务类型", "事务类型不存在");
entity.AutoCompleteJob = tranType.AutoCompleteJob;
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs
index bcb10f458..ee56153bf 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs
@@ -49,17 +49,17 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
{
var addList = dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key);
- foreach (var unplannedIssueRequest in addList)
+ foreach (var unplannedReceiptRequest in addList)
{
- unplannedIssueRequest.Worker = CurrentUser.GetUserName();
- unplannedIssueRequest.CreatorId = CurrentUser.Id;
+ unplannedReceiptRequest.Worker = CurrentUser.GetUserName();
+ unplannedReceiptRequest.CreatorId = CurrentUser.Id;
- await SetRequestAutoPropertiesAsync(unplannedIssueRequest).ConfigureAwait(false);
- await SetEntityPropertiesAsync(unplannedIssueRequest).ConfigureAwait(false);
+ await SetRequestAutoPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false);
+ await SetEntityPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false);
- foreach (var detail in unplannedIssueRequest.Details)
+ foreach (var detail in unplannedReceiptRequest.Details)
{
- if (unplannedIssueRequest.UnplannedReceiptType == EnumUnplannedReceiptType.Raw)
+ if (unplannedReceiptRequest.UnplannedReceiptType == EnumUnplannedReceiptType.Raw)
{
var locationDto = await _locationAppService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false);
if (locationDto.Type != EnumLocationType.RAW || locationDto.Type != EnumLocationType.SEMI)
@@ -77,7 +77,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
//});
}
- if (unplannedIssueRequest.UnplannedReceiptType == EnumUnplannedReceiptType.Wip)
+ if (unplannedReceiptRequest.UnplannedReceiptType == EnumUnplannedReceiptType.Wip)
{
var locationDto = await _locationAppService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false);
if (locationDto.Type != EnumLocationType.WIP)
@@ -92,6 +92,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
// ItemCode = detail.ItemCode,
//});
+ unplannedReceiptRequest.DirectCreateNote = true; //线边 直接生成记录
}
await SetDetailPropertiesAsync(detail).ConfigureAwait(false);
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequest.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequest.cs
index 1e0d5e73f..5eea5540b 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequest.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequest.cs
@@ -35,7 +35,7 @@ public class UnplannedIssueRequest : SfsStoreRequestAggregateRootBase Details { get; set; } = new List();
- [Display(Name = "领料类别", Order = 0)]
+ [IgnoreUpdate]
public EnumUnplannedIssueType UnplannedIssueType { get; set; }
}