采购上架-getTaskByBox接口优化

src/WMS.Web.Api/Controllers/InStockController.cs

@@ -131,21 +131,20 @@ namespace WMS.Web.Api.Controllers
 
             return await _inStockService.ShelfNoPurchase(dto, loginInfo);
         }
-
         /// <summary>
-        /// 通过箱号获取到入库任务单数据
+        /// 通过箱号获取到入库任务单数据-PAD
         /// </summary>
-        /// <param name="boxBillNo"></param>
+        /// <param name="dto"></param>
         /// <returns></returns>
-        [HttpGet]
+        [HttpPost]
-        [Route("GetTaskByBox/{boxBillNo}")]
+        [Route("GetTaskByBox")]
-        public async Task<Result<BoxInStockTaskDto>> GetTaskByBox([FromRoute] string boxBillNo)
+        public async Task<Result<BoxInStockTaskDto>> GetTaskByBoxBy([FromBody] BoxInStockTaskRequest dto)
         {
             var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
             if (loginInfo == null || loginInfo.UserInfo == null)
                 return Result<BoxInStockTaskDto>.ReFailure(ResultCodes.Token_Invalid_Error);
 
-            return await _inStockService.GetInfoByBox(boxBillNo);
+            return await _inStockService.GetInfoByBox(dto);
         }
 
         /// <summary>

src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml

@@ -121,11 +121,11 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Api.Controllers.InStockController.GetTaskByBox(System.String)">
+        <member name="M:WMS.Web.Api.Controllers.InStockController.GetTaskByBoxBy(WMS.Web.Core.Dto.InStock.BoxInStockTaskRequest)">
             <summary>
-            通过箱号获取到入库任务单数据
+            通过箱号获取到入库任务单数据-PAD
             </summary>
-            <param name="boxBillNo"></param>
+            <param name="dto"></param>
             <returns></returns>
         </member>
         <member name="M:WMS.Web.Api.Controllers.InStockController.Sync(WMS.Web.Core.Dto.OperateRequest)">

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -2005,6 +2005,21 @@
             创建时间（erp那边的创建时间）
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.InStock.BoxInStockTaskRequest">
+            <summary>
+            箱号-获取来源单信息-请求对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.BoxInStockTaskRequest.BoxBillNo">
+            <summary>
+            箱号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.BoxInStockTaskRequest.StockCode">
+            <summary>
+            仓库编码
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.InStock.InStockInfoResponse">
             <summary>
             入库单详情

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -2413,11 +2413,11 @@
             <param name="loginInDto"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.IService.IInStockService.GetInfoByBox(System.String)">
+        <member name="M:WMS.Web.Domain.IService.IInStockService.GetInfoByBox(WMS.Web.Core.Dto.InStock.BoxInStockTaskRequest)">
             <summary>
             获取任务单：根据箱号信息
             </summary>
-            <param name="boxBillNo"></param>
+            <param name="dto"></param>
             <returns></returns>
         </member>
         <member name="M:WMS.Web.Domain.IService.IInStockService.UpdateRange(System.Collections.Generic.List{System.Int32},System.Int32,System.Boolean,System.Boolean)">
@@ -3641,11 +3641,11 @@
             <param name="loginInDto"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.Services.InStockService.GetInfoByBox(System.String)">
+        <member name="M:WMS.Web.Domain.Services.InStockService.GetInfoByBox(WMS.Web.Core.Dto.InStock.BoxInStockTaskRequest)">
             <summary>
             获取任务单：根据箱号信息
             </summary>
-            <param name="boxBillNo"></param>
+            <param name="dto"></param>
             <returns></returns>
         </member>
         <member name="M:WMS.Web.Domain.Services.InStockService.ShelfSave(WMS.Web.Core.Dto.InStock.PurchaseShelfRequest,WMS.Web.Domain.Values.InstockType,WMS.Web.Core.Dto.Login.LoginInDto,System.Boolean)">

src/WMS.Web.Core/Dto/InStock/BoxInStockTaskRequest.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.InStock
+{
+    /// <summary>
+    /// 箱号-获取来源单信息-请求对象
+    /// </summary>
+    public class BoxInStockTaskRequest
+    {
+        /// <summary>
+        /// 箱号
+        /// </summary>
+        public string BoxBillNo { get; set; }
+
+        /// <summary>
+        /// 仓库编码
+        /// </summary>
+        public string StockCode { get; set; }
+    }
+}

src/WMS.Web.Domain/IService/IInStockService.cs

@@ -52,9 +52,9 @@ namespace WMS.Web.Domain.IService
         /// <summary>
         /// 获取任务单：根据箱号信息
         /// </summary>
-        /// <param name="boxBillNo"></param>
+        /// <param name="dto"></param>
         /// <returns></returns>
-        Task<Result<BoxInStockTaskDto>> GetInfoByBox(string boxBillNo);
+        Task<Result<BoxInStockTaskDto>> GetInfoByBox(BoxInStockTaskRequest dto);
 
         /// <summary>
         /// 批量修改-入库任务信息

src/WMS.Web.Domain/Services/InStockService.cs

@@ -140,9 +140,9 @@ namespace WMS.Web.Domain.Services
         /// <summary>
         /// 获取任务单：根据箱号信息
         /// </summary>
-        /// <param name="boxBillNo"></param>
+        /// <param name="dto"></param>
         /// <returns></returns>
-        public async Task<Result<BoxInStockTaskDto>> GetInfoByBox(string boxBillNo)
+        public async Task<Result<BoxInStockTaskDto>> GetInfoByBox(BoxInStockTaskRequest dto)
         {
             //1.获取物料集合
             var materials_result = await _erpService.BillQueryForMaterial();
@@ -151,15 +151,26 @@ namespace WMS.Web.Domain.Services
                 materials = materials_result.Data.ToList();
 
             //1.先判断：箱号已经绑定了入库任务单中；备注：业务说法就是箱是否收货了
-            var tast_box= await _inStockTaskBoxRepositories.GetBy(boxBillNo);            
+            var tast_box= await _inStockTaskBoxRepositories.GetBy(dto.BoxBillNo);            
             if (tast_box == null)
                 return Result<BoxInStockTaskDto>.ReFailure(ResultCodes.Box_NoBind_Task_Data);
 
             //1.2找到任务单
             var tast = await _inStockTaskRepositories.Get(tast_box.TaskId);
+            if(tast == null)
+                return Result<BoxInStockTaskDto>.ReFailure(ResultCodes.InStockTaskNoData);
+
+            //1.2.1判断箱子绑定的物料明细数据的仓库，是不是用户所选的仓库；不是则提示：箱号仓库不对
+            foreach (var item in tast_box.Details)
+            {
+                var tast_det = tast.Details.Where(t => t.ErpDetailId == item.ErpDetailId).FirstOrDefault();
+                if (tast_det != null && tast_det.StockCode != dto.StockCode)
+                    return Result<BoxInStockTaskDto>.ReFailure(ResultCodes.BoxBindTaskDetailsIdNotChoose);
+            }
+
 
             //2.找到箱对应的物料信息
-            var box = await _boxRepositories.GetByNo(boxBillNo);
+            var box = await _boxRepositories.GetByNo(dto.BoxBillNo);
             if (box == null)
                 return Result<BoxInStockTaskDto>.ReFailure(ResultCodes.BoxNoData);
 

src/WMS.Web.Domain/Values/ResultCodes.cs

@@ -40,7 +40,8 @@ namespace WMS.Web.Domain.Values
         public static ValueTuple<int, string> BoxMateriaNoData = (800010, "箱对应物料信息不存在");
         public static ValueTuple<int, string> MateriaNoData = (800011, "物料信息不存在");
         public static ValueTuple<int, string> BoxInventorySerialNumbersNoData = (800012, "序列号不存在于箱库存数据中");
-
+        public static ValueTuple<int, string> InStockTaskNoData = (900000, "来源单不存在");
+        public static ValueTuple<int, string> BoxBindTaskDetailsIdNotChoose = (900000, "箱号仓库不对");
         public static ValueTuple<int, string> ErpStockNoData = (900000, "Erp仓库信息不完整");
         public static ValueTuple<int, string> Box_NoBind_Task_Data = (80001, "该箱号不在收货信息中，请核对再试！");
         public static ValueTuple<int, string> OrderNoData = (80002, "单据信息不存在，请核对后再试！");