去掉isScrap 字段

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js

@@ -302,22 +302,6 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "资产价值", name: "AIAssValue", width: 100, align: "left" },
-                    //{
-                    //    label: "是否报废", name: "AIIsScrap", width: 100, align: "left",
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'YesOrNoBit',
-                    //            callback: function (_data) {
-                    //                if (_data.text) {
-                    //                    callback(_data.text);
-                    //                } else {
-                    //                    callback('正常使用');
-                    //                }
-                    //            }
-                    //        });
-                    //    }
-                    //},
                     { label: "购置日期", name: "AIAddTime", width: 100, align: "left" },
                     {
                         label: "资产分类", name: "AIASSClass", width: 100, align: "left",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js

@@ -302,22 +302,6 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "资产价值", name: "AIAssValue", width: 100, align: "left" },
-                    //{
-                    //    label: "是否报废", name: "AIIsScrap", width: 100, align: "left",
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'YesOrNoBit',
-                    //            callback: function (_data) {
-                    //                if (_data.text) {
-                    //                    callback(_data.text);
-                    //                } else {
-                    //                    callback('正常使用');
-                    //                }
-                    //            }
-                    //        });
-                    //    }
-                    //},
                     { label: "购置日期", name: "AIAddTime", width: 100, align: "left" },
                     {
                         label: "资产分类", name: "AIASSClass", width: 100, align: "left",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js

@@ -267,22 +267,6 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "资产价值", name: "AIAssValue", width: 100, align: "left" },
-                    {
-                        label: "是否报废", name: "AIIsScrap", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'YesOrNoBit',
-                                callback: function (_data) {
-                                    if (_data.text) {
-                                        callback(_data.text);
-                                    } else {
-                                        callback('正常使用');
-                                    }
-                                }
-                            });
-                        }
-                    },
                     { label: "购置日期", name: "AIAddTime", width: 100, align: "left" },
                     {
                         label: "资产分类", name: "AIASSClass", width: 100, align: "left",

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/AssScrap/AssScrapService.cs

@@ -244,7 +244,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                                 assInfo.AStock = assInfo.AStock - 1;
                                 db.Update(assInfo);
                             }
-                            assInfoItem.AIASSState = 2;
+                            assInfoItem.AIASSState = 1;
 
                             db.Update(assInfoItem);
                         }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs

@@ -376,7 +376,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 t.AContent
                 ");
                 strSql.Append("  FROM Ass_AssetsInfoItem a LEFT JOIN dbo.Ass_AssetsInfo t ON a.AId=t.AId ");
-                strSql.Append("  WHERE a.AIIsScrap<>2 ");
+                strSql.Append("  WHERE a.AIASSState <> 2 or t.AIASSState is null ");
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
                 if (!aiid.IsEmpty())