Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/IDeliverRequestAppService.cs

@@ -10,5 +10,6 @@ public interface IDeliverRequestAppService
     <DeliverRequestDTO, SfsStoreRequestInputBase, DeliverRequestEditInput, DeliverRequestDetailDTO, SfsStoreRequestInputBase>
 
 {
+    Task<bool> DeleteByIdAsync(Guid id);
     Task<List<DeliverRequestDTO>> HandleListAsync(List<Guid> ids, string truckNumber);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAppService.cs

@@ -214,6 +214,27 @@ IItemBasicAppService itemBasicAppService)
         var dto = ObjectMapper.Map<DeliverRequest, DeliverRequestDTO>(entity);
         return dto;
     }
+    /// <summary>
+    /// 删除
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost("delete-by-id")]
+    public new async Task<bool> DeleteByIdAsync(Guid id)
+    {
+        bool result;
+        try
+        {
+          await  base.DeleteAsync(id).ConfigureAwait(false);
+            result = true;
+        }
+        catch (Exception)
+        {
+
+            result = false;
+        }
+        return result;
+    }
     private async Task SetRequestAutoPropertiesAsync(DeliverRequest entity)
     {
         //普通件

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs

@@ -56,7 +56,27 @@ public class DeliverRequestFisAppService :
         _balanceAppService = balanceAppService;
         _itemBasicAppService = itemBasicAppService;
     }
+    /// <summary>
+    /// 删除
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost("delete-by-id")]
+    public new async Task<bool> DeleteByIdAsync(Guid id)
+    {
+        bool result;
+        try
+        {
+            await base.DeleteAsync(id).ConfigureAwait(false);
+            result = true;
+        }
+        catch (Exception)
+        {
 
+            result = false;
+        }
+        return result;
+    }
     #region 东阳
 
     private async Task SetRequestAutoPropertiesAsync(DeliverRequest entity)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/DeliverNoteEventHandler.cs

@@ -59,14 +59,30 @@ public class DeliverNoteEventHandler
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<DeliverNote>> eventDatas)
     {
         var entitys = eventDatas.Entity;
-        var transferLogs = new List<TransferLogEditInput>();
-        foreach (var entity in entitys)
+        if (await SettingManager.IsTrueAsync(StoreSettings.Common.EnableCustomerLocation).ConfigureAwait(false))
         {
-            transferLogs.AddRange(BuildTransferLogs(entity));
+            var transferLogs = new List<TransferLogEditInput>();
+            foreach (var entity in entitys)
+            {
+                transferLogs.AddRange(BuildTransferLogs(entity));
+
+                await SetRequestStatusAsync(entity).ConfigureAwait(false);
+            }
+            await TransferLogAppService.AddManyAsync(transferLogs).ConfigureAwait(false);
+        }
+        else
+        {
+            var transactions = new List<TransactionEditInput>();
+            foreach (var entity in entitys)
+            {
+                transactions.AddRange(BuildTransactions(entity));
+
+                await SetRequestStatusAsync(entity).ConfigureAwait(false);
+            }
+            await TransactionAppService.AddManyAsync(transactions).ConfigureAwait(false);
 
-            await SetRequestStatusAsync(entity).ConfigureAwait(false);
         }
-        await TransferLogAppService.AddManyAsync(transferLogs).ConfigureAwait(false);
+       
     }
     #region 私有