1

Property.Modele.FixedAssets/WorkFlowModule.cs

@@ -2810,6 +2810,7 @@ namespace Property.Module.FixedAssets
                                     var iModel = ilist.FirstOrDefault();
                                     iModel.Number += item.Number;//增加库存
                                     iModel.Money += item.Money;
+                                    iModel.ShowUnit_Price = iModel.Number > 0 ? Math.Round((iModel.Money ?? 0) / (iModel.Number ?? 1), 2, MidpointRounding.AwayFromZero) : 0;
                                     var iflag = supplies_InventoryRepository.Update(iModel, trans);
                                     if (iflag)
                                     {
@@ -2846,7 +2847,8 @@ namespace Property.Module.FixedAssets
                                         SuppliesId = item.SuppliesId,
                                         UpdateBy = usemodel.CreateBy,
                                         UpdateDate = DateTime.Now,
-                                        WarehouseId = usemodel.WarehouseId
+                                        WarehouseId = usemodel.WarehouseId,
+                                        ShowUnit_Price = item.Number > 0 ? Math.Round((item.Money ?? 0) / (item.Number ?? 1), 2, MidpointRounding.AwayFromZero) : 0
                                     }, trans);
                                     if (iId > 0)
                                     {

Property.WebApi/Controllers/Property/SuppliesController.cs

@@ -1023,6 +1023,8 @@ namespace Property.WebApi.Controllers.User
                             new ExcelColumn(value:"预留库存"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                             new ExcelColumn(value:"单价"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                             new ExcelColumn(value:"库存数量"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                            new ExcelColumn(value:"账面单价"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                            new ExcelColumn(value:"库存金额"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                             new ExcelColumn(value:"近期到期"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                          },
             };
@@ -1051,6 +1053,8 @@ namespace Property.WebApi.Controllers.User
                             new ExcelColumn(value:(item.SModel.ReservedStock??0).ToString()){ },
                             new ExcelColumn(value:(item.Number == 0 ? 0 : Math.Round((item.Money ?? 0) / (item.Number ?? 1), 2, MidpointRounding.AwayFromZero)).ToString()){ },
                             new ExcelColumn(value:(item.Number??0).ToString()){ },
+                            new ExcelColumn(value:item.ShowUnit_Price.ToString()){ },
+                            new ExcelColumn(value:(item.Money??0).ToString()){ },
                             new ExcelColumn(value:(item.RecentExpiresNum.ToString()).ToString()){ },
                         }
                     };