Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

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

@@ -83,11 +83,12 @@ public class CountJobManager : SfsJobManagerBase<CountJob, CountJobDetail>, ICou
             var entityDetail = entity.Details.FirstOrDefault(p => p.Id == detail.Id);
 
             //新增盘点明细
-            if (entityDetail == null)
+            if (entityDetail == null||entityDetail.Id==Guid.Empty)
             {
 
                 var jobDetail = ObjectMapper.Map<CountJobDetail, CountJobDetail>(detail);
-
+                var number =await GetNumber();
+                jobDetail.SetIdAndNumber(GuidGenerator,entity.Id, number);
                 jobDetail.CountLabel = GuidGenerator.Create().ToString();
                 //CountJobDetail jobDetail = new CountJobDetail() {   };
 

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

@@ -43,7 +43,7 @@ public class CountJobEventHandler :
     }
 
     private async Task<CountPlanEditInput> BuildCountPlanJobUpdateDTO(CountJob entity)
-    {
+    { 
         var countPlanUpdateInput = ObjectMapper.Map<CountJob, CountPlanEditInput>(entity);
 
         foreach (var detail in countPlanUpdateInput.Details)