修改bug

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

@@ -157,6 +157,7 @@ public static class IncomingToWmsExtensions
         var backFlush = JsonSerializer.Deserialize<BackFlushNoteEditInput>(incomingConverted.DataContent);
 
         var balanceAppService = workerContext.ServiceProvider.GetRequiredService<IBalanceAppService>();
+        
         var balanceDtos = await balanceAppService.GetRecommendBalancesAsync(new RecommendBalanceRequestInput()
         {
             Qty = backFlush.Qty,

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs

@@ -43,5 +43,4 @@ public class BackFlushNoteAppService :
 
         return ObjectMapper.Map<List<BackFlushNote>, List<BackFlushNoteDTO>>(entities);
     }
-
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ItemTransformRequests/ItemTransformRequestAppService.cs

@@ -79,6 +79,7 @@ public class ItemTransformRequestAppService :
                 var toItemBasicDto = await ItemBasicAclService.GetByCodeAsync(detail.ToItemCode).ConfigureAwait(false);
                 var balanceDto= await _balanceAppService.GetByItemLocationAndPackingAsync(detail.FromPackingCode, detail.ItemCode,
                     detail.FromLocationCode).ConfigureAwait(false);
+                var inventoryLabelDto= await _inventoryLabelAppService.GetByCodeAsync(detail.ToPackingCode).ConfigureAwait(false);
 
                 detail.FromLocationArea = fromLocationDto.AreaCode;
                 detail.FromLocationErpCode = fromLocationDto.ErpLocationCode;
@@ -90,7 +91,7 @@ public class ItemTransformRequestAppService :
                 detail.FromStatus = balanceDto.Status;
 
                 detail.ToSupplierBatch = string.Empty;
-                detail.ToLot = balanceDto.Lot;
+                detail.ToLot = inventoryLabelDto.Lot;
                 detail.ToStatus = balanceDto.Status;
 
                 detail.ToLocationArea = toLocationDto.AreaCode;
@@ -104,9 +105,9 @@ public class ItemTransformRequestAppService :
                 detail.Uom = fromItemBasicDto.BasicUom;
 
                 detail.ToItemCode = toItemBasicDto.Code;
-                detail.ToItemDesc1 = toItemBasicDto.Desc2;
+                detail.ToItemDesc1 = toItemBasicDto.Desc1;
-                detail.ToItemDesc2 = toItemBasicDto.Name;
+                detail.ToItemDesc2 = toItemBasicDto.Desc2;
-                detail.ItemName = toItemBasicDto.BasicUom;
+                detail.ToItemName = toItemBasicDto.Name;
             }
         }
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs

@@ -76,14 +76,25 @@ public class MaterialRequestManager
 
     private async Task SetMaterialRequestStatus(MaterialRequest materialRequest)
     {
-        if (!materialRequest.Details.All(p => p.Status == EnumStatus.Close))
+        if (materialRequest.Details.All(p => p.Status == EnumStatus.Close))
+        {
+            materialRequest.RequestStatus = EnumRequestStatus.Completed;
+        }
+        else
         {
             var issueJobs = await _issueJobRepository.GetListAsync(t => t.MaterialRequestNumber == materialRequest.Number).ConfigureAwait(false);
             if (issueJobs.Count > 0)
             {
-                if (issueJobs.All(t => t.JobStatus == EnumJobStatus.Done||t.JobStatus==EnumJobStatus.Closed||t.JobStatus==EnumJobStatus.Cancelled))
+                if (issueJobs.All(t => t.JobStatus == EnumJobStatus.Done || t.JobStatus == EnumJobStatus.Closed || t.JobStatus == EnumJobStatus.Cancelled))
                 {
-                    materialRequest.RequestStatus = EnumRequestStatus.Completed;
+                    if (materialRequest.Details.All(p => p.ReceivedQty >= p.Qty))
+                    {
+                        materialRequest.RequestStatus = EnumRequestStatus.Completed;
+                    }
+                    else
+                    {
+                        materialRequest.RequestStatus = EnumRequestStatus.Partial;
+                    }
                 }
                 else
                 {
@@ -95,10 +106,6 @@ public class MaterialRequestManager
                 materialRequest.RequestStatus = EnumRequestStatus.Partial;
             }
         }
-        else
-        {
-            materialRequest.RequestStatus = EnumRequestStatus.Completed;
-        }
     }
 
     public virtual async Task CompleteAsync(string number)