【修改】固定资产取消必填；导入模板修改；导入取消必填判断；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssets/Form.cshtml

@@ -29,36 +29,36 @@
         <input id="FAName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">资产国标大类<font face="宋体">*</font></div>
-        <div id="ATGId" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">资产国标大类</div>
+        <div id="ATGId"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">资产分类<font face="宋体">*</font></div>
-        <div id="ATId" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">资产分类</div>
+        <div id="ATId"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">财务入账日期<font face="宋体">*</font></div>
         <input id="FinanceEntryDate" type="text" class="form-control lr-input-wdatepicker colorpink" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#FinanceEntryDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">价值类型<font face="宋体">*</font></div>
-        <div id="ValueType" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">价值类型</div>
+        <div id="ValueType"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">价值<font face="宋体">*</font></div>
         <input id="Value" type="text" class="form-control coloreee" isvalid="yes" checkexpession="Num" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">取得方式<font face="宋体">*</font></div>
-        <div id="GetWay" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">取得方式</div>
+        <div id="GetWay"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">取得日期<font face="宋体">*</font></div>
         <input id="GetDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#GetDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">使用状况<font face="宋体">*</font></div>
-        <div id="UseCondition" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">使用状况</div>
+        <div id="UseCondition"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">使用部门<font face="宋体">*</font></div>
@@ -77,44 +77,44 @@
         <input id="Amount" type="number" class="form-control" isvalid="yes" checkexpession="PositiveInteger" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">制单人<font face="宋体">*</font></div>
-        <input id="MakePeople" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">制单人</div>
+        <input id="MakePeople" type="text" class="form-control"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">制单时间<font face="宋体">*</font></div>
-        <input id="MakeDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#MakeDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">制单时间</div>
+        <input id="MakeDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#MakeDate').trigger('change'); } })"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">所属单位<font face="宋体">*</font></div>
-        <div id="Unit" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">所属单位</div>
+        <div id="Unit"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">卡片状态<font face="宋体">*</font></div>
-        <div id="CardStatus" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">卡片状态</div>
+        <div id="CardStatus"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">折旧年限<font face="宋体">*</font></div>
-        <input id="DepreciationLife" type="number" class="form-control colorpink" isvalid="yes" checkexpession="PositiveInteger" />
+        <div class="lr-form-item-title">折旧年限</div>
+        <input id="DepreciationLife" type="number" class="form-control colorpink" checkexpession="PositiveInteger" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">累计折旧<font face="宋体">*</font></div>
-        <input id="AccumulatedDepreciation" type="text" class="form-control coloreee" isvalid="yes" checkexpession="NotNull" readonly/>
+        <div class="lr-form-item-title">累计折旧</div>
+        <input id="AccumulatedDepreciation" type="text" class="form-control coloreee" readonly/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">已提折旧月数<font face="宋体">*</font></div>
-        <input id="HaveDepreciationMonths" type="number" class="form-control coloreee" isvalid="yes" checkexpession="Num" readonly/>
+        <div class="lr-form-item-title">已提折旧月数</div>
+        <input id="HaveDepreciationMonths" type="number" class="form-control coloreee" checkexpession="Num" readonly/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">月折旧额<font face="宋体">*</font></div>
-        <input id="MonthlyDepreciation" type="text" class="form-control coloreee" isvalid="yes" checkexpession="NotNull" readonly/>
+        <div class="lr-form-item-title">月折旧额</div>
+        <input id="MonthlyDepreciation" type="text" class="form-control coloreee" checkexpession="NotNull" readonly/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">折旧方法<font face="宋体">*</font></div>
-        <div id="DepreciationMothod" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">折旧方法</div>
+        <div id="DepreciationMothod"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">净值<font face="宋体">*</font></div>
-        <input id="NetValue" type="text" class="form-control coloreee" isvalid="yes" checkexpession="NotNull" readonly/>
+        <div class="lr-form-item-title">净值</div>
+        <input id="NetValue" type="text" class="form-control coloreee" readonly/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">采购组织形式</div>
@@ -129,32 +129,32 @@
         <input id="SpecificationModel" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">存放地点<font face="宋体">*</font></div>
-        <div id="StorageId" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">存放地点</div>
+        <div id="StorageId"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">销售商</div>
         <div id="SupplierId"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">使用权面积/建筑面积<font face="宋体">*</font></div>
-        <input id="UseArea" type="number" class="form-control" isvalid="yes" checkexpession="Num"/>
+        <div class="lr-form-item-title">使用权面积/建筑面积</div>
+        <input id="UseArea" type="number" class="form-control" checkexpession="Num"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">财政拨款<font face="宋体">*</font></div>
-        <input id="FinancialAppropriation" type="number" class="form-control colorpink" isvalid="yes" checkexpession="Num" />
+        <div class="lr-form-item-title">财政拨款</div>
+        <input id="FinancialAppropriation" type="number" class="form-control colorpink" checkexpession="Num" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">非财政拨款<font face="宋体">*</font></div>
-        <input id="NonFinancialAppropriation" type="number" class="form-control colorpink" isvalid="yes" checkexpession="Num" />
+        <div class="lr-form-item-title">非财政拨款</div>
+        <input id="NonFinancialAppropriation" type="number" class="form-control colorpink" checkexpession="Num" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">会计凭证号<font face="宋体">*</font></div>
         <input id="AccountDocumentNumber" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">折旧/摊销状态<font face="宋体">*</font></div>
-        <div id="DepreciationStatus" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">折旧/摊销状态</div>
+        <div id="DepreciationStatus"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_FixAssets/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssets/Form.js

@@ -188,6 +188,12 @@ var bootstrap = function ($, learun) {
                 return (Number(a) - Number(b)) > 0 ? (Number(a) - Number(b)) : 0;
             }
 
+            //新增时，财政拨款、非财政拨款默认为0,进行一次计算；
+            if (!keyValue) {
+                $('#FinancialAppropriation').val(0);
+                $('#NonFinancialAppropriation').val(0);
+                FinancialAppropriationBlur();
+            }
         }
     };
     // 设置表单数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssets/FormView.cshtml

@@ -29,36 +29,36 @@
         <input id="FAName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">资产国标大类<font face="宋体">*</font></div>
-        <div id="ATGId" isvalid="yes" checkexpession="NotNull" readonly></div>
+        <div class="lr-form-item-title">资产国标大类</div>
+        <div id="ATGId" readonly></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">资产分类<font face="宋体">*</font></div>
-        <div id="ATId" isvalid="yes" checkexpession="NotNull" readonly></div>
+        <div class="lr-form-item-title">资产分类</div>
+        <div id="ATId" readonly></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">财务入账日期<font face="宋体">*</font></div>
         <input id="FinanceEntryDate" type="text" class="form-control lr-input-wdatepicker colorpink" readonly isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">价值类型<font face="宋体">*</font></div>
-        <div id="ValueType" isvalid="yes" checkexpession="NotNull" readonly></div>
+        <div class="lr-form-item-title">价值类型</div>
+        <div id="ValueType" readonly></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">价值<font face="宋体">*</font></div>
         <input id="Value" type="text" class="form-control coloreee" isvalid="yes" checkexpession="Num" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">取得方式<font face="宋体">*</font></div>
-        <div id="GetWay" isvalid="yes" checkexpession="NotNull" readonly></div>
+        <div class="lr-form-item-title">取得方式</div>
+        <div id="GetWay" readonly></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">取得日期<font face="宋体">*</font></div>
         <input id="GetDate" type="text" class="form-control lr-input-wdatepicker" readonly isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">使用状况<font face="宋体">*</font></div>
-        <div id="UseCondition" isvalid="yes" checkexpession="NotNull" readonly></div>
+        <div class="lr-form-item-title">使用状况</div>
+        <div id="UseCondition" readonly></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">使用部门<font face="宋体">*</font></div>
@@ -77,44 +77,44 @@
         <input id="Amount" type="number" class="form-control" readonly isvalid="yes" checkexpession="PositiveInteger" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">制单人<font face="宋体">*</font></div>
-        <input id="MakePeople" type="text" class="form-control" readonly isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">制单人</div>
+        <input id="MakePeople" type="text" class="form-control" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">制单时间<font face="宋体">*</font></div>
-        <input id="MakeDate" type="text" class="form-control lr-input-wdatepicker" readonly isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">制单时间</div>
+        <input id="MakeDate" type="text" class="form-control lr-input-wdatepicker" readonly/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">所属单位<font face="宋体">*</font></div>
-        <div id="Unit" isvalid="yes" checkexpession="NotNull" readonly></div>
+        <div class="lr-form-item-title">所属单位</div>
+        <div id="Unit" readonly></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">卡片状态<font face="宋体">*</font></div>
-        <div id="CardStatus" isvalid="yes" checkexpession="NotNull" readonly></div>
+        <div class="lr-form-item-title">卡片状态</div>
+        <div id="CardStatus" readonly></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">折旧年限<font face="宋体">*</font></div>
-        <input id="DepreciationLife" type="number" class="form-control colorpink" readonly isvalid="yes" checkexpession="PositiveInteger" />
+        <div class="lr-form-item-title">折旧年限</div>
+        <input id="DepreciationLife" type="number" class="form-control colorpink" readonly checkexpession="PositiveInteger" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">累计折旧<font face="宋体">*</font></div>
-        <input id="AccumulatedDepreciation" type="text" class="form-control coloreee" isvalid="yes" checkexpession="NotNull" readonly />
+        <div class="lr-form-item-title">累计折旧</div>
+        <input id="AccumulatedDepreciation" type="text" class="form-control coloreee" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">已提折旧月数<font face="宋体">*</font></div>
-        <input id="HaveDepreciationMonths" type="number" class="form-control coloreee" isvalid="yes" checkexpession="Num" readonly />
+        <div class="lr-form-item-title">已提折旧月数</div>
+        <input id="HaveDepreciationMonths" type="number" class="form-control coloreee" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">月折旧额<font face="宋体">*</font></div>
-        <input id="MonthlyDepreciation" type="text" class="form-control coloreee" isvalid="yes" checkexpession="NotNull" readonly />
+        <div class="lr-form-item-title">月折旧额</div>
+        <input id="MonthlyDepreciation" type="text" class="form-control coloreee" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">折旧方法<font face="宋体">*</font></div>
-        <div id="DepreciationMothod" isvalid="yes" checkexpession="NotNull" readonly></div>
+        <div class="lr-form-item-title">折旧方法</div>
+        <div id="DepreciationMothod" readonly></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">净值<font face="宋体">*</font></div>
-        <input id="NetValue" type="text" class="form-control coloreee" isvalid="yes" checkexpession="NotNull" readonly />
+        <div class="lr-form-item-title">净值</div>
+        <input id="NetValue" type="text" class="form-control coloreee" readonly />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">采购组织形式</div>
@@ -129,32 +129,32 @@
         <input id="SpecificationModel" type="text" class="form-control" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">存放地点<font face="宋体">*</font></div>
-        <div id="StorageId" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">存放地点</div>
+        <div id="StorageId"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">销售商</div>
         <div id="SupplierId" readonly></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">使用权面积/建筑面积<font face="宋体">*</font></div>
-        <input id="UseArea" type="number" class="form-control" isvalid="yes" checkexpession="Num" readonly />
+        <div class="lr-form-item-title">使用权面积/建筑面积</div>
+        <input id="UseArea" type="number" class="form-control" checkexpession="Num" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">财政拨款<font face="宋体">*</font></div>
-        <input id="FinancialAppropriation" type="number" class="form-control colorpink" isvalid="yes" checkexpession="Num" readonly />
+        <div class="lr-form-item-title">财政拨款</div>
+        <input id="FinancialAppropriation" type="number" class="form-control colorpink" checkexpession="Num" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">非财政拨款<font face="宋体">*</font></div>
-        <input id="NonFinancialAppropriation" type="number" class="form-control colorpink" isvalid="yes" checkexpession="Num" readonly />
+        <div class="lr-form-item-title">非财政拨款</div>
+        <input id="NonFinancialAppropriation" type="number" class="form-control colorpink" checkexpession="Num" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">会计凭证号<font face="宋体">*</font></div>
         <input id="AccountDocumentNumber" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">折旧/摊销状态<font face="宋体">*</font></div>
-        <div id="DepreciationStatus" isvalid="yes" checkexpession="NotNull" readonly></div>
+        <div class="lr-form-item-title">折旧/摊销状态</div>
+        <div id="DepreciationStatus" readonly></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_FixAssets/FormView.js")

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssets/Ass_FixAssetsService.cs

@@ -357,38 +357,18 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                             {
                                 throw (new Exception("资产名称不能为空"));
                             }
-                            if (dr["资产国标大类"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("资产国标大类不能为空"));
-                            }
-                            if (dr["资产分类"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("资产分类不能为空"));
-                            }
                             if (dr["财务入账日期"].ToString().IsEmpty())
                             {
                                 throw (new Exception("财务入账日期不能为空"));
                             }
-                            if (dr["价值类型"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("价值类型不能为空"));
-                            }
                             if (dr["价值"].ToString().IsEmpty())
                             {
                                 throw (new Exception("价值不能为空"));
                             }
-                            if (dr["取得方式"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("取得方式不能为空"));
-                            }
                             if (dr["取得日期"].ToString().IsEmpty())
                             {
                                 throw (new Exception("取得日期不能为空"));
                             }
-                            if (dr["使用状况"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("使用状况不能为空"));
-                            }
                             if (dr["使用部门"].ToString().IsEmpty())
                             {
                                 throw (new Exception("使用部门不能为空"));
@@ -405,70 +385,10 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                             {
                                 throw (new Exception("数量不能为空"));
                             }
-                            if (dr["制单人"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("制单人不能为空"));
-                            }
-                            if (dr["制单时间"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("制单时间不能为空"));
-                            }
-                            if (dr["所属单位"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("卡片状态不能为空"));
-                            }
-                            if (dr["卡片状态"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("卡片状态不能为空"));
-                            }
-                            if (dr["折旧年限"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("折旧年限不能为空"));
-                            }
-                            if (dr["累计折旧"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("累计折旧不能为空"));
-                            }
-                            if (dr["已提折旧月数"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("已提折旧月数不能为空"));
-                            }
-                            if (dr["月折旧额"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("月折旧额不能为空"));
-                            }
-                            if (dr["折旧方法"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("折旧方法不能为空"));
-                            }
-                            if (dr["净值"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("净值不能为空"));
-                            }
-                            if (dr["存放地点"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("存放地点不能为空"));
-                            }
-                            if (dr["使用权面积/建筑面积"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("使用权面积/建筑面积不能为空"));
-                            }
-                            if (dr["财政拨款"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("财政拨款不能为空"));
-                            }
-                            if (dr["非财政拨款"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("非财政拨款不能为空"));
-                            }
                             if (dr["会计凭证号"].ToString().IsEmpty())
                             {
                                 throw (new Exception("会计凭证号不能为空"));
                             }
-                            if (dr["折旧/摊销状态"].ToString().IsEmpty())
-                            {
-                                throw (new Exception("折旧/摊销状态不能为空"));
-                            }
                             #endregion
                             //判断资产编号是否重复
                             if (Ass_FixAssetsHistory.Count(x => x.FACode == dr["资产编号"].ToString() && x.Status != 0) > 0)
@@ -499,7 +419,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                                 UsePeople = dataSourceIBLL.GetKeyByValue("teacheruserdata", "f_realname", dr["使用人"].ToString(), "f_userid"),
                                 Amount = dr["数量"].ToInt(),
                                 MakePeople = dr["制单人"].ToString(),
-                                MakeDate = Convert.ToDateTime(dr["制单时间"]),
+                                MakeDate = dr["制单时间"].ToString().IsEmpty() ? new Nullable<DateTime>() : Convert.ToDateTime(dr["制单时间"]),
                                 Unit = dataSourceIBLL.GetKeyByValue("company", "f_fullname", dr["所属单位"].ToString(), "f_companyid"),
                                 CardStatus = FindDataItemValue(dataItemIBLL.GetDetailList("CardStatus"), dr["卡片状态"].ToString(), "卡片状态", false),
                                 DepreciationLife = dr["折旧年限"].ToInt(),