修改拆箱bug

be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml

@@ -4,17 +4,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <DeleteExistingFiles>true</DeleteExistingFiles>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>D:\发布\WMS\store</PublishUrl>
+    <PublishUrl>D:\~all-publish\WMS2.0_东阳\Win_in.Sfs.Wms.Store.HttpApi.Host</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
-    <SiteUrlToLaunchAfterPublish />
-    <TargetFramework>net6.0</TargetFramework>
-    <ProjectGuid>488eeada-cfed-4016-9884-7a1dcbe5eb9c</ProjectGuid>
-    <SelfContained>false</SelfContained>
   </PropertyGroup>
 </Project>

be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile1.pubxml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
-  <PropertyGroup>
-    <DeleteExistingFiles>False</DeleteExistingFiles>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>D:\~all-publish\WMS2.0_东阳\Win_in.Sfs.Wms.Store.HttpApi.Host</PublishUrl>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-  </PropertyGroup>
-</Project>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs

@@ -170,7 +170,7 @@ public class InspectJobAppService
     public virtual async Task<InspectJobDTO> SaveDetail_SplitPackingAsync(SplitPacking_UpdateJobDetailInput input)
     {
         InspectJob job = await _repository.FindAsync(p => p.Number == input.Number).ConfigureAwait(false);
-        InspectJobDetail detail = job.Details.FirstOrDefault(p => p.PackingCode == input.FromPackingCode && p.ReceiveQty == input.FromQty);
+        InspectJobDetail detail = job.Details.FirstOrDefault(p => p.PackingCode == input.FromPackingCode); /* && p.ReceiveQty == input.FromQty*/
         if (detail == null)
         {
             throw new UserFriendlyException($"根据PackingCode={input.FromPackingCode}取InspectDetail表为空！");

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/IssueJobAppService.cs

@@ -168,23 +168,24 @@ public class IssueJobAppService
     public virtual async Task<IssueJobDTO> SaveDetail_SplitPackingAsync(SplitPacking_UpdateJobDetailInput input)
     {
         var job = await _repository.FindAsync(p => p.Number == input.Number).ConfigureAwait(false);
-        IssueJobDetail detail = job.Details.FirstOrDefault(p => p.HandledPackingCode == input.FromPackingCode && p.HandledQty == input.FromQty);
+        IssueJobDetail detail = job.Details.FirstOrDefault(p => p.RecommendPackingCode == input.FromPackingCode ); /*&& p.HandledQty == input.FromQty*/
         if (detail == null)
         {
-            throw new UserFriendlyException($"根据HandledPackingCode={input.FromPackingCode}取IssueJobDetail表为空！");
+            //throw new UserFriendlyException($"根据HandledPackingCode={input.FromPackingCode}取IssueJobDetail表为空！");
+            throw new UserFriendlyException($"根据RecommendPackingCode={input.FromPackingCode}取IssueJobDetail表为空！");
         }
         //插入目标箱
         var newDetail = CommonHelper.CloneObj(detail);
         newDetail.SetId(GuidGenerator.Create());
         newDetail.RecommendPackingCode = input.ToPackingCode;
         newDetail.RecommendQty = input.ToQty;
-        newDetail.HandledPackingCode = input.ToPackingCode;
-        newDetail.HandledQty = input.ToQty;
+        newDetail.HandledPackingCode = detail.HandledPackingCode.HasValue() ? input.ToPackingCode : null; //源实际实际箱码有值，则新记录实际箱码有值
+        newDetail.HandledQty = detail.HandledQty > 0 ? input.ToQty : 0;
         //newDetail.CreationTime = CommonHelper.CurTime;
         job.Details.Add(newDetail);
         //修改源箱
         detail.RecommendQty = input.FromQty - input.ToQty;
-        detail.HandledQty = input.FromQty - input.ToQty;
+        detail.HandledQty = detail.HandledQty > 0 ? input.FromQty - input.ToQty : 0;
         var entity = await _repository.UpdateAsync(job).ConfigureAwait(false);
         var ret = ObjectMapper.Map<IssueJob, IssueJobDTO>(entity);
         return ret;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/PurchaseReceiptJobs/PurchaseReceiptJobAppService.cs

@@ -237,23 +237,25 @@ public class PurchaseReceiptJobAppService :
     public virtual async Task<PurchaseReceiptJobDTO> SaveDetail_SplitPackingAsync(SplitPacking_UpdateJobDetailInput input)
     {
         var job = await _repository.FindAsync(p => p.Number == input.Number).ConfigureAwait(false);
-        PurchaseReceiptJobDetail detail = job.Details.FirstOrDefault(p => p.HandledPackingCode == input.FromPackingCode && p.HandledQty == input.FromQty);
+        PurchaseReceiptJobDetail detail = job.Details.FirstOrDefault(p => p.RecommendPackingCode == input.FromPackingCode); /* && p.RecommendQty == input.FromQty*/
         if (detail == null)
         {
-            throw new UserFriendlyException($"根据HandledPackingCode={input.FromPackingCode}取ReceiptRequestDetail表为空！");
+            //throw new UserFriendlyException($"根据HandledPackingCode={input.FromPackingCode}取ReceiptRequestDetail表为空！");
+            throw new UserFriendlyException($"根据RecommendPackingCode={input.FromPackingCode}取PurchaseReceiptJobDetail表为空！");
+            
         }
         //插入目标箱
         var newDetail = CommonHelper.CloneObj(detail);
         newDetail.SetId(GuidGenerator.Create());
         newDetail.RecommendPackingCode = input.ToPackingCode;
         newDetail.RecommendQty = input.ToQty;
-        newDetail.HandledPackingCode = input.ToPackingCode;
-        newDetail.HandledQty = input.ToQty;
+        newDetail.HandledPackingCode = detail.HandledPackingCode.HasValue() ? input.ToPackingCode : null; //源实际实际箱码有值，则新记录实际箱码有值
+        newDetail.HandledQty = detail.HandledQty > 0 ? input.ToQty : 0;
         //newDetail.CreationTime = CommonHelper.CurTime;
         job.Details.Add(newDetail);
         //修改源箱
         detail.RecommendQty = input.FromQty - input.ToQty;
-        detail.HandledQty = input.FromQty - input.ToQty;
+        detail.HandledQty = detail.HandledQty > 0 ? input.FromQty - input.ToQty : 0;
         var entity = await _repository.UpdateAsync(job).ConfigureAwait(false);
         var ret = ObjectMapper.Map<PurchaseReceiptJob, PurchaseReceiptJobDTO>(entity);
         return ret;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReceiptRequests/PurchaseReceiptRequestAppService.cs

@@ -168,10 +168,11 @@ public class PurchaseReceiptRequestAppService :
     public virtual async Task<PurchaseReceiptRequestDTO> SaveDetail_SplitPackingAsync(SplitPacking_UpdateJobDetailInput input, string packingCode)
     {
         var request = await _repository.FindAsync(p => p.Number == packingCode).ConfigureAwait(false);
-        PurchaseReceiptRequestDetail detail = request.Details.FirstOrDefault(p => p.PackingCode == input.FromPackingCode && p.Qty == input.FromQty);
+        PurchaseReceiptRequestDetail detail = request.Details.FirstOrDefault(p => p.PackingCode == input.FromPackingCode); /* && p.Qty == input.FromQty*/
         if (detail == null)
         {
-            throw new UserFriendlyException($"根据PackingCode={input.FromPackingCode}取ReceiptRequestDetail表为空！");
+            //throw new UserFriendlyException($"根据PackingCode={input.FromPackingCode}取ReceiptRequestDetail表为空！");
+            throw new UserFriendlyException($"根据PackingCode={input.FromPackingCode}取PurchaseReceiptRequestDetail表为空！");
         }
         //插入目标箱
         var newDetail = CommonHelper.CloneObj(detail);