diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Form.cshtml index 439bd249c..7fb91d9e1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Form.cshtml @@ -4,7 +4,7 @@ }
-
资产类别*
+
资产分类*
@@ -31,6 +31,14 @@
生产厂家
+
+
用途
+ +
+
+
规格
+ +
资产来源
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js index 3246e7880..16506cf1c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js @@ -112,7 +112,7 @@ var bootstrap = function ($, learun) { { label: "资产编号", name: "ACode", width: 200, align: "left" }, { label: "资产名称", name: "AName", width: 200, align: "left" }, { - label: "资产类别", name: "ATId", width: 100, align: "left", + label: "资产分类", name: "ATId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType', 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 0aaed027e..e7d36d6f0 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 @@ -23,12 +23,18 @@ var bootstrap = function ($, learun) { bind: function () { // 初始化左侧树形数据lr_printBar + //$('#dataTree').lrtree({ + // url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetTree', + // nodeClick: function (item) { + // page.search({ AIAssType: item.value }); + // } + //}); $('#dataTree').lrtree({ - url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetTree', + url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetTree', nodeClick: function (item) { - page.search({ AIAssType: item.value }); + page.search({ AIASSClass: item.value }); } - }); + }); $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 400, 400); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.cshtml index d630e3e49..6435c585f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.cshtml @@ -59,7 +59,7 @@
数量单位
-
+
排序*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.js index 69f6867e0..71a903561 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.js @@ -59,11 +59,11 @@ var bootstrap = function ($, learun) { select: function (values, texts) { if (values && values.length > 0) { //绑定 - $("#AAITId").attr("readonly", "readonly"); - $("#AAICode").attr("readonly", "readonly"); - $("#AAIName").attr("readonly", "readonly"); - $("#AAIUnit").attr("readonly", "readonly"); - $("#AAIHasDetail").attr("readonly", "readonly"); + //$("#AAITId").attr("readonly", "readonly"); + //$("#AAICode").attr("readonly", "readonly"); + //$("#AAIName").attr("readonly", "readonly"); + //$("#AAIUnit").attr("readonly", "readonly"); + //$("#AAIHasDetail").attr("readonly", "readonly"); $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetFormData?keyValue=' + values[0], function (data) { data = data.Ass_AssetsInfo; $('#AAITId').lrselectSet(data.ATId); @@ -80,11 +80,11 @@ var bootstrap = function ($, learun) { }, unknowselect: function () { $("#AAOldCode").find('span').text(""); - $("#AAITId").removeAttr("readonly"); - $("#AAICode").removeAttr("readonly"); - $("#AAIName").removeAttr("readonly"); - $("#AAIUnit").removeAttr("readonly"); - $("#AAIHasDetail").removeAttr("readonly"); + //$("#AAITId").removeAttr("readonly"); + //$("#AAICode").removeAttr("readonly"); + //$("#AAIName").removeAttr("readonly"); + //$("#AAIUnit").removeAttr("readonly"); + //$("#AAIHasDetail").removeAttr("readonly"); $('#AAITId').lrselectSet(""); $('#AAICode').val(""); $('#AAIName').val(""); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.cshtml index 70e960c14..e9dad0351 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.cshtml @@ -47,7 +47,7 @@
用途
- +
原使用部门
@@ -73,10 +73,6 @@
新库存位置*
-
-
用途
- -
数量单位
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js index 4f8b2df85..6badb154c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js @@ -67,6 +67,27 @@ var bootstrap = function ($, learun) { grid: [ { label: '资产编号', name: 'aicodenumjy', width: 150, align: 'left' }, { label: '资产名称', name: 'aiassname', width: 150, align: 'left' }, + { + label: '使用部门', name: 'aidepartment', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('department', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + } + }, + { + label: '使用人员', name: 'aiusepeople', width: 150, align: 'left', + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + } + }, { label: '所在库房', name: 'aiistorageid', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js index e1c462623..73e5764cc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js @@ -39,7 +39,10 @@ var bootstrap = function ($, learun) { }, { - label: "数量", name: "ANum", width: 100, align: "left", + label: "库存数量", name: "ACNum", width: 100, align: "left", + }, + { + label: "领取数量", name: "ANum", width: 100, align: "left", edit: { type: 'input', inputType: 'number', @@ -111,6 +114,10 @@ var bootstrap = function ($, learun) { $('.jfgrid-data-cell[colname="AID"][rowIndex="' + rowIndex + '"]').attr('title', data.AId).html(data.AId); $('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['AID'] = data.AId; + $('jfgrid_edit_Ass_ReceiveItem_' + 'ACNum').val(data.AId); + $('.jfgrid-data-cell[colname="ACNum"][rowIndex="' + rowIndex + '"]').attr('title', data.AStock).html(data.AStock); + $('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['ACNum'] = data.AStock; + }); } }, @@ -151,7 +158,7 @@ var bootstrap = function ($, learun) { } }); } - callback && callback(); + callback && callback(); } // 验证数据是否填写完整 validForm = function () { @@ -174,7 +181,11 @@ var bootstrap = function ($, learun) { $.each(itemList, function (i, item) { if (item.ANum <= 0) { learun.alert.warning("请填写<" + item.AName + ">的申请数量"); - num++ + num++; + } + if (item.ANum > item.ACNum) { + learun.alert.warning("领取数量不能大于库存数量！"); + num++; } }) if (num > 0) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js index f4c39a842..a0bfe76cd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js @@ -301,7 +301,7 @@ } else { var data = storage.get("userData").data || {}; - var keys = op.key.split(','); + var keys = (op.key || '').split(','); var array=new Array(); if (keys.length > 1) { $.each(keys, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs index eb78cd936..c9bbd1084 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs @@ -273,94 +273,39 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem db.Delete(m => m.AIId == Ass_AssetsInfoItem.AId); db.Delete(Ass_AssetsInfoItem); } - //新增明细 - if (entity.HasDetail == true) - { - if (entity.AStock > 0) - { - for (int i = 0; i < entity.AStock; i++) - { - var Ass_AssetsInfoItem = new Ass_AssetsInfoItemEntity(); - Ass_AssetsInfoItem.Create(); - Ass_AssetsInfoItem.AId = entity.AId; - Ass_AssetsInfoItem.AICodeNum = i + 1; - Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; - Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId; - Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition; - Ass_AssetsInfoItem.AIIsInStorage = true; - Ass_AssetsInfoItem.AISpecification = entity.ASpecification; - Ass_AssetsInfoItem.AIUse = entity.AUse; - db.Insert(Ass_AssetsInfoItem); - } - } - else - { - var Ass_AssetsInfoItem = new Ass_AssetsInfoItemEntity(); - Ass_AssetsInfoItem.Create(); - Ass_AssetsInfoItem.AId = entity.AId; - Ass_AssetsInfoItem.AICodeNum = 1; - Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; - Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId; - Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition; - Ass_AssetsInfoItem.AIIsInStorage = false; - Ass_AssetsInfoItem.AISpecification = entity.ASpecification; - Ass_AssetsInfoItem.AIUse = entity.AUse; - db.Insert(Ass_AssetsInfoItem); - } - } - else - { - var Ass_AssetsInfoItem = new Ass_AssetsInfoItemEntity(); - Ass_AssetsInfoItem.Create(); - Ass_AssetsInfoItem.AId = entity.AId; - Ass_AssetsInfoItem.AICodeNum = 1; - Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; - Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId; - Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition; - Ass_AssetsInfoItem.AIIsInStorage = entity.AStock > 0; - Ass_AssetsInfoItem.AISpecification = entity.ASpecification; - Ass_AssetsInfoItem.AIUse = entity.AUse; - db.Insert(Ass_AssetsInfoItem); - } + } else { entity.Create(); db.Insert(entity); - if (entity.HasDetail == true) + } + + //新增明细 + if (entity.HasDetail == true) + { + if (entity.AStock > 0) { - if (entity.AStock > 0) - { - for (int i = 0; i < entity.AStock; i++) - { - var Ass_AssetsInfoItem = new Ass_AssetsInfoItemEntity(); - Ass_AssetsInfoItem.Create(); - Ass_AssetsInfoItem.AId = entity.AId; - Ass_AssetsInfoItem.AIASSName = entity.AName; - Ass_AssetsInfoItem.AICodeNumJY = entity.ACode; - Ass_AssetsInfoItem.AICodeNum = i + 1; - Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; - Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId; - Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition; - Ass_AssetsInfoItem.AIIsInStorage = true; - Ass_AssetsInfoItem.AISpecification = entity.ASpecification; - Ass_AssetsInfoItem.AIAssType = entity.AAssType; - Ass_AssetsInfoItem.AIUse = entity.AUse; - db.Insert(Ass_AssetsInfoItem); - } - } - else + for (int i = 0; i < entity.AStock; i++) { var Ass_AssetsInfoItem = new Ass_AssetsInfoItemEntity(); Ass_AssetsInfoItem.Create(); Ass_AssetsInfoItem.AId = entity.AId; Ass_AssetsInfoItem.AIASSName = entity.AName; - Ass_AssetsInfoItem.AICodeNumJY = entity.ACode; - Ass_AssetsInfoItem.AICodeNum = 1; + Ass_AssetsInfoItem.AIAssValue = entity.APrice;//价值 + Ass_AssetsInfoItem.AIUnits = entity.AUnit;//单位 + Ass_AssetsInfoItem.AISpecificationtype = entity.AModel;//型号 + Ass_AssetsInfoItem.AIASSClass = entity.ATId;//类别 + Ass_AssetsInfoItem.AIManufacturer = entity.AManufacturer;//厂家 + Ass_AssetsInfoItem.AIUse = entity.AUse;//用途 + Ass_AssetsInfoItem.AISpecification = entity.ASpecification;//规格 + Ass_AssetsInfoItem.AIAssType = entity.AAssType;//属性 + Ass_AssetsInfoItem.AICodeNum = i + 1; Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; + Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId; Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition; - Ass_AssetsInfoItem.AIIsInStorage = false; + Ass_AssetsInfoItem.AIIsInStorage = true; Ass_AssetsInfoItem.AISpecification = entity.ASpecification; Ass_AssetsInfoItem.AIUse = entity.AUse; db.Insert(Ass_AssetsInfoItem); @@ -371,16 +316,50 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem var Ass_AssetsInfoItem = new Ass_AssetsInfoItemEntity(); Ass_AssetsInfoItem.Create(); Ass_AssetsInfoItem.AId = entity.AId; + Ass_AssetsInfoItem.AIASSName = entity.AName; + Ass_AssetsInfoItem.AIAssValue = entity.APrice; + Ass_AssetsInfoItem.AIUnits = entity.AUnit;//单位 + Ass_AssetsInfoItem.AISpecificationtype = entity.AModel;//型号 + Ass_AssetsInfoItem.AIASSClass = entity.ATId;//类别 + Ass_AssetsInfoItem.AIManufacturer = entity.AManufacturer;//厂家 + Ass_AssetsInfoItem.AIUse = entity.AUse;//用途 + Ass_AssetsInfoItem.AISpecification = entity.ASpecification;//规格 + Ass_AssetsInfoItem.AIAssType = entity.AAssType;//属性 Ass_AssetsInfoItem.AICodeNum = 1; Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; + Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId; Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition; - Ass_AssetsInfoItem.AIIsInStorage = entity.AStock > 0; + Ass_AssetsInfoItem.AIIsInStorage = false; Ass_AssetsInfoItem.AISpecification = entity.ASpecification; Ass_AssetsInfoItem.AIUse = entity.AUse; db.Insert(Ass_AssetsInfoItem); } } + else + { + var Ass_AssetsInfoItem = new Ass_AssetsInfoItemEntity(); + Ass_AssetsInfoItem.Create(); + Ass_AssetsInfoItem.AId = entity.AId; + Ass_AssetsInfoItem.AIASSName = entity.AName; + Ass_AssetsInfoItem.AIAssValue = entity.APrice; + Ass_AssetsInfoItem.AIUnits = entity.AUnit;//单位 + Ass_AssetsInfoItem.AISpecificationtype = entity.AModel;//型号 + Ass_AssetsInfoItem.AIASSClass = entity.ATId;//类别 + Ass_AssetsInfoItem.AIManufacturer = entity.AManufacturer;//厂家 + Ass_AssetsInfoItem.AIUse = entity.AUse;//用途 + Ass_AssetsInfoItem.AISpecification = entity.ASpecification;//规格 + Ass_AssetsInfoItem.AIAssType = entity.AAssType;//属性 + Ass_AssetsInfoItem.AICodeNum = 1; + Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; + Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; + Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId; + Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition; + Ass_AssetsInfoItem.AIIsInStorage = entity.AStock > 0; + Ass_AssetsInfoItem.AISpecification = entity.ASpecification; + Ass_AssetsInfoItem.AIUse = entity.AUse; + db.Insert(Ass_AssetsInfoItem); + } db.Commit(); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs index 7eae4d3b3..aa8241f23 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs @@ -317,14 +317,21 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem insertassinfoitem.AId = assinfoitem.AId; insertassinfoitem.AICodeNum = Ass_AssetsInfoItemMaxNum + 1 + i; insertassinfoitem.AICode = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); - insertassinfoitem.AICodeNumJY = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); + insertassinfoitem.AICodeNumJY = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString();//金隅编号 + insertassinfoitem.AIAssValue = assinfoitem.APrice;//价值 + insertassinfoitem.AIUnits = assinfoitem.AUnit;//单位 + insertassinfoitem.AISpecificationtype = assinfoitem.AModel;//型号 + insertassinfoitem.AIManufacturer = assinfoitem.AManufacturer;//厂家 + insertassinfoitem.AIUse = assinfoitem.AUse;//用途 + insertassinfoitem.AISpecification = assinfoitem.ASpecification;//规格 + insertassinfoitem.AIIStorageId = assitemapp.AAIStorageId; insertassinfoitem.AIASSName = assitemapp.AAIName; insertassinfoitem.AIIStoragePosition = assitemapp.AAIStoragePosition; insertassinfoitem.AIIsInStorage = true; insertassinfoitem.AISpecification = assitemapp.AAISpecification; insertassinfoitem.AIAssType = assinfoapp.AAAssType; - insertassinfoitem.AIASSClass = assinfoitem.ATId; + insertassinfoitem.AIASSClass = assinfoitem.ATId;//类别 insertassinfoitem.AIUse = assitemapp.AAIUse; db.Insert(insertassinfoitem); //出入库明细表 @@ -417,6 +424,12 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem insertassinfoitem.AICodeNum = i + 1; insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); + insertassinfoitem.AIAssValue = assinfoitem.APrice;//价值 + insertassinfoitem.AIUnits = assinfoitem.AUnit;//单位 + insertassinfoitem.AISpecificationtype = assinfoitem.AModel;//型号 + insertassinfoitem.AIManufacturer = assinfoitem.AManufacturer;//厂家 + insertassinfoitem.AIUse = assinfoitem.AUse;//用途 + insertassinfoitem.AISpecification = assinfoitem.ASpecification;//规格 insertassinfoitem.AIASSName = assitemapp.AAIName; insertassinfoitem.AIIStorageId = assitemapp.AAIStorageId; insertassinfoitem.AIAssType = assinfoapp.AAAssType; @@ -474,6 +487,12 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem insertassinfoitem.AICodeNum = 1; insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); + insertassinfoitem.AIAssValue = assinfoitem.APrice;//价值 + insertassinfoitem.AIUnits = assinfoitem.AUnit;//单位 + insertassinfoitem.AISpecificationtype = assinfoitem.AModel;//型号 + insertassinfoitem.AIManufacturer = assinfoitem.AManufacturer;//厂家 + insertassinfoitem.AIUse = assinfoitem.AUse;//用途 + insertassinfoitem.AISpecification = assinfoitem.ASpecification;//规格 insertassinfoitem.AIASSName = assitemapp.AAIName; insertassinfoitem.AIIStorageId = assitemapp.AAIStorageId; insertassinfoitem.AIAssType = assinfoapp.AAAssType; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemEntity.cs index f5f7fc2f1..815eafba5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemEntity.cs @@ -211,7 +211,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem public string AIUse { get; set; } /// - /// 资产类别 + /// 资产属性 /// [Column("AIASSTYPE")] public int? AIAssType { get; set; } 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 f0fba22c6..71697fc80 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 @@ -183,6 +183,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem a.AIIStoragePosition, a.AIIsInStorage, a.AICodeNumJY, + a.AIUsePeople, + a.AIDepartment, a.AIId, a.AICode, a.AIASSName, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Receive/Ass_ReceiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Receive/Ass_ReceiveService.cs index cca4c1d3b..5eab54432 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Receive/Ass_ReceiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Receive/Ass_ReceiveService.cs @@ -217,15 +217,10 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem if (num > 0) { var assInfoEntity = db.FindEntity(a => a.AId == item.AID); - if (assInfoEntity.AStock > num) + if (assInfoEntity.AStock >= num) { assInfoEntity.AStock = assInfoEntity.AStock - num; - var listAssInfoItemList = - db.FindList(a => a.AId == item.AID).Take(2); - foreach (var assInfoItem in listAssInfoItemList) - { - db.Delete(assInfoItem); - } + db.Update(assInfoEntity); } }