接口优化

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

@@ -135,7 +135,7 @@ namespace WMS.Web.Api.Controllers
         }
 
         /// <summary>
-        /// 来源单-编号模糊查询-pad
+        /// 来源单-编号模糊查询-采购上架使用-pad
         /// </summary>
         /// <param name="sourceBillNo">来源单号</param>
         /// <returns></returns>
@@ -147,7 +147,24 @@ namespace WMS.Web.Api.Controllers
             if (loginInfo == null || loginInfo.UserInfo == null)
                 return ResultList<SourceBillNoQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
 
-            var list= await _inStockTaskRepositories.GetListBy(new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo, InstockType = null });
+            var list= await _inStockTaskRepositories.GetListBy(new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo});
+            return ResultList<SourceBillNoQueryResponse>.ReSuccess(list);
+        }
+
+        /// <summary>
+        /// 来源单-编号模糊查询-采购上架使用-pad
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("GetSourceOrder")]
+        public async Task<ResultList<SourceBillNoQueryResponse>> GetSourceOrderBy([FromBody] InStockTaskBillNoQueryRequest dto)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return ResultList<SourceBillNoQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
+
+            var list = await _inStockTaskRepositories.GetListBy(dto);
             return ResultList<SourceBillNoQueryResponse>.ReSuccess(list);
         }
 
@@ -164,12 +181,29 @@ namespace WMS.Web.Api.Controllers
             if (loginInfo == null || loginInfo.UserInfo == null)
                 return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
 
-            var list = await _inStockTaskRepositories.GetListInfoBy(new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo, InstockType = null });
+            var list = await _inStockTaskRepositories.GetListInfoBy(new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo });
             return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReSuccess(list);
         }
 
         /// <summary>
-        /// 来源单的信息校准-对应金蝶-pad
+        /// 
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("GetSourceOrderNoPurchase")]
+        public async Task<ResultList<SourceBillNoNoPurchaseQueryResponse>> GetSourceOrderNoPurchaseBy([FromBody] InStockTaskBillNoQueryRequest dto)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
+
+            var list = await _inStockTaskRepositories.GetListInfoBy(dto);
+            return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReSuccess(list);
+        }
+
+        /// <summary>
+        /// 来源单的信息校准-采购上架使用-对应金蝶-pad
         /// </summary>
         /// <param name="sourceBillNo"></param>
         /// <returns></returns>

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

@@ -177,11 +177,18 @@
         </member>
         <member name="M:WMS.Web.Api.Controllers.InStockTaskController.GetSourceOrder(System.String)">
             <summary>
-            来源单-编号模糊查询-pad
+            来源单-编号模糊查询-采购上架使用-pad
             </summary>
             <param name="sourceBillNo">来源单号</param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.InStockTaskController.GetSourceOrderBy(WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryRequest)">
+            <summary>
+            来源单-编号模糊查询-采购上架使用-pad
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.InStockTaskController.GetSourceOrderNoPurchase(System.String)">
             <summary>
             来源单-编号模糊查询-非采购上架使用-pad
@@ -189,9 +196,16 @@
             <param name="sourceBillNo"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.InStockTaskController.GetSourceOrderNoPurchaseBy(WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryRequest)">
+            <summary>
+            
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.InStockTaskController.Adjust(System.String)">
             <summary>
-            来源单的信息校准-对应金蝶-pad
+            来源单的信息校准-采购上架使用-对应金蝶-pad
             </summary>
             <param name="sourceBillNo"></param>
             <returns></returns>

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

@@ -1270,9 +1270,9 @@
             来源单据编号
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryRequest.InstockType">
+        <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryRequest.StockCode">
             <summary>
-            来源单据类型
+            仓库编码
             </summary>
         </member>
         <member name="T:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto">

src/WMS.Web.Core/Dto/InStockTask/InStockTaskBillNoQueryRequest.cs

@@ -15,8 +15,8 @@ namespace WMS.Web.Core.Dto.InStockTask
         public string SourceBillNo { get; set; }
 
         /// <summary>
-        /// 来源单据类型
+        /// 仓库编码
         /// </summary>
-        public int? InstockType { get; set; }
+        public string StockCode { get; set; }
     }
 }

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

@@ -448,7 +448,7 @@ namespace WMS.Web.Domain.Services
             var boxDetails = boxs.SelectMany(x => x.Details).GroupBy(x => x.MaterialId).Select(x => new { MaterialId = x.Key, Qty = x.Sum(t => t.Qty) }).ToList();
 
             //3.比对：false为比对失败;
-            bool isRight = boxDetails.All(x => task.Details.Any(t => t.MaterialId == x.MaterialId && t.AccruedQty >= x.Qty)) && boxDetails.Count == task.Details.Count;
+            bool isRight = boxDetails.All(x => task.Details.Any(t => t.MaterialId == x.MaterialId && t.AccruedQty >= x.Qty)) && boxDetails.Count <= task.Details.Count;
             if (!isRight)
                 return Result<ContrastMaterialsResponse>.ReFailure(ResultCodes.ContrastError);
 

src/WMS.Web.Repositories/InStockTaskRepositories.cs

@@ -252,7 +252,7 @@ namespace WMS.Web.Repositories
         }
 
         /// <summary>
-        /// 列表-根据来源单号模糊
+        /// 列表-根据来源单号模糊-采购上架使用
         /// </summary>
         /// <param name="sourceBillNo"></param>
         /// <returns></returns>
@@ -270,8 +270,9 @@ namespace WMS.Web.Repositories
                  .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
                  .Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%") && (w.order.Status == InstockStatus.Part || w.order.Status == InstockStatus.Wait));
 
-            if(dto.InstockType.HasValue)
+            //仓库
-                query = query.Where(w => (int)w.order.Type == dto.InstockType.Value);
+            if (!string.IsNullOrEmpty(dto.StockCode))
+                query = query.Where(x => x.detail.StockCode == dto.StockCode);
 
             var list = await query.Select(s => new SourceBillNoQueryResponse()
             {
@@ -314,8 +315,6 @@ namespace WMS.Web.Repositories
             var task_query = _context.InStockTask
                  .Where(w => EF.Functions.Like(w.SourceBillNo, "%" + dto.SourceBillNo + "%") && (w.Status == InstockStatus.Part || w.Status == InstockStatus.Wait));
 
-            if (dto.InstockType.HasValue)
-                task_query = task_query.Where(w => (int)w.Type == dto.InstockType.Value);
             //找到头列表
             var taskList = await task_query
                 .Select(x => new SourceBillNoNoPurchaseQueryResponse()
@@ -327,8 +326,13 @@ namespace WMS.Web.Repositories
             {
                 var ids = taskList.Select(x => x.Id).ToList();
                 //找明细
-                var task_details = await _context.InStockTaskDetails.Where(x => ids.Contains(x.Fid))
+                var query = _context.InStockTaskDetails.Where(x => ids.Contains(x.Fid));
-                    .Select(s=>new SourceBillNoNoPurchaseDetailsQueryResponse() 
+
+                //仓库
+                if (!string.IsNullOrEmpty(dto.StockCode))
+                    query = query.Where(x => x.StockCode == dto.StockCode);
+
+                var task_details = await query.Select(s => new SourceBillNoNoPurchaseDetailsQueryResponse()
                 {
                     TaskId = s.Fid,
                     DetailsId = s.Id,
@@ -336,7 +340,7 @@ namespace WMS.Web.Repositories
                     OrgId = s.OrgId,
                     MaterialId = s.MaterialId,
                     StockCode = s.StockCode,
-                        StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode),
+                    StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode+s.OrgCode),
                     MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId),
                     MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
                     Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),