修改了物料显示
This commit is contained in:
@@ -326,10 +326,11 @@ namespace BarCode.Web.Repositories
|
|||||||
var list = await query.Select(s => new SGenerateRecordInfoResponse()
|
var list = await query.Select(s => new SGenerateRecordInfoResponse()
|
||||||
{
|
{
|
||||||
Id = s.Id,
|
Id = s.Id,
|
||||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber),
|
//Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber),
|
||||||
|
Specifications =s.Specifications,
|
||||||
MaterialNumber = s.MaterialNumber,
|
MaterialNumber = s.MaterialNumber,
|
||||||
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber),
|
MaterialName =s.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber),
|
||||||
BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.MaterialNumber),
|
BarCode =s.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.MaterialNumber),
|
||||||
PurchaseBillNo = s.PurchaseBillNo,
|
PurchaseBillNo = s.PurchaseBillNo,
|
||||||
GenerateComplete = s.IsGenerateComplete == true ? "已完成" : "生成中",
|
GenerateComplete = s.IsGenerateComplete == true ? "已完成" : "生成中",
|
||||||
Number = s.Number,
|
Number = s.Number,
|
||||||
|
|||||||
@@ -358,11 +358,11 @@ namespace BarCode.Web.Repositories
|
|||||||
int total = await query.CountAsync();
|
int total = await query.CountAsync();
|
||||||
var list = await query.Select(s => new SerialNumberInfoResponse()
|
var list = await query.Select(s => new SerialNumberInfoResponse()
|
||||||
{
|
{
|
||||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
|
Specifications =s.serial.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
|
||||||
Old_Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber),
|
Old_Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber),
|
||||||
MaterialNumber = s.serial.MaterialNumber,
|
MaterialNumber = s.serial.MaterialNumber,
|
||||||
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
|
MaterialName =s.serial.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
|
||||||
BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
|
BarCode =s.serial.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
|
||||||
SerialNumber = s.serial.SerialNumber,
|
SerialNumber = s.serial.SerialNumber,
|
||||||
NumberCode = s.serial.NumberCode,
|
NumberCode = s.serial.NumberCode,
|
||||||
Number = s.sg == null ? 0 : s.sg.Number,
|
Number = s.sg == null ? 0 : s.sg.Number,
|
||||||
|
|||||||
Reference in New Issue
Block a user