18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2024-03-08 15:00:22 +08:00
parent 8a57cd34f8 62856a8305
commit 9cc265af9f
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

17
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -190,30 +190,31 @@ namespace WMS.Web.Api.Controllers
/// <summary> /// <summary>
/// 自动生成箱信息 /// 自动生成箱信息
/// </summary> /// </summary>
/// <param name="str"></param> /// <param name="str">箱前缀</param>
/// <param name="number"></param> /// <param name="number">数量(明细条数)</param>
/// <param name="materialNumbers"></param> /// <param name="materialNumbers">物料编码</param>
/// <param name="orgCode">组织编码</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("SCBox/{str}/{number}")] [Route("SCBox/{str}/{number}")]
public async Task<Result> SCBox([FromRoute] string str, [FromRoute] int number, [FromQuery] List<string> materialNumbers) public async Task<Result> SCBox([FromRoute] string str, [FromRoute] int number, [FromQuery] List<string> materialNumbers, [FromQuery] string orgCode)
{ {
if (!_env.IsDevelopment()) return Result.ReSuccess(); if (!_env.IsDevelopment()) return Result.ReSuccess();
if (materialNumbers == null) if (materialNumbers == null)
materialNumbers = new List<string>(); materialNumbers = new List<string>();
var list = await GetList(str, number, materialNumbers); var list = await GetList(str, number, materialNumbers, orgCode);
await _boxService.Sync(list); await _boxService.Sync(list);
return Result.ReSuccess(); return Result.ReSuccess();
} }
private async Task<List<OpsBoxResponse>> GetList(string str, int number, List<string> materialNumbers) private async Task<List<OpsBoxResponse>> GetList(string str, int number, List<string> materialNumbers, string orgCode)
{ {
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
var materials = materials_result.Data.ToList(); var materials = materials_result.Data.ToList();
List<int> mIds = materials.Where(w => materialNumbers.Contains(w.MaterialNumber)).Select(s => s.MaterialId).ToList(); List<int> mIds = materials.Where(w => materialNumbers.Contains(w.MaterialNumber) && w.OrgCode == orgCode).Select(s => s.MaterialId).ToList();
int jn = 3; int jn = 3;
if (mIds.Count() <= 0) if (mIds.Count() <= 0)
mIds = materials.Skip((new Random()).Next(1000, 10000)).Take(4).Select(s => s.MaterialId).ToList(); mIds = materials.Where(w => w.OrgCode == orgCode).Skip((new Random()).Next(1000, 10000)).Take(4).Select(s => s.MaterialId).ToList();
jn = mIds.Count() - 1; jn = mIds.Count() - 1;
List<OpsBoxResponse> list = new List<OpsBoxResponse>(); List<OpsBoxResponse> list = new List<OpsBoxResponse>();
for (int i = 0; i < number; i++) for (int i = 0; i < number; i++)

9
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
View File

@@ -646,13 +646,14 @@
<param name="number"></param> <param name="number"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Api.Controllers.TestController.SCBox(System.String,System.Int32,System.Collections.Generic.List{System.String})"> <member name="M:WMS.Web.Api.Controllers.TestController.SCBox(System.String,System.Int32,System.Collections.Generic.List{System.String},System.String)">
<summary> <summary>
自动生成箱信息 自动生成箱信息
</summary> </summary>
<param name="str"></param> <param name="str">箱前缀</param>
<param name="number"></param> <param name="number">数量</param>
<param name="materialNumbers"></param> <param name="materialNumbers">物料编码</param>
<param name="orgCode">组织编码</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Api.Controllers.TestController.InStock"> <member name="M:WMS.Web.Api.Controllers.TestController.InStock">