Commit b8e01522 authored by 黄奎's avatar 黄奎

页面修改

parent 821dd112
...@@ -89,10 +89,7 @@ namespace Mall.Module.Property ...@@ -89,10 +89,7 @@ namespace Mall.Module.Property
/// 采购单明细 /// 采购单明细
/// </summary> /// </summary>
private readonly RB_Procurement_DetailRepository procurement_DetailRepository = new RB_Procurement_DetailRepository(); private readonly RB_Procurement_DetailRepository procurement_DetailRepository = new RB_Procurement_DetailRepository();
/// <summary>
/// 员工
/// </summary>
private readonly RB_EmployeeRepository employeeRepository = new RB_EmployeeRepository();
/// <summary> /// <summary>
/// 仓库 /// 仓库
/// </summary> /// </summary>
...@@ -268,17 +265,19 @@ namespace Mall.Module.Property ...@@ -268,17 +265,19 @@ namespace Mall.Module.Property
} }
else else
{ {
item.SpecificationPriceList = new List<RB_Goods_SpecificationPrice_Extend>(); item.SpecificationPriceList = new List<RB_Goods_SpecificationPrice_Extend>
item.SpecificationPriceList.Add(new RB_Goods_SpecificationPrice_Extend()
{ {
Id = item.GoodsId ?? 0, new RB_Goods_SpecificationPrice_Extend()
GoodsId = item.GoodsId, {
GoodsNumbers = item.GoodsNumbers, Id = item.GoodsId ?? 0,
GoodsWeight = item.GoodsWeight, GoodsId = item.GoodsId,
InventoryNum = item.InventoryNum, GoodsNumbers = item.GoodsNumbers,
SpecificationSort = "", GoodsWeight = item.GoodsWeight,
AttrList = new List<string>() { "规格:" + item.DefaultSpecificationName } InventoryNum = item.InventoryNum,
}); SpecificationSort = "",
AttrList = new List<string>() { "规格:" + item.DefaultSpecificationName }
}
};
} }
} }
} }
...@@ -637,20 +636,22 @@ namespace Mall.Module.Property ...@@ -637,20 +636,22 @@ namespace Mall.Module.Property
} }
#region 生成入库单 #region 生成入库单
RB_Supplies_StockIn_Extend stockInModel = new RB_Supplies_StockIn_Extend(); RB_Supplies_StockIn_Extend stockInModel = new RB_Supplies_StockIn_Extend
stockInModel.ProcurementId = pModel.Id; {
stockInModel.WarehouseId = pModel.WareHouseId; ProcurementId = pModel.Id,
stockInModel.StockInDate = DateTime.Now; WarehouseId = pModel.WareHouseId,
stockInModel.Status = 0; StockInDate = DateTime.Now,
stockInModel.RB_Branch_Id = eRPBranchId; Status = 0,
stockInModel.RB_Group_Id = eRPGroupId; RB_Branch_Id = eRPBranchId,
stockInModel.CreateBy = eRPEmpId; RB_Group_Id = eRPGroupId,
stockInModel.CreateDate = DateTime.Now; CreateBy = eRPEmpId,
stockInModel.UpdateBy = eRPEmpId; CreateDate = DateTime.Now,
stockInModel.UpdateDate = DateTime.Now; UpdateBy = eRPEmpId,
stockInModel.SupplierName = pModel.SupplierName; UpdateDate = DateTime.Now,
stockInModel.DetailList = new List<RB_Supplies_StockInDetail_Extend>(); SupplierName = pModel.SupplierName,
stockInModel.Money = 0; DetailList = new List<RB_Supplies_StockInDetail_Extend>(),
Money = 0
};
foreach (var item in demodel.DetailList) foreach (var item in demodel.DetailList)
{ {
var dModel = DetailList.Where(x => x.GoodsId == item.GoodsId && x.SpecificationKey == item.SpecificationKey).FirstOrDefault(); var dModel = DetailList.Where(x => x.GoodsId == item.GoodsId && x.SpecificationKey == item.SpecificationKey).FirstOrDefault();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment