Commit b8e01522 authored by 黄奎's avatar 黄奎

页面修改

parent 821dd112
......@@ -89,10 +89,7 @@ namespace Mall.Module.Property
/// 采购单明细
/// </summary>
private readonly RB_Procurement_DetailRepository procurement_DetailRepository = new RB_Procurement_DetailRepository();
/// <summary>
/// 员工
/// </summary>
private readonly RB_EmployeeRepository employeeRepository = new RB_EmployeeRepository();
/// <summary>
/// 仓库
/// </summary>
......@@ -268,17 +265,19 @@ namespace Mall.Module.Property
}
else
{
item.SpecificationPriceList = new List<RB_Goods_SpecificationPrice_Extend>();
item.SpecificationPriceList.Add(new RB_Goods_SpecificationPrice_Extend()
item.SpecificationPriceList = new List<RB_Goods_SpecificationPrice_Extend>
{
Id = item.GoodsId ?? 0,
GoodsId = item.GoodsId,
GoodsNumbers = item.GoodsNumbers,
GoodsWeight = item.GoodsWeight,
InventoryNum = item.InventoryNum,
SpecificationSort = "",
AttrList = new List<string>() { "规格:" + item.DefaultSpecificationName }
});
new RB_Goods_SpecificationPrice_Extend()
{
Id = item.GoodsId ?? 0,
GoodsId = item.GoodsId,
GoodsNumbers = item.GoodsNumbers,
GoodsWeight = item.GoodsWeight,
InventoryNum = item.InventoryNum,
SpecificationSort = "",
AttrList = new List<string>() { "规格:" + item.DefaultSpecificationName }
}
};
}
}
}
......@@ -637,20 +636,22 @@ namespace Mall.Module.Property
}
#region 生成入库单
RB_Supplies_StockIn_Extend stockInModel = new RB_Supplies_StockIn_Extend();
stockInModel.ProcurementId = pModel.Id;
stockInModel.WarehouseId = pModel.WareHouseId;
stockInModel.StockInDate = DateTime.Now;
stockInModel.Status = 0;
stockInModel.RB_Branch_Id = eRPBranchId;
stockInModel.RB_Group_Id = eRPGroupId;
stockInModel.CreateBy = eRPEmpId;
stockInModel.CreateDate = DateTime.Now;
stockInModel.UpdateBy = eRPEmpId;
stockInModel.UpdateDate = DateTime.Now;
stockInModel.SupplierName = pModel.SupplierName;
stockInModel.DetailList = new List<RB_Supplies_StockInDetail_Extend>();
stockInModel.Money = 0;
RB_Supplies_StockIn_Extend stockInModel = new RB_Supplies_StockIn_Extend
{
ProcurementId = pModel.Id,
WarehouseId = pModel.WareHouseId,
StockInDate = DateTime.Now,
Status = 0,
RB_Branch_Id = eRPBranchId,
RB_Group_Id = eRPGroupId,
CreateBy = eRPEmpId,
CreateDate = DateTime.Now,
UpdateBy = eRPEmpId,
UpdateDate = DateTime.Now,
SupplierName = pModel.SupplierName,
DetailList = new List<RB_Supplies_StockInDetail_Extend>(),
Money = 0
};
foreach (var item in demodel.DetailList)
{
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