盘点修改

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CountAdjustNoteConverter.cs

@@ -75,7 +75,7 @@ public class CountAdjustNoteConverter : IOutgoingConverter
                         DestinationDataId = "",
                     };
                     outgoingToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
-                    var exchangeIssue = await BuildPurchaseReceiptExchangeDtoAsync(wmsCountAdjust, detail).ConfigureAwait(false);
+                    var exchangeIssue =  BuildPurchaseReceiptExchangeDtoAsync(wmsCountAdjust, detail);
                     outgoingToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeIssue);
                     var arrive = BuildWip(exchangeIssue, departmentCode);
                     outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(arrive);
@@ -103,7 +103,7 @@ public class CountAdjustNoteConverter : IOutgoingConverter
                             DestinationDataId = "",
                         };
                         outgoingToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
-                        var exchangeIssue = await BuildPurchaseReceiptExchangeDtoAsync(wmsCountAdjust, detail).ConfigureAwait(false);
+                        var exchangeIssue =  BuildPurchaseReceiptExchangeDtoAsync(wmsCountAdjust, detail);
                         outgoingToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeIssue);
                         var arrive = BuildIssue(exchangeIssue, departmentCode);
                         outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(arrive);
@@ -159,7 +159,7 @@ public class CountAdjustNoteConverter : IOutgoingConverter
         };
         return counta;
     }
-    private async Task<CountAdjustNoteExchangeDto> BuildPurchaseReceiptExchangeDtoAsync(
+    private CountAdjustNoteExchangeDto BuildPurchaseReceiptExchangeDtoAsync(
         CountAdjustNoteDTO wmsCountAdjust, CountAdjustNoteDetailExchangeDto wmsCountAdjustDetail)
     {
         var exchangeCountAdjust = _objectMapper.Map<CountAdjustNoteDTO, CountAdjustNoteExchangeDto>(wmsCountAdjust);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountJobManager.cs

@@ -320,7 +320,13 @@ public class CountJobManager : SfsJobManagerBase<CountJob, CountJobDetail>, ICou
                 jobDepDetail.SetIdAndNumber(GuidGenerator, entity.Id, number);
                 jobDepDetail.CountLabel = GuidGenerator.Create().ToString();
                 entity.DepDetails.Add(jobDepDetail);
-
+                if (detail != null)
+                {
+                    jobDepDetail.ArriveDate = detail.ArriveDate;
+                    jobDepDetail.ProduceDate = detail.ProduceDate;
+                    jobDepDetail.ExpireDate = detail.ExpireDate;
+                }
+            }
             if (detail == null)
             {
                 var jobDetail = ObjectMapper.Map<CountJobDependentDetail, CountJobDetail>(depDetail);
@@ -335,14 +341,10 @@ public class CountJobManager : SfsJobManagerBase<CountJob, CountJobDetail>, ICou
             }
             else
             {              
-                    jobDepDetail.ArriveDate = detail.ArriveDate;
-                    jobDepDetail.ProduceDate = detail.ProduceDate;
-                    jobDepDetail.ExpireDate = detail.ExpireDate;
                 await entity.SetDetail(detail.Id, detail.SupplierBatch, detail.ArriveDate, detail.ProduceDate, detail.ExpireDate, detail.LocationCode, countCount, detail.CountTime, detail.CountOperator, detail.CountDescription)
                    .ConfigureAwait(false);
             }
         }
-        }
         //移除原有明细里没有，并且第二次扫描以处的项目
         entity.Details.RemoveAll(r => r.InventoryQty == 0 && r.CountQty == 0 && r.InventoryStage == entity.InventoryStage);
     }