修改了修改过型号的条码不显示名称的问题
This commit is contained in:
@@ -1,20 +1,21 @@
|
|||||||
using AutoMapper;
|
using AutoMapper;
|
||||||
|
using BarCode.Web.Core.Dto.Box;
|
||||||
|
using BarCode.Web.Core.Dto.SerialNumbers;
|
||||||
|
using BarCode.Web.Core.Internal.Results;
|
||||||
|
using BarCode.Web.Domain.Entitys;
|
||||||
using BarCode.Web.Domain.Infrastructure;
|
using BarCode.Web.Domain.Infrastructure;
|
||||||
using BarCode.Web.Domain.IService.Public;
|
|
||||||
using BarCode.Web.Domain.IService;
|
using BarCode.Web.Domain.IService;
|
||||||
|
using BarCode.Web.Domain.IService.Public;
|
||||||
|
using BarCode.Web.Domain.Services.Public;
|
||||||
|
using BarCode.Web.Domain.Values;
|
||||||
|
using BarCode.Web.Domain.Values.Single;
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using BarCode.Web.Core.Dto.Box;
|
using Newtonsoft.Json;
|
||||||
using BarCode.Web.Core.Internal.Results;
|
|
||||||
using BarCode.Web.Domain.Values;
|
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
using NPOI.SS.Formula.Functions;
|
using NPOI.SS.Formula.Functions;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Newtonsoft.Json;
|
|
||||||
using BarCode.Web.Core.Dto.SerialNumbers;
|
|
||||||
using BarCode.Web.Domain.Services.Public;
|
|
||||||
using BarCode.Web.Domain.Values.Single;
|
|
||||||
using System.ComponentModel.Design;
|
using System.ComponentModel.Design;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
namespace BarCode.Web.Api.Controllers
|
namespace BarCode.Web.Api.Controllers
|
||||||
{
|
{
|
||||||
@@ -127,7 +128,10 @@ namespace BarCode.Web.Api.Controllers
|
|||||||
TwoSerialNumber = entity.TwoNumberCode,
|
TwoSerialNumber = entity.TwoNumberCode,
|
||||||
TwoNumberCode = entity.TwoNumberCode,
|
TwoNumberCode = entity.TwoNumberCode,
|
||||||
IsNotCount = entity.IsNotCount,
|
IsNotCount = entity.IsNotCount,
|
||||||
NumberCode=entity.NumberCode
|
NumberCode=entity.NumberCode,
|
||||||
|
MaterialName= entity.MaterialName,
|
||||||
|
Specifications=entity.Specifications,
|
||||||
|
BarCode=entity.BarCode
|
||||||
|
|
||||||
};
|
};
|
||||||
var entity2 = await _serialNumbersRepositories.GetEntityWms(y[i]);
|
var entity2 = await _serialNumbersRepositories.GetEntityWms(y[i]);
|
||||||
@@ -151,7 +155,10 @@ namespace BarCode.Web.Api.Controllers
|
|||||||
TwoSerialNumber = entity.TwoSerialNumber,
|
TwoSerialNumber = entity.TwoSerialNumber,
|
||||||
TwoNumberCode = entity.TwoNumberCode,
|
TwoNumberCode = entity.TwoNumberCode,
|
||||||
IsNotCount = entity.IsNotCount,
|
IsNotCount = entity.IsNotCount,
|
||||||
NumberCode = entity.NumberCode
|
NumberCode = entity.NumberCode,
|
||||||
|
MaterialName = entity.MaterialName,
|
||||||
|
Specifications = entity.Specifications,
|
||||||
|
BarCode = entity.BarCode
|
||||||
};
|
};
|
||||||
var entity2 = await _serialNumbersRepositories.GetEntityWms(s[i]);
|
var entity2 = await _serialNumbersRepositories.GetEntityWms(s[i]);
|
||||||
entity2.WmsGet(s[i]);
|
entity2.WmsGet(s[i]);
|
||||||
@@ -173,7 +180,10 @@ namespace BarCode.Web.Api.Controllers
|
|||||||
TwoSerialNumber = entity.TwoSerialNumber,
|
TwoSerialNumber = entity.TwoSerialNumber,
|
||||||
TwoNumberCode = entity.TwoNumberCode,
|
TwoNumberCode = entity.TwoNumberCode,
|
||||||
IsNotCount = entity.IsNotCount,
|
IsNotCount = entity.IsNotCount,
|
||||||
NumberCode = entity.NumberCode
|
NumberCode = entity.NumberCode,
|
||||||
|
MaterialName = entity.MaterialName,
|
||||||
|
Specifications = entity.Specifications,
|
||||||
|
BarCode = entity.BarCode
|
||||||
};
|
};
|
||||||
entity.WmsGet(dto.SerialNumber);
|
entity.WmsGet(dto.SerialNumber);
|
||||||
list.Add(entity);
|
list.Add(entity);
|
||||||
|
|||||||
@@ -3645,6 +3645,21 @@
|
|||||||
是否不参与记数
|
是否不参与记数
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.MaterialName">
|
||||||
|
<summary>
|
||||||
|
名称
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.Specifications">
|
||||||
|
<summary>
|
||||||
|
规格
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.BarCode">
|
||||||
|
<summary>
|
||||||
|
条码
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="T:BarCode.Web.Core.Dto.SerialNumbers.SGenerateRecordInfoResponse">
|
<member name="T:BarCode.Web.Core.Dto.SerialNumbers.SGenerateRecordInfoResponse">
|
||||||
<summary>
|
<summary>
|
||||||
序列号生成记录列表返回参数
|
序列号生成记录列表返回参数
|
||||||
|
|||||||
@@ -54,7 +54,20 @@ namespace BarCode.Web.Core.Dto.SerialNumbers
|
|||||||
public string? NumberCode { get; set; } = string.Empty;
|
public string? NumberCode { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 名称
|
||||||
|
/// </summary>
|
||||||
|
public string? MaterialName { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 规格
|
||||||
|
/// </summary>
|
||||||
|
public string? Specifications { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 条码
|
||||||
|
/// </summary>
|
||||||
|
public string? BarCode { get; set; } = string.Empty;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user