修改发料RequestHandle

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs

@@ -916,7 +916,7 @@ public class AssembleIssueJobAppService
 
         if (entity == null)
         {
-            return ReturnMessage("-1", $"{entity.Number}任务单据不存在!");
+            return ReturnMessage("-1", $"{request.Data.First().OrderNum}任务单据不存在!");
         }
         var dto=ObjectMapper.Map<AssembleIssueJob, AssembleIssueJobDTO>(entity);
         if (entity.JobStatus == EnumJobStatus.Done)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs

@@ -937,7 +937,7 @@ public class CoatingIssueJobAppService
 
         if (entity == null)
         {
-            return ReturnMessage("-1", $"{entity.Number}任务单据不存在!");
+            return ReturnMessage("-1", $"{request.Data.First().OrderNum}任务单据不存在!");
         }
         var dto = ObjectMapper.Map<CoatingIssueJob, CoatingIssueJobDTO>(entity);
         if (entity.JobStatus == EnumJobStatus.Done)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs

@@ -886,7 +886,7 @@ public class InjectionIssueJobAppService
 
         if (entity == null)
         {
-            return ReturnMessage("-1", $"{entity.Number}任务单据不存在!");
+            return ReturnMessage("-1", $"{request.Data.First().OrderNum}任务单据不存在!");
         }
         var dto = ObjectMapper.Map<InjectionIssueJob, InjectionIssueJobDTO>(entity);
         if (entity.JobStatus == EnumJobStatus.Done)

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

@@ -901,7 +901,7 @@ public class KittingIssueJobAppService
 
         if (entity == null)
         {
-            return ReturnMessage("-1", $"{entity.Number}任务单据不存在!");
+            return ReturnMessage("-1", $"{request.Data.First().OrderNum}任务单据不存在!");
         }
         var dto = ObjectMapper.Map<KittingIssueJob, KittingIssueJobDTO>(entity);
         if (entity.JobStatus == EnumJobStatus.Done)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs

@@ -360,21 +360,6 @@ public class SparePartIssueJobAppService
             ? "LYF"
             : _options.Value.StereosPassword;
 
-
-
-
-        //if (sparePartIssueJob.IsClaims)
-        //{
-        //    if (sparePartIssueJob.ClaimsUserId != _currentUser.Id.ToString())
-        //    {
-        //        throw new UserFriendlyException($"该任务已被【{sparePartIssueJob.ClaimsUserName}】承接");
-        //    }
-        //}
-        //else
-        //{
-        //    throw new UserFriendlyException("该任务未被承接，请重新刷新页面，承接任务");
-        //}
-
         var sparePartIssueJobDto = ObjectMapper.Map<SparePartIssueJob, SparePartIssueJobDTO>(sparePartIssueJob);
         sparePartIssueJobDto.Details = new List<SparePartIssueJobDetailDTO> { issueJobDetailDto };
         var sparePartIssueNoteEditInput = await BuildSparePartIssueNoteAsync(sparePartIssueJobDto).ConfigureAwait(false);
@@ -912,7 +897,7 @@ public class SparePartIssueJobAppService
 
         if (entity == null)
         {
-            return ReturnMessage("-1", $"{entity.Number}任务单据不存在!");
+            return ReturnMessage("-1", $"{request.Data.First().OrderNum}任务单据不存在!");
         }
         var dto = ObjectMapper.Map<SparePartIssueJob, SparePartIssueJobDTO>(entity);
         if (entity.JobStatus == EnumJobStatus.Done)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs

@@ -400,7 +400,7 @@ public class UnplannedReceiptJobAppService
         }
         if (job.JobStatus != EnumJobStatus.WaitAgv)
         {
-            return ReturnMessage("-1", "该任务状态不是等待AGV中");
+            return ReturnMessage("-1", $"{agvRequest.OrderNum}任务状态不是等待AGV中");
         }
         var toLocationDto = await _locationAppService.GetByCodeAsync(agvRequest.EndPosition).ConfigureAwait(false);
         if (toLocationDto == null)
@@ -426,8 +426,8 @@ public class UnplannedReceiptJobAppService
     /// <summary>
     /// 返回信息
     /// </summary>
-    /// <param name="Code">0成功其他失败</param>
-    /// <param name="Message">OK成功其他错误信息</param>
+    /// <param name="code">0成功其他失败</param>
+    /// <param name="message">OK成功其他错误信息</param>
     /// <returns></returns>
     private AgvResultObject ReturnMessage(string code, string message)
     {

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

@@ -605,6 +605,14 @@ public class CoatingIssueRequestEventHandler
 
         if (CoatingIssueJobEditInputs.Count > 0) //有库存 可以创建任务
         {
+            CoatingIssueJobEditInputs.ForEach(p =>
+            {
+                p.Details.ForEach(x => x.Remark = CoatingIssueRequest.Remark);
+                p.Remark = CoatingIssueRequest.Remark;
+            });
+
+
+
             //新增任务
             var addCoatingIssueJobDtos = await _CoatingIssueJobAppService
                 .CreateManyAsync(CoatingIssueJobEditInputs)

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

@@ -605,6 +605,14 @@ public class InjectionIssueRequestEventHandler
 
         if (InjectionIssueJobEditInputs.Count > 0) //有库存 可以创建任务
         {
+            InjectionIssueJobEditInputs.ForEach(p =>
+            {
+                p.Details.ForEach(x => x.Remark = InjectionIssueRequest.Remark);
+                p.Remark = InjectionIssueRequest.Remark;
+            });
+
+
+
             //新增任务
             var addInjectionIssueJobDtos = await _InjectionIssueJobAppService
                 .CreateManyAsync(InjectionIssueJobEditInputs)

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

@@ -605,6 +605,13 @@ public class KittingIssueRequestEventHandler
 
         if (KittingIssueJobEditInputs.Count > 0) //有库存 可以创建任务
         {
+            KittingIssueJobEditInputs.ForEach(p =>
+            {
+                p.Details.ForEach(x => x.Remark = KittingIssueRequest.Remark);
+                p.Remark = KittingIssueRequest.Remark;
+            });
+
+
             //新增任务
             var addKittingIssueJobDtos = await _KittingIssueJobAppService
                 .CreateManyAsync(KittingIssueJobEditInputs)

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

@@ -605,6 +605,14 @@ public class SparePartIssueRequestEventHandler
 
         if (SparePartIssueJobEditInputs.Count > 0) //有库存 可以创建任务
         {
+            SparePartIssueJobEditInputs.ForEach(p =>
+            {
+                p.Details.ForEach(x => x.Remark = SparePartIssueRequest.Remark);
+                p.Remark = SparePartIssueRequest.Remark;
+            });
+
+
+
             //新增任务
             var addSparePartIssueJobDtos = await _SparePartIssueJobAppService
                 .CreateManyAsync(SparePartIssueJobEditInputs)