三方库更新

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/ThirdLocationJobController.cs

@@ -52,7 +52,6 @@ public class ThirdLocationJobController : AbpController
     /// <param name="id"></param>
     /// <returns></returns>
     [HttpGet("{id}")]
-
     public virtual async Task<ActionResult<ThirdLocationJobDTO>> GetAsync(Guid id)
     {
         var result = await _thirdLocationJobAppService.GetAsync(id).ConfigureAwait(false);

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/ThirdLocationRequestController.cs

@@ -30,6 +30,18 @@ public class ThirdLocationRequestController : AbpController
         _thirdLocationRequestAppService = ThirdLocationRequestAppService;
     }
 
+    /// <summary>
+    /// 获取申请详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet("{id}")]
+    public virtual async Task<ActionResult<ThirdLocationRequestDTO>> GetAsync(Guid id)
+    {
+        var result = await _thirdLocationRequestAppService.GetAsync(id).ConfigureAwait(false);
+        return Ok(result);
+    }
+
     /// <summary>
     /// 三方库库移申请
     /// </summary>
@@ -46,9 +58,9 @@ public class ThirdLocationRequestController : AbpController
     /// </summary>
     /// <param name="number"></param>
     /// <returns></returns>
-    [HttpGet("{number}")]
+    [HttpGet("get/{number}")]
 
-    public virtual async Task<ActionResult<ThirdLocationRequestDTO>> GetAsync(string number)
+    public virtual async Task<ActionResult<ThirdLocationRequestDTO>> GetRequestByNumberAsync(string number)
     {
         var result = await _thirdLocationRequestAppService.GetByNumberAsync(number).ConfigureAwait(false);
         return Ok(result);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/ThirdLocationJobs/ThirdLocationJobAppService.cs

@@ -58,9 +58,9 @@ public class ThirdLocationJobAppService
         {
             var jobDetail= job.Details.FirstOrDefault(p => p.ItemCode == dto.Details[0].ItemCode);
 
-            if (jobDetail.HandledQty + dto.Details[0].HandledQty > jobDetail.RecommendQty)
+            if (dto.Details[0].HandledQty > jobDetail.RecommendQty)
             {
-                throw new UserFriendlyException($"任务错误：编号为【{job.Number}】的实际数量【{jobDetail.HandledQty + dto.Details[0].HandledQty}】不能大于申请数量【{dto.Details[0].RecommendQty}】");
+                throw new UserFriendlyException($"任务错误：编号为【{job.Number}】的实际数量【{dto.Details[0].HandledQty}】不能大于推荐数量【{dto.Details[0].RecommendQty}】");
             }
             if (jobDetail.ToLocationCode != dto.Details[0].ToLocationCode)
             {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs

@@ -163,9 +163,9 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
                 throw new UserFriendlyException($"{detailInput.ItemCode} 物品的库存为 {realityBalance} ,库存不够");
             }
 
-            //detailInput.ProdLine = detailInput.ToLocationCode;
+            
             detailInput.ToLocationErpCode = toLocationDto.ErpLocationCode;
-            detailInput.IssuedQty = detailInput.Qty;
+            
 
         }
                 
@@ -188,6 +188,7 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
             detail.ItemName = itemBasicDto.Name;
             detail.Uom = itemBasicDto.BasicUom;
             detail.StdPackQty = itemBasicDto.StdPackQty;
+            detail.IssuedQty = detail.Qty;
         }
 
         var result = await _thirdLocationRequestManager.CreateAsync(entity).ConfigureAwait(false);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAutoMapperProfile.cs

@@ -19,6 +19,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile
         CreateMap<ThirdLocationRequestDetailInput, ThirdLocationRequestDetail>()
               .IgnoreAuditedObjectProperties()
               .Ignore(x => x.ToLocationArea)
+              .Ignore(x => x.IssuedQty)
               .Ignore(x => x.ToLocationGroup)
               .Ignore(x => x.ToWarehouseCode)
               .Ignore(x => x.MasterID)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ThirdLocationJobs/ThirdLocationJobManager.cs

@@ -65,12 +65,14 @@ public class ThirdLocationJobManager : SfsJobManagerBase<ThirdLocationJob, Third
         {
             jobDetail.HandledQty += input.Details[0].HandledQty;
             jobDetail.RecommendQty= jobDetail.RecommendQty- input.Details[0].HandledQty;
+            jobDetail.SingleCodeJob = input.Details[0].SingleCodeJob;
             isDone = true;
         }
         else
         {
             jobDetail.HandledQty += input.Details[0].HandledQty;
             jobDetail.RecommendQty = jobDetail.RecommendQty - input.Details[0].HandledQty;
+            jobDetail.SingleCodeJob = input.Details[0].SingleCodeJob;
             isDone = false;
         }