修改测试
This commit is contained in:
@@ -170,24 +170,33 @@ namespace WMS.Web.Api.Controllers
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="str"></param>
|
/// <param name="str"></param>
|
||||||
/// <param name="number"></param>
|
/// <param name="number"></param>
|
||||||
|
/// <param name="materialNumber"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
[Route("SCBox/{str}/{number}")]
|
[Route("SCBox/{str}/{number}/{materialNumber}")]
|
||||||
public async Task<Result> SCBox([FromRoute] string str, [FromRoute] int number)
|
public async Task<Result> SCBox([FromRoute] string str, [FromRoute] int number, [FromRoute] List<string> materialNumbers)
|
||||||
{
|
{
|
||||||
var list = await GetList(str, number);
|
if (materialNumbers == null)
|
||||||
|
materialNumbers = new List<string>();
|
||||||
|
var list = await GetList(str, number, materialNumbers);
|
||||||
await _boxService.Sync(list);
|
await _boxService.Sync(list);
|
||||||
return Result.ReSuccess();
|
return Result.ReSuccess();
|
||||||
}
|
}
|
||||||
private async Task<List<OpsBoxResponse>> GetList(string str, int number)
|
private async Task<List<OpsBoxResponse>> GetList(string str, int number, List<string> materialNumbers)
|
||||||
{
|
{
|
||||||
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.Equals(w.MaterialNumber)).Select(s => s.MaterialId).ToList();
|
||||||
|
int jn = 3;
|
||||||
|
if (mIds.Count() <= 0)
|
||||||
|
mIds= materials.Skip((new Random()).Next(1000, 10000)).Take(4).Select(s => s.MaterialId).ToList();
|
||||||
|
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++)
|
||||||
{
|
{
|
||||||
List<OpsBoxDetailsResponse> Details = new List<OpsBoxDetailsResponse>();
|
List<OpsBoxDetailsResponse> Details = new List<OpsBoxDetailsResponse>();
|
||||||
for (int j = 0; j <= 3; j++)
|
for (int j = 0; j <= jn; j++)
|
||||||
{
|
{
|
||||||
var ran = (new Random()).Next(5, 10);
|
var ran = (new Random()).Next(5, 10);
|
||||||
List<OpsSerialNumbersResponse> SerialNumbers = new List<OpsSerialNumbersResponse>();
|
List<OpsSerialNumbersResponse> SerialNumbers = new List<OpsSerialNumbersResponse>();
|
||||||
@@ -204,7 +213,7 @@ namespace WMS.Web.Api.Controllers
|
|||||||
var mi = (new Random()).Next(1000, 20000);
|
var mi = (new Random()).Next(1000, 20000);
|
||||||
OpsBoxDetailsResponse d = new OpsBoxDetailsResponse()
|
OpsBoxDetailsResponse d = new OpsBoxDetailsResponse()
|
||||||
{
|
{
|
||||||
MaterialId = materials[mi].MaterialId,
|
MaterialId = mIds[j],
|
||||||
Qty = ran,
|
Qty = ran,
|
||||||
SerialNumbers = SerialNumbers
|
SerialNumbers = SerialNumbers
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -564,12 +564,13 @@
|
|||||||
<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)">
|
<member name="M:WMS.Web.Api.Controllers.TestController.SCBox(System.String,System.Int32,System.Collections.Generic.List{System.String})">
|
||||||
<summary>
|
<summary>
|
||||||
自动生成箱信息
|
自动生成箱信息
|
||||||
</summary>
|
</summary>
|
||||||
<param name="str"></param>
|
<param name="str"></param>
|
||||||
<param name="number"></param>
|
<param name="number"></param>
|
||||||
|
<param name="materialNumber"></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">
|
||||||
|
|||||||
Reference in New Issue
Block a user