调整接口

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

@@ -87,23 +87,45 @@ namespace WMS.Web.Api.Controllers
         }
 
         /// <summary>
-        /// 根据出库单任务编号搜索-PDA出库
+        /// 根据出库单任务编号模糊搜索-PDA出库
         /// </summary>
         /// <param name="billNo"></param>
         /// <returns></returns>
         [HttpGet]
-        [Route("GetOutStockTaskByNo/{billNo}")]
+        [Route("GetOutStockTaskListByNo/{billNo}")]
-        public async Task<ResultList<GetOutStockTaskByNoResponse>> GetOutStockTaskByNo([FromRoute] string billNo)
+        public async Task<ResultList<GetOutStockTaskByNoResponse>> GetOutStockTaskListByNo([FromRoute] string billNo)
         {
             var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
             if (loginInfo == null || loginInfo.UserInfo == null)
                 return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
 
-            var res = await _repositories.GetOutStockTaskByNo(billNo);
+            var res = await _repositories.GetOutStockTaskListByNo(billNo);
             if (res == null) return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.OutStockTaskNoData);
             return ResultList<GetOutStockTaskByNoResponse>.ReSuccess(res);
         }
 
+        /// <summary>
+        /// 根据出库单任务编号精确搜索(并且同步金蝶数据)-PDA出库
+        /// </summary>
+        /// <param name="billNo"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetOutStockTaskByNo/{billNo}")]
+        public async Task<Result<GetOutStockTaskByNoResponse>> GetOutStockTaskByNo([FromRoute] string billNo)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return Result<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
+
+            //搜索之前同步金蝶数据
+            await _outStockTaskService.Ssyn(new List<string>() { billNo });
+
+            var res = await _repositories.GetOutStockTaskByNo(billNo);
+            if (res == null) return Result<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.OutStockTaskNoData);
+            return Result<GetOutStockTaskByNoResponse>.ReSuccess(res);
+        }
+
+
         /// <summary>
         /// 刷新金蝶数据
         /// </summary>

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

@@ -115,9 +115,9 @@ namespace WMS.Web.Api.Controllers
         /// <returns></returns>
         [HttpGet]
         [Route("GetOrg")]
-        public async Task<ResultList<ErpOrgDto>> GetOrg() 
+        public async Task<ResultList<ErpOrgDto>> GetOrg()
         {
-            var orgs_result=await _erpService.BillQueryForOrg();
+            var orgs_result = await _erpService.BillQueryForOrg();
             return orgs_result;
         }
 
@@ -166,7 +166,7 @@ namespace WMS.Web.Api.Controllers
             if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD"))
             {
                 var subs = await _erpService.BillQueryForSubStock(number);
-                foreach (var s in subs.Data.Where(w=> EF.Functions.Like(w.Name, "%" + name + "%")))
+                foreach (var s in subs.Data.Where(w => EF.Functions.Like(w.Name, "%" + name + "%")))
                 {
                     list.Add(new UcStockResponse()
                     {
@@ -183,10 +183,11 @@ namespace WMS.Web.Api.Controllers
         /// <summary>
         /// 获取出库单客户下拉列表
         /// </summary>
+        /// <param name="name">客户名</param>
         /// <returns></returns>
         [HttpGet]
-        [Route("GetCustomers")]
+        [Route("GetCustomers/{name}")]
-        public async Task<Result<List<PullDownStrResponse>>> GetCustomers()
+        public async Task<Result<List<PullDownStrResponse>>> GetCustomers([FromRoute] string name)
         {
             var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
             if (loginInfo == null || loginInfo.UserInfo == null)
@@ -194,7 +195,7 @@ namespace WMS.Web.Api.Controllers
             var customers = await _erpService.BillQueryForCustomer();
             var orgs = await _erpService.BillQueryForOrg();
             List<PullDownStrResponse> pullList = new List<PullDownStrResponse>();
-            foreach (var c in customers.Data)
+            foreach (var c in customers.Data.Where(w=> EF.Functions.Like(w.Name, "%" + name + "%")))
             {
                 pullList.Add(new PullDownStrResponse()
                 {
@@ -203,7 +204,7 @@ namespace WMS.Web.Api.Controllers
                     Code = c.Number
                 });
             }
-            foreach (var o in orgs.Data)
+            foreach (var o in orgs.Data.Where(w => EF.Functions.Like(w.Name, "%" + name + "%")))
             {
                 pullList.Add(new PullDownStrResponse()
                 {

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

@@ -265,9 +265,16 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.OutStockTaskController.GetOutStockTaskListByNo(System.String)">
+            <summary>
+            根据出库单任务编号模糊搜索-PDA出库
+            </summary>
+            <param name="billNo"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.OutStockTaskController.GetOutStockTaskByNo(System.String)">
             <summary>
-            根据出库单任务编号搜索-PDA出库
+            根据出库单任务编号精确搜索(并且同步金蝶数据)-PDA出库
             </summary>
             <param name="billNo"></param>
             <returns></returns>
@@ -324,10 +331,11 @@
             <param name="name">模糊匹配</param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetCustomers">
+        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetCustomers(System.String)">
             <summary>
             获取出库单客户下拉列表
             </summary>
+            <param name="name">客户名</param>
             <returns></returns>
         </member>
         <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStockByName(System.String)">

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

@@ -2920,6 +2920,11 @@
              出库数量
             </summary> 
         </member>
+        <member name="P:WMS.Web.Core.Dto.OutStock.SaveOutStockDetailsRequest.SerialNumbers">
+            <summary>
+            序列号集
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.PaginationRequestDto.OrgId">
             <summary>
             组织Id(所有列表页都需要 全局)

src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs

@@ -30,5 +30,9 @@ namespace WMS.Web.Core.Dto.OutStock
         ///</summary> 
         [Required(ErrorMessage = "出库数量不能为空")]
         public decimal Qty { get; set; }
+        /// <summary>
+        /// 序列号集
+        /// </summary>
+        public List<string> SerialNumbers { get; set; } = new List<string>();
     }
 }

src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs

@@ -37,6 +37,8 @@ namespace WMS.Web.Domain.Infrastructure
         //获取实体
         Task<OutStockTask> Get(int id);
         //根据订单号获取订单信息
-        Task<List<GetOutStockTaskByNoResponse>> GetOutStockTaskByNo(string billNo);
+        Task<List<GetOutStockTaskByNoResponse>> GetOutStockTaskListByNo(string billNo);
+        //根据订单号获取订单信息
+        Task<GetOutStockTaskByNoResponse> GetOutStockTaskByNo(string billNo);
     }
 }

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

@@ -53,11 +53,11 @@ namespace WMS.Web.Domain.Services
         {
             var outStockTask = await _outStockTaskRepositories.Get(dto.TaskId);
             //OutStock entity = await _outStockRepositories.GetByTaskId(dto.TaskId);
-            //同步该订单最新数据到wms系统
+            ////同步该订单最新数据到wms系统
-            List<string> nos = new List<string>();
+            //List<string> nos = new List<string>();
-            nos.Add(outStockTask.SourceBillNo);
+            //nos.Add(outStockTask.SourceBillNo);
-            var res = await _outStockTaskService.Ssyn(nos);
+            //var res = await _outStockTaskService.Ssyn(nos);
-            if (!res.IsSuccess) return Result.ReSuccess();
+            //if (!res.IsSuccess) return Result.ReSuccess();
 
             OutStock entity = new OutStock();
             entity.Create(loginInfo.UserInfo.StaffId, outStockTask);
@@ -66,7 +66,7 @@ namespace WMS.Web.Domain.Services
                 //任务单明细
                 var tDetail = outStockTask.Details.FirstOrDefault(f => f.MaterialId == d.MaterialId);
                 if (tDetail == null) continue;
-                res = outStockTask.OutStock(d.MaterialId, d.Qty);
+                var res = outStockTask.OutStock(d.MaterialId, d.Qty);
                 if (!res.IsSuccess) return res;
 
                 var outd = _mapper.Map<OutStockDetails>(tDetail);

src/WMS.Web.Repositories/OutStockTaskRepositories.cs

@@ -308,7 +308,7 @@ namespace WMS.Web.Repositories
         /// </summary>
         /// <param name="billNo"></param>
         /// <returns></returns>
-        public async Task<List<GetOutStockTaskByNoResponse>> GetOutStockTaskByNo(string billNo)
+        public async Task<List<GetOutStockTaskByNoResponse>> GetOutStockTaskListByNo(string billNo)
         {
             var materials_result = await _erpService.BillQueryForMaterial();
             if (!materials_result.IsSuccess)
@@ -329,6 +329,33 @@ namespace WMS.Web.Repositories
             }
             return response;
         }
+
+        /// <summary>
+        /// 根据订单号获取订单信息
+        /// </summary>
+        /// <param name="billNo"></param>
+        /// <returns></returns>
+        public async Task<GetOutStockTaskByNoResponse> GetOutStockTaskByNo(string billNo)
+        {
+            var materials_result = await _erpService.BillQueryForMaterial();
+            if (!materials_result.IsSuccess)
+                return new GetOutStockTaskByNoResponse();
+            var materials = materials_result.Data.ToList();
+
+            var list = await _context.OutStockTask.Include(x => x.Details)
+                .Where(f => f.BillNo.Equals(billNo) &&
+                (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)).ToListAsync();
+            var response = _mapper.Map<GetOutStockTaskByNoResponse>(list);
+            //获取物料信息 显示物料三件套
+            foreach (var r in response.details)
+            {
+                r.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, r.MaterialId);
+                r.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, r.MaterialId);
+                r.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, r.MaterialId);
+            }
+            return response;
+        }
+
         /// <summary>
         /// 根据来源单号搜索
         /// </summary>