调整资产管理

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsOutApplyController.cs

@@ -28,7 +28,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单查看页
@@ -70,7 +70,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
             ViewBag.AOCode = "CKSQ_" + CommonHelper.CreateNo();
             return View();
         }
-        
+
         /// <summary>
         /// 资产调拨多选页面
         /// <summary>
@@ -80,7 +80,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         {
             return View();
         }
-        
+
         /// <summary>
         /// 表单页
         /// <summary>
@@ -134,13 +134,14 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var Ass_AssetsOutApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutApplyEntity( keyValue );
-            var Ass_AssetsOutItemApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutItemApplyList( Ass_AssetsOutApplyData.AOId );
+            var Ass_AssetsOutApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutApplyEntity(keyValue);
+            var Ass_AssetsOutItemApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutItemApplyList(Ass_AssetsOutApplyData.AOId);
             Ass_AssetsOutApplyData.AOINewDepartment = Ass_AssetsOutItemApplyData.FirstOrDefault().AOINewDepartment;
             Ass_AssetsOutApplyData.AOINewUsePeople = Ass_AssetsOutItemApplyData.FirstOrDefault().AOINewUsePeople;
             Ass_AssetsOutApplyData.AOINewStorageId = Ass_AssetsOutItemApplyData.FirstOrDefault().AOINewStorageId;
             Ass_AssetsOutApplyData.AOINewRoomId = Ass_AssetsOutItemApplyData.FirstOrDefault().AOINewRoomId;
-            var jsonData = new {
+            var jsonData = new
+            {
                 Ass_AssetsOutApply = Ass_AssetsOutApplyData,
                 Ass_AssetsOutItemApply = Ass_AssetsOutItemApplyData,
             };
@@ -154,9 +155,10 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [AjaxOnly]
         public ActionResult GetFormDataByProcessId(string processId)
         {
-            var Ass_AssetsOutApplyData = ass_AssetsOutApplyIBLL.GetEntityByProcessId( processId );
-            var Ass_AssetsOutItemApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutItemApplyList( Ass_AssetsOutApplyData.AOId );
-            var jsonData = new {
+            var Ass_AssetsOutApplyData = ass_AssetsOutApplyIBLL.GetEntityByProcessId(processId);
+            var Ass_AssetsOutItemApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutItemApplyList(Ass_AssetsOutApplyData.AOId);
+            var jsonData = new
+            {
                 Ass_AssetsOutApply = Ass_AssetsOutApplyData,
                 Ass_AssetsOutItemApply = Ass_AssetsOutItemApplyData,
             };
@@ -189,11 +191,14 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity, string strass_AssetsOutItemApplyList)
         {
             Ass_AssetsOutApplyEntity entity = strEntity.ToObject<Ass_AssetsOutApplyEntity>();
-            entity.AOStatus = 0;
-            entity.AOOutStatus = 0;
-            entity.AOCreateTime = DateTime.Now;
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.AOStatus = 0;
+                entity.AOOutStatus = 0;
+                entity.AOCreateTime = DateTime.Now;
+            }
             List<Ass_AssetsOutItemApplyEntity> ass_AssetsOutItemApplyList = strass_AssetsOutItemApplyList.ToObject<List<Ass_AssetsOutItemApplyEntity>>();
-            ass_AssetsOutApplyIBLL.SaveEntity(keyValue,entity,ass_AssetsOutItemApplyList);
+            ass_AssetsOutApplyIBLL.SaveEntity(keyValue, entity, ass_AssetsOutItemApplyList);
             return Success("保存成功！");
         }
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js

@@ -165,7 +165,7 @@ var bootstrap = function ($, learun) {
                                 key: value,
                                 keyId: 'rid',
                                 callback: function (_data) {
-                                    callback(_data['rcode'] + '(' + _data['rname'] + ')');
+                                    callback(_data['rcode']);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js

@@ -165,7 +165,7 @@ var bootstrap = function ($, learun) {
                                 key: value,
                                 keyId: 'rid',
                                 callback: function (_data) {
-                                    callback(_data['rcode'] + '(' + _data['rname'] + ')');
+                                    callback(_data['rcode']);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js

@@ -164,7 +164,7 @@ var bootstrap = function ($, learun) {
                                 key: value,
                                 keyId: 'rid',
                                 callback: function (_data) {
-                                    callback(_data['rcode'] + '(' + _data['rname'] + ')');
+                                    callback(_data['rcode']);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js

@@ -155,7 +155,7 @@ var bootstrap = function ($, learun) {
                                 key: value,
                                 keyId: 'rid',
                                 callback: function (_data) {
-                                    callback(_data['rcode'] + '(' + _data['rname'] + ')');
+                                    callback(_data['rcode']);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsOutApply/Ass_AssetsOutApplyEntity.cs

@@ -72,27 +72,6 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         [Column("AOPROJECTNAME")]
         public string AOProjectName { get; set; }
 
-        /// <summary>
-        /// 新使用部门
-        /// </summary>
-        [NotMapped]
-        public string AOINewDepartment { get; set; }
-        /// <summary>
-        /// 新使用人员
-        /// </summary>
-        [NotMapped]
-        public string AOINewUsePeople { get; set; }
-        /// <summary>
-        /// 新楼宇名称
-        /// </summary>
-        [NotMapped]
-        public string AOINewStorageId { get; set; }
-        /// <summary>
-        /// 新房间号
-        /// </summary>
-        [NotMapped]
-        public string AOINewRoomId { get; set; }
-
         #endregion
 
         #region  扩展操作
@@ -116,6 +95,27 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         [NotMapped]
         public string AOAIId { get; set; }
 
+        /// <summary>
+        /// 新使用部门
+        /// </summary>
+        [NotMapped]
+        public string AOINewDepartment { get; set; }
+        /// <summary>
+        /// 新使用人员
+        /// </summary>
+        [NotMapped]
+        public string AOINewUsePeople { get; set; }
+        /// <summary>
+        /// 新楼宇名称
+        /// </summary>
+        [NotMapped]
+        public string AOINewStorageId { get; set; }
+        /// <summary>
+        /// 新房间号
+        /// </summary>
+        [NotMapped]
+        public string AOINewRoomId { get; set; }
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsOutApply/Ass_AssetsOutApplyService.cs

@@ -213,10 +213,10 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                         allPrice += item.AOIPrice.ToDecimal();
                         item.Create();
                         item.AOId = ass_AssetsOutApplyEntityTmp.AOId;
-                        //item.AOINewUsePeople = entity.AOINewUsePeople;
-                        //item.AOINewRoomId = entity.AOINewRoomId;
-                        //item.AOINewDepartment = entity.AOINewDepartment;
-                        //item.AOINewStorageId = entity.AOINewStorageId;
+                        item.AOINewUsePeople = entity.AOINewUsePeople;
+                        item.AOINewRoomId = entity.AOINewRoomId;
+                        item.AOINewDepartment = entity.AOINewDepartment;
+                        item.AOINewStorageId = entity.AOINewStorageId;
                         db.Insert(item);
                     }
                     entity.AOPrice = allPrice;