diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
index e12f0c28..1739a2a8 100644
--- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
+++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
@@ -87,23 +87,45 @@ namespace WMS.Web.Api.Controllers
}
///
- /// 根据出库单任务编号搜索-PDA出库
+ /// 根据出库单任务编号模糊搜索-PDA出库
///
///
///
[HttpGet]
- [Route("GetOutStockTaskByNo/{billNo}")]
- public async Task> GetOutStockTaskByNo([FromRoute] string billNo)
+ [Route("GetOutStockTaskListByNo/{billNo}")]
+ public async Task> GetOutStockTaskListByNo([FromRoute] string billNo)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList.ReFailure(ResultCodes.Token_Invalid_Error);
- var res = await _repositories.GetOutStockTaskByNo(billNo);
+ var res = await _repositories.GetOutStockTaskListByNo(billNo);
if (res == null) return ResultList.ReFailure(ResultCodes.OutStockTaskNoData);
return ResultList.ReSuccess(res);
}
+ ///
+ /// 根据出库单任务编号精确搜索(并且同步金蝶数据)-PDA出库
+ ///
+ ///
+ ///
+ [HttpGet]
+ [Route("GetOutStockTaskByNo/{billNo}")]
+ public async Task> GetOutStockTaskByNo([FromRoute] string billNo)
+ {
+ var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+ if (loginInfo == null || loginInfo.UserInfo == null)
+ return Result.ReFailure(ResultCodes.Token_Invalid_Error);
+
+ //搜索之前同步金蝶数据
+ await _outStockTaskService.Ssyn(new List() { billNo });
+
+ var res = await _repositories.GetOutStockTaskByNo(billNo);
+ if (res == null) return Result.ReFailure(ResultCodes.OutStockTaskNoData);
+ return Result.ReSuccess(res);
+ }
+
+
///
/// 刷新金蝶数据
///
diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs
index 94cb10aa..50ca44c3 100644
--- a/src/WMS.Web.Api/Controllers/SysConfigController.cs
+++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs
@@ -115,9 +115,9 @@ namespace WMS.Web.Api.Controllers
///
[HttpGet]
[Route("GetOrg")]
- public async Task> GetOrg()
+ public async Task> 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
///
/// 获取出库单客户下拉列表
///
+ /// 客户名
///
[HttpGet]
- [Route("GetCustomers")]
- public async Task>> GetCustomers()
+ [Route("GetCustomers/{name}")]
+ public async Task>> 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 pullList = new List();
- 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()
{
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index ea1caf79..e7f2d33d 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -265,9 +265,16 @@
+
+
+ 根据出库单任务编号模糊搜索-PDA出库
+
+
+
+
- 根据出库单任务编号搜索-PDA出库
+ 根据出库单任务编号精确搜索(并且同步金蝶数据)-PDA出库
@@ -324,10 +331,11 @@
模糊匹配
-
+
获取出库单客户下拉列表
+ 客户名
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 37cb9f56..350faf9c 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -2920,6 +2920,11 @@
出库数量
+
+
+ 序列号集
+
+
组织Id(所有列表页都需要 全局)
diff --git a/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs b/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
index 77e22436..7a2535ba 100644
--- a/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
+++ b/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
@@ -30,5 +30,9 @@ namespace WMS.Web.Core.Dto.OutStock
///
[Required(ErrorMessage = "出库数量不能为空")]
public decimal Qty { get; set; }
+ ///
+ /// 序列号集
+ ///
+ public List SerialNumbers { get; set; } = new List();
}
}
diff --git a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
index 11494c27..4365fed1 100644
--- a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
@@ -37,6 +37,8 @@ namespace WMS.Web.Domain.Infrastructure
//获取实体
Task Get(int id);
//根据订单号获取订单信息
- Task> GetOutStockTaskByNo(string billNo);
+ Task> GetOutStockTaskListByNo(string billNo);
+ //根据订单号获取订单信息
+ Task GetOutStockTaskByNo(string billNo);
}
}
diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs
index db05fb70..5e8fb87f 100644
--- a/src/WMS.Web.Domain/Services/OutStockService.cs
+++ b/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系统
- List nos = new List();
- nos.Add(outStockTask.SourceBillNo);
- var res = await _outStockTaskService.Ssyn(nos);
- if (!res.IsSuccess) return Result.ReSuccess();
+ ////同步该订单最新数据到wms系统
+ //List nos = new List();
+ //nos.Add(outStockTask.SourceBillNo);
+ //var res = await _outStockTaskService.Ssyn(nos);
+ //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(tDetail);
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index dfd5fcdf..801658ef 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -308,7 +308,7 @@ namespace WMS.Web.Repositories
///
///
///
- public async Task> GetOutStockTaskByNo(string billNo)
+ public async Task> GetOutStockTaskListByNo(string billNo)
{
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess)
@@ -329,6 +329,33 @@ namespace WMS.Web.Repositories
}
return response;
}
+
+ ///
+ /// 根据订单号获取订单信息
+ ///
+ ///
+ ///
+ public async Task 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(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;
+ }
+
///
/// 根据来源单号搜索
///