Merge branch 'master' of http://gitlab.oytour.com/liudong1993/property

Property.Modele.FixedAssets/SuppliesModule.cs

@@ -2746,7 +2746,7 @@ namespace Property.Module.FixedAssets
                             { nameof(RB_Supplies_CheckDetail.UpdateBy),applyModel.CreateBy},
                              { nameof(RB_Supplies_CheckDetail.UpdateDate),applyModel.CreateDate},
                                { nameof(RB_Supplies_CheckDetail.FinanceId),frid},
-                                { nameof(RB_Supplies_CheckDetail.Remark),item.Remark+(string.IsNullOrWhiteSpace(item.Remark)?"":",")+ " 自动生成财务单据:"+frid+",最新单价："+Math.Round((item.ReportLossPrice ?? 0) / (item.ReportLossNum ?? 1), 2, MidpointRounding.AwayFromZero)},
+                                { nameof(RB_Supplies_CheckDetail.Remark),item.Remark+(string.IsNullOrWhiteSpace(item.Remark)?"":",")+ " 自动生成财务单据:"+frid+",制单单价："+Math.Round((item.ReportLossPrice ?? 0) / (item.ReportLossNum ?? 1), 2, MidpointRounding.AwayFromZero)},
                         };
                             List<WhereHelper> wheresApplyGoods = new List<WhereHelper>() {
                             new WhereHelper(){

Property.WebApi/Controllers/Mall/WarehouseController.cs

@@ -148,5 +148,8 @@ namespace Property.WebApi.Controllers.Mall
                 model.FinanceId
             });
         }
+
+
+
     }
 }
\ No newline at end of file

Property.WebApi/Controllers/Property/SuppliesController.cs

@@ -2153,7 +2153,7 @@ namespace Property.WebApi.Controllers.User
             applyModel.WarehouseId = suppliesCheckModel.WarehouseId;
             if (suppliesCheckModel.CheckState != REBORN.Common.Enum.SuppliesCheckStatusEnum.Completed)
             {
-                return ApiResult.ParamIsNull("盘点未完成不能报损");
+                return ApiResult.ParamIsNull("盘点未完成不能报损/报溢");
             }
             //查询盘点信息
             var checkDetailList = suppliesModule.GetSuppliesCheckDetailList(new RB_Supplies_CheckDetail_Extend { CheckId = applyModel.CheckId ?? 0, RB_Group_Id = userInfo.RB_Group_id });