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

扫两件装

Browse Source
This commit is contained in:
18923810322
2025-05-30 11:14:14 +08:00
parent 969b8ef5ec
commit 980ed07333
1 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/BarCode.Web.Api/Controllers/WmsBoxController.cs
View File

@@ -103,12 +103,44 @@ namespace BarCode.Web.Api.Controllers
string[] s = entity.TwoSerialNumber.Split(','); string[] s = entity.TwoSerialNumber.Split(',');
string[] y = entity.TwoNumberCode.Split(',');
bool isNumberCode = false;
if (entity.TwoNumberCode.IndexOf(dto.SerialNumber, 0) >= 0)
{
isNumberCode = true;//说明是此次查的为数字序列号
}
if (isNumberCode)
{
for (int i = 0; i < s.Length; i++)
{
response = new SerialNumbersWmsResponse()
{
SerialNumber = y[i],//entity.SerialNumber.Equals(dto.SerialNumber) ? s[i] : sy[i],
// SerialNumber= entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode,
MaterialNumber = entity.MaterialNumber,
CreateTime = entity.CreateTime,
Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity.CreatorId),
IsTwo = entity.IsTwo,
TwoSerialNumber = entity.TwoSerialNumber,
TwoNumberCode = entity.TwoNumberCode,
IsNotCount = entity.IsNotCount
};
var entity2 = await _serialNumbersRepositories.GetEntityWms(y[i]);
entity2.WmsGet(s[i]);
list.Add(entity2);
}
}
else
{
// string[] sy = entity.TwoNumberCode.Split(','); // string[] sy = entity.TwoNumberCode.Split(',');
for (int i = 0; i < s.Length; i++) for (int i = 0; i < s.Length; i++)
{ {
response = new SerialNumbersWmsResponse() response = new SerialNumbersWmsResponse()
{ {
SerialNumber = s[i],//entity.SerialNumber.Equals(dto.SerialNumber) ? s[i] : sy[i], SerialNumber = s[i],//entity.SerialNumber.Equals(dto.SerialNumber) ? s[i] : sy[i],
// SerialNumber= entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode,
MaterialNumber = entity.MaterialNumber, MaterialNumber = entity.MaterialNumber,
CreateTime = entity.CreateTime, CreateTime = entity.CreateTime,
Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity.CreatorId), Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity.CreatorId),
@@ -122,11 +154,14 @@ namespace BarCode.Web.Api.Controllers
list.Add(entity2); list.Add(entity2);
} }
} }
}
else else
{ {
response = new SerialNumbersWmsResponse() response = new SerialNumbersWmsResponse()
{ {
SerialNumber = entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode, SerialNumber = entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode,
// SerialNumber = entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode,
MaterialNumber = entity.MaterialNumber, MaterialNumber = entity.MaterialNumber,
CreateTime = entity.CreateTime, CreateTime = entity.CreateTime,
Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity.CreatorId), Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity.CreatorId),