From 6f208cc2c8556d422c2d4801550fd9a08a91649e Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Wed, 25 Nov 2020 16:07:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89isScrap=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Ass_AssetsInfoItem/Index.js | 16 ---------------- .../Views/Ass_AssetsInfoItem/IndexOfMy.js | 16 ---------------- .../Views/Ass_AssetsInfoItem/IndexScrap.js | 16 ---------------- .../AssScrap/AssScrapService.cs | 2 +- .../Ass_AssetsInfoItemService.cs | 2 +- 5 files changed, 2 insertions(+), 50 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js index 0d24bb350..0aaed027e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js +++ b/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", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js index 3bfbc2535..75f18e3e8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js +++ b/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", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js index 1f28c83ab..87c6210bf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js +++ b/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", diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/AssScrap/AssScrapService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/AssScrap/AssScrapService.cs index 3517707c6..a7cffff9c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/AssScrap/AssScrapService.cs +++ b/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); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs index 45039329d..f0fba22c6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs +++ b/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())