更新版本

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

@@ -83,8 +83,6 @@ public class AssembleIssueJobAppService
     [HttpPost("add-many")]
     public override async Task<List<AssembleIssueJobDTO>> CreateManyAsync(List<AssembleIssueJobEditInput> inputs)
     {
-        
-
         foreach (var input in inputs)
         {
             await CheckMinRowAndSetStatusAsync(input).ConfigureAwait(false);
@@ -93,8 +91,11 @@ public class AssembleIssueJobAppService
             if (dimensionalStorehouseflag)
             {
                 input.IsClaims = true;
-                input.ClaimsUserId = "LITK"; //todo
+                input.ClaimsUserId    = string.IsNullOrEmpty(_options.Value.StereosUser) ? "LYF" : _options.Value.StereosUser;
-                input.ClaimsUserName = "LITK"; //todo
+                input.ClaimsUserName  = string.IsNullOrEmpty(_options.Value.StereosPassword) ? "LYF" : _options.Value.StereosPassword;
+
+
+
             }
         }
         var assembleIssueJobDtos = await base.CreateManyAsync(inputs).ConfigureAwait(false);
@@ -102,9 +103,7 @@ public class AssembleIssueJobAppService
         {
             await CheckDimensionalStorehouseAsync(assembleIssueJobDto).ConfigureAwait(false);
         }
-
         return assembleIssueJobDtos;
-
     }
 
     
@@ -304,9 +303,9 @@ public class AssembleIssueJobAppService
         var assembleIssueJob = await _repository.GetAsync(masterId).ConfigureAwait(false);
         assembleIssueJob.JobStatus = EnumJobStatus.Doing;
 
-        assembleIssueJob.ClaimsUserId = "LITK";
+        assembleIssueJob.ClaimsUserId = string.IsNullOrEmpty( _options.Value.StereosUser)? "LYF" : _options.Value.StereosUser;
-        assembleIssueJob.ClaimsUserName = "LITK";
+        assembleIssueJob.ClaimsUserName = string.IsNullOrEmpty(_options.Value.StereosPassword) ? "LYF" : _options.Value.StereosPassword;
-       
+
 
         //if (assembleIssueJob.IsClaims)
         //{
@@ -330,6 +329,8 @@ public class AssembleIssueJobAppService
         issueJobDetail.HandledFromQty = entityDetail.HandledFromQty;
         issueJobDetail.HandledToQty = entityDetail.HandledToQty;
 
+
+
         issueJobDetail.HandledToQty += issueJobDetailDto.HandledToQty;
         issueJobDetail.HandledFromQty += issueJobDetailDto.HandledFromQty;
         assembleIssueJob.Details = new EditableList<AssembleIssueJobDetail> { issueJobDetail };
@@ -614,16 +615,24 @@ public class AssembleIssueJobAppService
                         dto.HandledToLocationGroup = toloc.LocationGroupCode;
                         dto.HandledToLocationArea = toloc.AreaCode;
                         dto.HandledToLocationErpCode = toloc.ErpLocationCode;
+                        dto.HandledToLot = string.Empty;
+                        dto.HandledToWarehouseCode = toloc.WarehouseCode;
+                        dto.HandledToQty = detail.Qty;
+                        dto.HandledToLot = string.Empty;
+                        dto.HandledToPackingCode = string.Empty;
 
 
+                        dto.HandledFromWarehouseCode=fromloc.WarehouseCode;
                         dto.HandledFromLocationCode = fromloc.Code;
                         dto.HandledFromLocationGroup = fromloc.LocationGroupCode;
                         dto.HandledFromLocationArea = fromloc.AreaCode;
                         dto.HandledFromLocationErpCode = fromloc.ErpLocationCode;
-                      
+                        dto.HandledFromQty = detail.Qty;
-                      
+                        dto.HandledFromLot = string.Empty;
-                    
+                        dto.HandledFromPackingCode = string.Empty;
-                        //dto.HandledFromPackingCode = "";
+
+
+
                         details.Add(dto);
                         await ExecuteDetailExtAsync(itm.Id, entity.Id, dto).ConfigureAwait(false);
                     }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteAppService.cs

@@ -38,6 +38,8 @@ public class AssembleIssueNoteAppService :
     //[Authorize(AssembleIssueNotePermissions.Create)]
     public override async Task<AssembleIssueNoteDTO> CreateAsync(AssembleIssueNoteEditInput input)
     {
+
+
         var entity = ObjectMapper.Map<AssembleIssueNoteEditInput, AssembleIssueNote>(input);
         await _assembleIssueNoteManager.CreateAsync(entity).ConfigureAwait(false);
         var dto = ObjectMapper.Map<AssembleIssueNote, AssembleIssueNoteDTO>(entity);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Options/RestoOptions.cs

@@ -15,9 +15,15 @@ public class RestoOptions
     public string Password { set; get; }
     // 令牌
     public string Token { set; get; }
-
+    // 路径
     public string Path { set; get; }
 
+    //立体库用户名
+    public string StereosUser { set; get; }
+
+    //立体库密码
+    public string StereosPassword { set; get; }
+
 
 
 }