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

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs

@@ -149,7 +149,7 @@ public class AgentModule : AbpModule
     public override void OnApplicationInitialization(
              ApplicationInitializationContext context)
     {
-        //context.AddBackgroundWorkerAsync<IncomingToWmsWorker>();
+        context.AddBackgroundWorkerAsync<IncomingToWmsWorker>();
         context.AddBackgroundWorkerAsync<OutgoingFromWmsWorker>();
     }
 }

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Properties/PublishProfiles/ClickOnceProfile.pubxml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>1.0.0.*</ApplicationVersion>
+    <BootstrapperEnabled>True</BootstrapperEnabled>
+    <Configuration>Release</Configuration>
+    <CreateWebPageOnPublish>False</CreateWebPageOnPublish>
+    <GenerateManifests>true</GenerateManifests>
+    <Install>True</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <IsRevisionIncremented>True</IsRevisionIncremented>
+    <IsWebBootstrapper>False</IsWebBootstrapper>
+    <MapFileExtensions>True</MapFileExtensions>
+    <OpenBrowserOnPublish>False</OpenBrowserOnPublish>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net6.0\app.publish\</PublishDir>
+    <PublishUrl>bin\publish\</PublishUrl>
+    <PublishProtocol>ClickOnce</PublishProtocol>
+    <PublishReadyToRun>False</PublishReadyToRun>
+    <PublishSingleFile>False</PublishSingleFile>
+    <SelfContained>False</SelfContained>
+    <SignatureAlgorithm>(无)</SignatureAlgorithm>
+    <SignManifests>False</SignManifests>
+    <SkipPublishVerification>false</SkipPublishVerification>
+    <TargetFramework>net6.0</TargetFramework>
+    <UpdateEnabled>False</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateRequired>False</UpdateRequired>
+    <WebPageFileName>Publish.html</WebPageFileName>
+    <History>True|2024-12-06T15:16:15.2109813Z;</History>
+  </PropertyGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.NetCore.CoreRuntime.6.0.x64">
+      <Install>True</Install>
+      <ProductName>.NET 运行时 6.0.27 (x64)</ProductName>
+    </BootstrapperPackage>
+  </ItemGroup>
+</Project>

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net6.0\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+  </PropertyGroup>
+</Project>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs

@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
+using Volo.Abp.Domain.Entities;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -54,6 +55,21 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
         Dictionary<TransferNote, EntityState> dictionary)
     {
         var addList = dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key);
+        foreach (var addTransferNote in addList)
+        {
+            foreach (var detail in addTransferNote.Details)
+            {
+                var balanceDto = await _balanceAppService.GetByItemLocationPackingAndStatusAsync(detail.FromPackingCode,
+                                     detail.ItemCode, detail.FromLocationCode, detail.FromStatus).ConfigureAwait(false);
+
+                if (balanceDto.Qty < detail.Qty || balanceDto.Qty < 0)
+                {
+                    throw new UserFriendlyException($"您申请的【ERP料号】{detail.ItemCode}【库位】{detail.FromLocationCode}【箱码】{detail.FromPackingCode}【状态】{detail.FromStatus}【数量】{detail.Qty}的库存，"
+                                                    + $"在实际库存中查询到【ERP料号】{balanceDto.ItemCode}【库位】{balanceDto.LocationCode}【箱码】{balanceDto.PackingCode}【状态】{balanceDto.Status}【数量】{balanceDto.Qty}"
+                                                    + $"【库存不足】");
+                }
+            }
+        }
 
         foreach (var transferNote in addList)
         {
@@ -312,7 +328,20 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
     {
         var entity = ObjectMapper.Map<TransferNoteEditInput, TransferNote>(input);
 
-        entity=await _transferNoteManager.CreateAsync(entity).ConfigureAwait(false);
+        foreach (var detail in entity.Details)
+        {
+            var balanceDto = await _balanceAppService.GetByItemLocationPackingAndStatusAsync(detail.FromPackingCode,
+                                 detail.ItemCode, detail.FromLocationCode, detail.FromStatus).ConfigureAwait(false);
+
+            if (balanceDto.Qty < detail.Qty || balanceDto.Qty < 0)
+            {
+                throw new UserFriendlyException($"您申请的【ERP料号】{detail.ItemCode}【库位】{detail.FromLocationCode}【箱码】{detail.FromPackingCode}【状态】{detail.FromStatus}【数量】{detail.Qty}的库存，"
+                                                + $"在实际库存中查询到【ERP料号】{balanceDto.ItemCode}【库位】{balanceDto.LocationCode}【箱码】{balanceDto.PackingCode}【状态】{balanceDto.Status}【数量】{balanceDto.Qty}"
+                                                + $"【库存不足】");
+            }
+        }
+
+        entity =await _transferNoteManager.CreateAsync(entity).ConfigureAwait(false);
 
         var dto = ObjectMapper.Map<TransferNote, TransferNoteDTO>(entity);
 
@@ -333,6 +362,19 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
 
         foreach (var entity in entitys)
         {
+            foreach (var detail in entity.Details)
+            {
+                var balanceDto = await _balanceAppService.GetByItemLocationPackingAndStatusAsync(detail.FromPackingCode,
+                                     detail.ItemCode, detail.FromLocationCode, detail.FromStatus).ConfigureAwait(false);
+
+                if (balanceDto.Qty < detail.Qty || balanceDto.Qty < 0)
+                {
+                    throw new UserFriendlyException($"您申请的【ERP料号】{detail.ItemCode}【库位】{detail.FromLocationCode}【箱码】{detail.FromPackingCode}【状态】{detail.FromStatus}【数量】{detail.Qty}的库存，"
+                                                    + $"在实际库存中查询到【ERP料号】{balanceDto.ItemCode}【库位】{balanceDto.LocationCode}【箱码】{balanceDto.PackingCode}【状态】{balanceDto.Status}【数量】{balanceDto.Qty}"
+                                                    + $"【库存不足】");
+                }
+            }
+
             resultEntity.Add(await _transferNoteManager.CreateAsync(entity).ConfigureAwait(false));
             _ = ObjectMapper.Map<TransferNote, TransferNoteDTO>(entity);
         }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/TransferNoteEventHandler.cs

@@ -35,17 +35,6 @@ namespace Win_in.Sfs.Wms.Store.Event.DataExchanges
         {
             var entity = eventData.Entity;
 
-            foreach (var detail in entity.Details)
-            {
-                var balanceDto = await _balanceAppService.GetRealQtyByPackingCodeAndItemCodeAndLocationCodeAndStatusAsync(detail.FromPackingCode,
-                    detail.ItemCode, detail.FromLocationCode, detail.FromStatus).ConfigureAwait(false);
-
-                if (balanceDto.Qty < detail.Qty&& balanceDto.Qty <= 0)
-                {
-                    throw new UserFriendlyException($"{balanceDto.ItemCode}在库位{balanceDto.LocationCode}中库存不足");
-                }
-            }
-
             switch (entity.Type)
             {
                 case "Transfer_Inside":

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

@@ -42,17 +42,6 @@ public class TransferNoteEventHandler
     {
         var entity = eventData.Entity;
 
-        foreach (var detail in entity.Details)
-        {
-            var balanceDto=await _balanceAppService.GetRealQtyByPackingCodeAndItemCodeAndLocationCodeAndStatusAsync(detail.FromPackingCode,
-                detail.ItemCode, detail.FromLocationCode, detail.FromStatus).ConfigureAwait(false);
-
-            if (balanceDto.Qty < detail.Qty)
-            {
-                throw new UserFriendlyException($"{balanceDto.ItemCode}在库位{balanceDto.LocationCode}中库存不足");
-            }
-        }
-
         var route = entity.UseOnTheWayLocation
             ? EnumTransferRoute.SourceToOnTheWay
             : EnumTransferRoute.SourceToDestination;
@@ -72,17 +61,6 @@ public class TransferNoteEventHandler
     {
         foreach (var entity in eventData.Entity)
         {
-            foreach (var detail in entity.Details)
-            {
-                var balanceDto = await _balanceAppService.GetRealQtyByPackingCodeAndItemCodeAndLocationCodeAndStatusAsync(detail.FromPackingCode,
-                    detail.ItemCode, detail.FromLocationCode, detail.FromStatus).ConfigureAwait(false);
-
-                if (balanceDto.Qty < detail.Qty&&balanceDto.Qty <= 0)
-                {
-                    throw new UserFriendlyException($"{balanceDto.ItemCode}在库位{balanceDto.LocationCode}中库存不足");
-                }
-            }
-
             var route = entity.UseOnTheWayLocation
                 ? EnumTransferRoute.SourceToOnTheWay
                 : EnumTransferRoute.SourceToDestination;