修改 库移

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

@@ -578,7 +578,7 @@ public class KittingIssueJobAppService
         list=list.Where(p => p.JobNumber != jobNumber).ToList();
         if (list.Any())
         {
-            throw new UserFriendlyException($"任务号【{list.First().JobNumber}】已占用,【{packingCode}】箱码");
+            throw new UserFriendlyException($"任务号【{list.First().JobNumber}】的任务，已占用【{packingCode}】箱码的库存。");
         }
     }
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs

@@ -304,7 +304,7 @@ public class TransferLibJobAppService
         list = list.Where(p => p.JobNumber != jobNumber).ToList();
         if (list.Any())
         {
-            throw new UserFriendlyException($"任务号【{list.First().JobNumber}】已占用,【{packingCode}】箱码");
+            throw new UserFriendlyException($"任务号【{list.First().JobNumber}】的任务，已占用【{packingCode}】箱码的库存。");
         }
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs

@@ -358,7 +358,7 @@ public class TransferLibRequestAppService : SfsStoreRequestAppServiceBase
             request.RequestStatus = EnumRequestStatus.Cancelled;
             await _repository.UpdateAsync(request).ConfigureAwait(false);
         }
-        else
+        else if(request.RequestStatus!=EnumRequestStatus.Cancelled&&request.RequestStatus!=EnumRequestStatus.Completed)
         {
             throw new UserFriendlyException($"【{request.RequestStatus.GetDisplayName()}】状态不允许取消");
         }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/TransferLibRequestEventHandler.cs

@@ -89,19 +89,6 @@ public class TransferLibRequestEventHandler
 
             await _transferLibJobManager.AddAsync(input).ConfigureAwait(false);
         }
-
-        switch (enumTransSubType)
-        {
-            case EnumTransSubType.Transfer_Inside:
-            case EnumTransSubType.Transfer_Area:
-                break;
-            case EnumTransSubType.Transfer_Warehouse:
-            case EnumTransSubType.Transfer_Customer:
-            case EnumTransSubType.Transfer_WIP:
-                //    entity.Handle();
-                entity.Complete();
-                break;
-        }
     }
 
     /// <summary>

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

@@ -228,25 +228,30 @@ public class TransferLibNoteEventHandler
     {
         var inputoExpectOutEditInput = new ExpectOutEditInput();
         inputoExpectOutEditInput.JobNumber = detail.CallRequestNumber;
+
         inputoExpectOutEditInput.ItemCode = detail.ItemCode;
-        inputoExpectOutEditInput.Qty = detail.HandledFromQty;
-        inputoExpectOutEditInput.LocationCode = detail.HandledFromLocationCode;
-        inputoExpectOutEditInput.ArriveDate = detail.HandledFromArriveDate;
-        inputoExpectOutEditInput.ContainerCode = detail.HandledFromContainerCode;
-        inputoExpectOutEditInput.ExpireDate = detail.HandledFromExpireDate;
         inputoExpectOutEditInput.ItemDesc1 = detail.ItemDesc1;
         inputoExpectOutEditInput.ItemDesc2 = detail.ItemDesc2;
         inputoExpectOutEditInput.ItemName = detail.ItemName;
-        inputoExpectOutEditInput.LocationArea = detail.HandledFromLocationArea;
-        inputoExpectOutEditInput.LocationGroup = detail.HandledFromLocationGroup;
-        inputoExpectOutEditInput.LocationErpCode = detail.HandledFromLocationErpCode;
-        inputoExpectOutEditInput.PackingCode = detail.HandledFromPackingCode;
-        inputoExpectOutEditInput.Lot = detail.HandledFromLot;
-        inputoExpectOutEditInput.ProduceDate = detail.HandledFromProduceDate;
+
+        inputoExpectOutEditInput.Qty = detail.HandledToQty;
+
+        inputoExpectOutEditInput.LocationCode = detail.HandledToLocationCode;
+        inputoExpectOutEditInput.LocationArea = detail.HandledToLocationArea;
+        inputoExpectOutEditInput.LocationGroup = detail.HandledToLocationGroup;
+        inputoExpectOutEditInput.LocationErpCode = detail.HandledToLocationErpCode;
+
+        inputoExpectOutEditInput.ArriveDate = detail.HandledToArriveDate;
+        inputoExpectOutEditInput.ContainerCode = detail.HandledToContainerCode;
+        inputoExpectOutEditInput.ExpireDate = detail.HandledToExpireDate;
+        
+        inputoExpectOutEditInput.PackingCode = detail.HandledToPackingCode;
+        inputoExpectOutEditInput.Lot = detail.HandledToLot;
+        inputoExpectOutEditInput.ProduceDate = detail.HandledToProduceDate;
         inputoExpectOutEditInput.Status = detail.Status;
         inputoExpectOutEditInput.Uom = detail.Uom;
-        inputoExpectOutEditInput.SupplierBatch = detail.HandledFromSupplierBatch;
-        inputoExpectOutEditInput.WarehouseCode = detail.HandledFromWarehouseCode;
+        inputoExpectOutEditInput.SupplierBatch = detail.HandledToSupplierBatch;
+        inputoExpectOutEditInput.WarehouseCode = detail.HandledToWarehouseCode;
 
         await _expectOutAppService.AddManyAsync(new EditableList<ExpectOutEditInput> { inputoExpectOutEditInput })
             .ConfigureAwait(false);