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/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs

@@ -504,12 +504,12 @@ public class SparePartIssueJobAppService
         var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode)
             .ConfigureAwait(false);
 
-        if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode != 1)
-        {
-            input.JobStatus = EnumJobStatus.Wait;
-        }
-        else if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode == 1)
-        {
+        //if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode != 1)
+        //{
+        //    input.JobStatus = EnumJobStatus.Wait;
+        //}
+        //else if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode == 1)
+        //{
             jobDetailInputdetail.TransferLibFromArriveDate = jobDetailInputdetail.RecommendFromArriveDate;
             jobDetailInputdetail.TransferLibFromContainerCode = jobDetailInputdetail.RecommendFromContainerCode;
             jobDetailInputdetail.TransferLibFromExpireDate = jobDetailInputdetail.RecommendFromExpireDate;
@@ -537,7 +537,7 @@ public class SparePartIssueJobAppService
             jobDetailInputdetail.TransferLibToLocationCode = jobDetailInputdetail.TransferLibFromLocationCode;
             jobDetailInputdetail.TransferLibToLocationErpCode = jobDetailInputdetail.TransferLibFromLocationErpCode;
             jobDetailInputdetail.TransferLibToLocationGroup = jobDetailInputdetail.TransferLibFromLocationGroup;
-        }
+        //}
     }
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/PurchaseReturnRequests/PurchaseReturnRequestManager.cs

@@ -24,7 +24,9 @@ public class PurchaseReturnRequestManager : SfsStoreRequestManagerBase<PurchaseR
 
         foreach (var entity in entities)
         {
-            var lst = await Repository.GetPagedListAsync(itm => itm.PoNumber == entity.PoNumber && itm.Details.Any(itm => itm.PackingCode == entity.Details[0].PackingCode), 0, 1, null).ConfigureAwait(false);
+            var lst = await Repository.GetPagedListAsync(itm => itm.PoNumber == entity.PoNumber
+                && (itm.RequestStatus != EnumRequestStatus.Refused && itm.RequestStatus != EnumRequestStatus.Cancelled && itm.RequestStatus != EnumRequestStatus.Abort)
+                && itm.Details.Any(itm => itm.PackingCode == entity.Details[0].PackingCode), 0, 1, null).ConfigureAwait(false);
             if (lst.Count > 0)
             {
                 throw new UserFriendlyException($"采购退货申请的订单号{entity.PoNumber}、箱码{entity.Details[0].PackingCode}重复");

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/SparePartIssueJobEventHandler.cs

@@ -150,6 +150,8 @@ public class SparePartIssueJobEventHandler :
 
             if (locationDto.Type == EnumLocationType.RAW)
             {
+                break;
+                //备品不需要做 高转低库移
                 if (!await IsMinRowAsync(sparePartIssueJob).ConfigureAwait(false))
                 {
                     var input = new TransferLibRequestEditInput();

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

@@ -67,6 +67,11 @@ public class InventoryInitialNoteEventHandler
         //构造库存转移记录创建Input
         foreach (var detail in inventoryInitialNote.Details)
         {
+            if(string.IsNullOrEmpty(detail.Lot))
+            {
+                detail.Lot = "";
+            }
+
             var transaction = ObjectMapper.Map<InventoryInitialNoteDetail, TransactionEditInput>(detail);
 
             transaction.TransType = TransType;