diff --git a/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs b/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs
index 606f7976..5805a98b 100644
--- a/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs
@@ -1,4 +1,5 @@
-using System;
+using Npoi.Mapper.Attributes;
+using System;
using System.Collections.Generic;
using System.Text;
@@ -12,70 +13,85 @@ namespace WMS.Web.Core.Dto
///
/// ID
///
+ [Ignore]
public int Id { get; set; }
///
/// 明细ID
///
+ [Ignore]
public int DetailsId { get; set; }
///
/// 单据编号
///
+ [Column("单据号")]
public string BillNo { get; set; }
///
/// 所属箱号编码
///
+ [Column("箱号")]
public string BoxBillNo { get; set; }
///
/// 类型:1为入库回退下架,2为出库回退上架
///
+ [Column("单据类型")]
public string Type { get; set; }
///
/// 操作人
///
+ [Column("操作人")]
public string Creator { get; set; }
///
/// 操作时间
///
+ [Column("操作时间")]
public DateTime CreateTime { get; set; }
///
/// 物料名称
///
+ [Column("物料名称")]
public string MaterialName { get; set; }
///
/// 物料编码
///
+ [Column("物料编码")]
public string MaterialNumber { get; set; }
///
/// 物料规格型号
///
+ [Column("规格型号")]
public string Specifications { get; set; }
///
/// 数量
///
+ [Column("操作数量")]
public decimal Qty { get; set; }
///
/// 组织
///
+ [Ignore]
public string Org { get; set; }
///
/// 仓位
///
+ [Column("仓位")]
public string SubStock { get; set; }
///
/// 仓库
///
+ [Ignore]
public string Stock { get; set; }
///
/// 序列号集
///
+ [Column("序列号")]
public string SerialNumbers { get; set; }
}
}
diff --git a/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs b/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs
index f63be9d6..73cca5e7 100644
--- a/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs
@@ -1,4 +1,5 @@
-using System;
+using Npoi.Mapper.Attributes;
+using System;
using System.Collections.Generic;
using System.Text;
@@ -12,67 +13,82 @@ namespace WMS.Web.Core.Dto
///
/// 单据ID
///
+ [Ignore]
public int Id { get; set; }
///
/// 明细ID
///
+ [Ignore]
public int DetailsId { get; set; }
///
/// 单据编号
///
+ [Column("入库单号")]
public string BillNo { get; set; }
///
/// 入库类型
///
+ [Column("入库类型")]
public string Type { get; set; }
///
/// 来源单号
///
+ [Column("来源单号")]
public string SourceBillNo { get; set; }
///
/// 供应商
///
+ [Column("供应商")]
public string Supplier { get; set; }
///
/// 组织
///
+ [Column("组织")]
public string Org { get; set; }
///
/// 物料名称
///
+ [Column("物料名称")]
public string MaterialName { get; set; }
///
/// 物料编码
///
+ [Column("物料编码")]
public string MaterialNumber { get; set; }
///
/// 物料规格型号
///
+ [Column("规格型号")]
public string Specifications { get; set; }
///
/// 仓库
///
+ [Column("仓库")]
public string Stock { get; set; }
///
/// 数量
///
+ [Column("入库数量")]
public decimal Qty { get; set; }
///
/// 创建人
///
+ [Column("创建人")]
public string Creator { get; set; }
///
/// 创建时间(入库时间)
///
+ [Column("入库时间")]
public string CreateTime { get; set; }
///
/// 同步成功或者失败
///
+ [Column("金蝶同步状态")]
public string SuccessSync { get; set; }
}
}
diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs
index 738e659e..3ee99304 100644
--- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs
@@ -1,4 +1,5 @@
-using System;
+using Npoi.Mapper.Attributes;
+using System;
using System.Collections.Generic;
using System.Text;
@@ -12,101 +13,123 @@ namespace WMS.Web.Core.Dto
///
/// ID
///
+ [Ignore]
public int Id { get; set; }
///
/// 明细ID
///
+ [Ignore]
public int DetailsId { get; set; }
///
/// 单据编号
///
+ [Column("入库任务单号")]
public string BillNo { get; set; }
///
/// 来源单号
///
+ [Column("来源单号")]
public string SourceBillNo { get; set; }
///
/// 入库状态
///
+ [Column("入库状态")]
public string Status { get; set; }
///
/// 入库类型
///
+ [Column("入库类型")]
public string Type { get; set; }
///
/// 供应商Id
///
+ [Column("供应商")]
public string Supplier { get; set; }
///
/// 组织ID
///
+ [Column("组织")]
public string Org { get; set; }
///
/// 物料名称
///
+ [Column("物料名称")]
public string MaterialName { get; set; }
///
/// 物料编码
///
+ [Column("物料编码")]
public string MaterialNumber { get; set; }
///
/// 物料规格型号
///
+ [Column("规格型号")]
public string Specifications { get; set; }
///
/// 出厂价
///
+ [Column("出厂价")]
public decimal FactoryPrice { get; set; }
///
/// 收货仓库
///
+ [Column("收货仓库")]
public string Stock { get; set; }
///
/// 应入数量
///
+ [Column("应入库数量")]
public decimal AccruedQty { get; set; }
///
/// 收货数量
///
+ [Column("收货数量")]
public decimal ReceiveQty { get; set; }
///
/// 实际入库数量
///
+ [Column("实入库数量")]
public decimal RealityQty { get; set; }
///
/// 收货人
///
+ [Column("收货人")]
public string Receiver { get; set; }
///
/// 收货时间
///
+ [Column("收货时间")]
public string ReceiveTime { get; set; }
///
/// 上架人
///
+ [Column("上架人")]
public string Shelfer { get; set; }
///
/// 入库时间
///
+ [Column("入库时间")]
public string ShelfTime { get; set; }
///
/// 明细备注
///
+ [Column("订单明细备注")]
public string Remark { get; set; }
///
/// 创建时间(erp那边的创建时间)
///
+ [Column("创建时间")]
public string CreateTime { get; set; }
}
}
diff --git a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryResponse.cs b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryResponse.cs
index f0ef0c97..d7f98165 100644
--- a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryResponse.cs
@@ -1,4 +1,5 @@
-using System;
+using Npoi.Mapper.Attributes;
+using System;
using System.Collections.Generic;
using System.Text;
@@ -12,49 +13,60 @@ namespace WMS.Web.Core.Dto.Inventory
///
/// ID
///
+ [Ignore]
public int Id { get; set; }
///
/// 明细ID
///
+ [Ignore]
public int DetailsId { get; set; }
///
/// 箱号
///
+ [Column("箱号")]
public string BoxBillNo { get; set; }
///
/// 仓库
///
+ [Column("仓库")]
public string Stock { get; set; }
///
/// 仓位
///
+ [Column("仓位")]
public string SubStock { get; set; }
///
/// 物料名称
///
+ [Column("物料名称")]
public string MaterialName { get; set; }
///
/// 物料编码
///
+ [Column("物料编码")]
public string MaterialNumber { get; set; }
///
/// 物料规格型号
///
+ [Column("规格型号")]
public string Specifications { get; set; }
///
/// 序列号集
///
+ [Column("序列号")]
public string SerialNumbers { get; set; }
///
/// 组织
///
+ [Column("组织")]
public string Org { get; set; }
///
/// 物料库存数量
///
+ [Column("数量")]
public decimal Qty { get; set; }
}
}
diff --git a/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs b/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs
index acf95aa9..930fe17b 100644
--- a/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs
@@ -1,4 +1,5 @@
-using System;
+using Npoi.Mapper.Attributes;
+using System;
using System.Collections.Generic;
using System.Text;
@@ -12,43 +13,52 @@ namespace WMS.Web.Core.Dto.Inventory
///
/// ID
///
+ [Ignore]
public int Id { get; set; }
///
/// 物料名称
///
+ [Column("物料名称")]
public string MaterialName { get; set; }
///
/// 物料编码
///
+ [Column("物料编码")]
public string MaterialNumber { get; set; }
///
/// 物料规格型号
///
+ [Column("规格型号")]
public string Specifications { get; set; }
///
/// 组织
///
+ [Column("组织")]
public string Org { get; set; }
///
/// 仓库
///
+ [Column("仓库")]
public string Stock { get; set; }
///
/// 仓位
///
+ [Column("仓位")]
public string SubStock { get; set; }
///
/// 库存量
///
+ [Column("库存量")]
public decimal Qty { get; set; }
///
/// 单位
///
+ [Column("单位")]
public string Unit { get; set; }
}
}
diff --git a/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs b/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs
index f6b1d8ca..643319ba 100644
--- a/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs
@@ -1,4 +1,5 @@
-using System;
+using Npoi.Mapper.Attributes;
+using System;
using System.Collections.Generic;
using System.Text;
@@ -12,57 +13,69 @@ namespace WMS.Web.Core.Dto.Inventory
///
/// ID
///
+ [Ignore]
public int Id { get; set; }
///
/// 物料名称
///
+ [Column("物料名称")]
public string MaterialName { get; set; }
///
/// 物料编码
///
+ [Column("物料编码")]
public string MaterialNumber { get; set; }
///
/// 物料规格型号
///
+ [Column("规格型号")]
public string Specifications { get; set; }
///
/// 类型:1为入库,2为出库
///
+ [Column("出入库类型")]
public string Type { get; set; }
///
/// 组织
///
+ [Column("组织")]
public string Org { get; set; }
///
/// 仓库
///
+ [Column("仓库")]
public string Stock { get; set; }
///
/// 单据类型
///
+ [Column("单据类型")]
public string OrderType { get; set; }
///
/// 单据编号
///
+ [Column("单号")]
public string OrderBillNo { get; set; }
///
/// 数量
///
+ [Column("数量")]
public decimal Qty { get; set; }
///
/// 结存
///
+ [Column("结存")]
public decimal SurplusQty { get; set; }
///
/// 创建日期
///
+ [Column("日期")]
public string CreateTime { get; set; }
}
}
diff --git a/src/WMS.Web.Domain/Services/BoxInventoryService.cs b/src/WMS.Web.Domain/Services/BoxInventoryService.cs
index 18b26dec..04e7335d 100644
--- a/src/WMS.Web.Domain/Services/BoxInventoryService.cs
+++ b/src/WMS.Web.Domain/Services/BoxInventoryService.cs
@@ -782,9 +782,9 @@ namespace WMS.Web.Domain.Services
//3.3组装要新增的箱库存:明细中的序列号
foreach (var item in addEntity.Details)
{
- var box_serialNub = box_serialNumbers.Where(x => x.MaterialId == item.MaterialId).FirstOrDefault();
- if (box_serialNub != null)
- item.SerialNumbers.Add(box_serialNub.SerialNumber);
+ var box_serialNubs = box_serialNumbers.Where(x => x.MaterialId == item.MaterialId).Select(x=>x.SerialNumber).ToList();
+ if (box_serialNubs != null && box_serialNubs.Count!=0)
+ item.SerialNumbers.AddRange(box_serialNubs);
}
//3.4箱库存:要新增的集合
add_entitys.Add(addEntity);