改了序列号
This commit is contained in:
@@ -470,17 +470,32 @@ namespace BarCode.Web.Domain.Services
|
|||||||
{
|
{
|
||||||
var sentity = serialList.FirstOrDefault(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s));
|
var sentity = serialList.FirstOrDefault(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s));
|
||||||
|
|
||||||
|
if (sentity.TwoNumberCode.IndexOf(s) >= 0)
|
||||||
|
|
||||||
sList.Add(new Core.Dto.Box.OpsSerialNumbersResponse()
|
|
||||||
{
|
{
|
||||||
SerialNumber = s,
|
|
||||||
BarCereateUser = _singleDataService.GetSingleData(SingleAction.Users, box.CompanyId, sentity == null ? 0 : sentity.CreatorId),
|
sList.Add(new Core.Dto.Box.OpsSerialNumbersResponse()
|
||||||
BarCreateTime = sentity == null ? null : sentity.CreateTime,
|
{
|
||||||
IsTwo = sentity==null ? 1 :sentity.IsTwo,
|
SerialNumber = s,
|
||||||
TwoSerialNumber = sentity == null ? s: sentity.TwoSerialNumber,
|
BarCereateUser = _singleDataService.GetSingleData(SingleAction.Users, box.CompanyId, sentity == null ? 0 : sentity.CreatorId),
|
||||||
IsNotCount = sentity == null ? "0":sentity.IsNotCount
|
BarCreateTime = sentity == null ? null : sentity.CreateTime,
|
||||||
});
|
IsTwo = sentity == null ? 1 : sentity.IsTwo,
|
||||||
|
TwoSerialNumber = sentity == null ? s : sentity.TwoNumberCode,
|
||||||
|
IsNotCount = sentity == null ? "0" : sentity.IsNotCount
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sList.Add(new Core.Dto.Box.OpsSerialNumbersResponse()
|
||||||
|
{
|
||||||
|
SerialNumber = s,
|
||||||
|
BarCereateUser = _singleDataService.GetSingleData(SingleAction.Users, box.CompanyId, sentity == null ? 0 : sentity.CreatorId),
|
||||||
|
BarCreateTime = sentity == null ? null : sentity.CreateTime,
|
||||||
|
IsTwo = sentity == null ? 1 : sentity.IsTwo,
|
||||||
|
TwoSerialNumber = sentity == null ? s : sentity.TwoSerialNumber,
|
||||||
|
IsNotCount = sentity == null ? "0" : sentity.IsNotCount
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
//以前是之前的
|
//以前是之前的
|
||||||
//// var sentity = serialList.FirstOrDefault(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s));
|
//// var sentity = serialList.FirstOrDefault(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s));
|
||||||
//// var sentity = serialList.GetEntityListBySuitNumber(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s));
|
//// var sentity = serialList.GetEntityListBySuitNumber(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s));
|
||||||
|
|||||||
Reference in New Issue
Block a user