资产修改

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

@@ -44,7 +44,7 @@
         <input id="APrice" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">库存<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">数量<font face="宋体">*</font></div>
         <input id="AStock" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">

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

@@ -52,15 +52,32 @@ var bootstrap = function ($, learun) {
         if (!$('body').lrValidform()) {
             return false;
         }
+        var formInfo = $('body').lrGetFormData();
         var postData = {
-            strEntity: JSON.stringify($('body').lrGetFormData())
+            strEntity: JSON.stringify(formInfo)
         };
-        $.lrSaveForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
-            // 保存成功后才回调
-            if (!!callBack) {
-                callBack();
-            }
-        });
+        if (formInfo.HasDetail == "true") {
+            learun.layerConfirm('此操作会重新生成明细，请确认！！',
+                function (res) {
+                    if (res) {
+
+                        $.lrSaveForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+                            // 保存成功后才回调
+                            if (!!callBack) {
+                                callBack();
+                            }
+                        });
+                    }
+                })
+        } else {
+
+            $.lrSaveForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+                // 保存成功后才回调
+                if (!!callBack) {
+                    callBack();
+                }
+            });
+        }
     };
     page.init();
 }

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

@@ -60,6 +60,7 @@ var bootstrap = function ($, learun) {
             });
             $("#lr_printBar").on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('AICode');
+                var AName = $('#gridtable').jfGridValue('AIASSName');
                 if (learun.checkrow(keyValue)) {
                     //todo 打印标签
                     //$('.qrcodeTxt').html(keyValue);
@@ -79,7 +80,7 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'formcardprint',
                         title: '打印二维码',
-                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/QRPrint?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/QRPrint?keyValue=' + keyValue+'&aName='+escape(AName),
                         width: 700,
                         height: 300,
                         btn: null,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/QRPrint.cshtml

@@ -37,7 +37,8 @@
         height: 80
     });
     var keyValue = request('keyValue');//二维码
-    $('.qrcodeTxt').html(keyValue)
+    var aName = request('aName');
+    $('.qrcodeTxt').html(unescape( aName));
     $(function () {
         qrcode.makeCode(keyValue);
         $("#btnprint").on("click", function () {

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

@@ -237,6 +237,7 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
+                    { label: "审核意见", name: "POpinion", width: 130, align: "left" },
                     {
                         label: "采购状态", name: "PStatus", width: 100, align: "left",
                         formatter: function (cellvalue, row) {

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

@@ -20,7 +20,7 @@
         <div id="PAITId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_PurchaseItemApply">
-        <div class="lr-form-item-title">单价<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">预算单价<font face="宋体">*</font></div>
         <input id="PAIPrice" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_PurchaseItemApply">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs

@@ -267,61 +267,61 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                     entity.Modify(keyValue);
                     db.Update(entity);
                     //清空明细和出入明细
-                    //var Ass_AssetsInfoItemList = db.FindList<Ass_AssetsInfoItemEntity>(m => m.AId == keyValue);
-                    //foreach (var Ass_AssetsInfoItem in Ass_AssetsInfoItemList)
-                    //{
-                    //    db.Delete<Ass_AssetsChangeItemEntity>(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);
-                    //}
+                    var Ass_AssetsInfoItemList = db.FindList<Ass_AssetsInfoItemEntity>(m => m.AId == keyValue);
+                    foreach (var Ass_AssetsInfoItem in Ass_AssetsInfoItemList)
+                    {
+                        db.Delete<Ass_AssetsChangeItemEntity>(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
                 {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Purchase/Ass_PurchaseService.cs

@@ -39,6 +39,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 t.PActualPrice,
                 t.PStatus,
                 t.PStoregeStatus,
+                t.POpinion,
                 a.PACode
                 ");
                 strSql.Append("  FROM Ass_Purchase t join Ass_PurchaseApply a on t.PAId=a.PAId");

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_PurchaseApply/Ass_PurchaseApplyBLL.cs

@@ -245,11 +245,11 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// </summary>
         /// <param name="pastatus">审核状态</param>
         /// <param name="processId">流程Id</param>
-        public void ModifyPAStatusByProcessId(int pastatus, string processId)
+        public void ModifyPAStatusByProcessId(int pastatus, string processId,string des)
         {
             try
             {
-                ass_PurchaseApplyService.ModifyPAStatusByProcessId(pastatus, processId);
+                ass_PurchaseApplyService.ModifyPAStatusByProcessId(pastatus, processId, des);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_PurchaseApply/Ass_PurchaseApplyEntity.cs

@@ -79,6 +79,11 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// </summary>
         [Column("PASSTYPE")]
         public int? PAssType { get; set; }
+        /// <summary>
+        /// 审批意见
+        /// </summary>
+        [Column("POPINION")]
+        public string POpinion { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_PurchaseApply/Ass_PurchaseApplyIBLL.cs

@@ -81,7 +81,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// </summary>
         /// <param name="pastatus">审核状态</param>
         /// <param name="processId">流程Id</param>
-        void ModifyPAStatusByProcessId(int pastatus, string processId);
+        void ModifyPAStatusByProcessId(int pastatus, string processId,string des);
 
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_PurchaseApply/Ass_PurchaseApplyService.cs

@@ -321,7 +321,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// </summary>
         /// <param name="pastatus">审核状态</param>
         /// <param name="processId">流程Id</param>
-        public void ModifyPAStatusByProcessId(int pastatus, string processId)
+        public void ModifyPAStatusByProcessId(int pastatus, string processId,string des)
         {
             var db = this.BaseRepository().BeginTrans();
             try
@@ -354,10 +354,11 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 }
                 //更新采购申请表的审核状态
                 var strsql = new StringBuilder();
-                strsql.Append("update Ass_PurchaseApply set PAStatus=@PAStatus where PAProcessId=@PAProcessId");
+                strsql.Append("update Ass_PurchaseApply set PAStatus=@PAStatus,POpinion=@POpinion where PAProcessId=@PAProcessId");
                 var dp = new DynamicParameters();
                 dp.Add("PAStatus", pastatus, DbType.Int32);
                 dp.Add("PAProcessId", processId, DbType.String);
+                dp.Add("POpinion", des, DbType.String);
                 this.BaseRepository("BaseDb").ExecuteBySql(strsql.ToString(), dp);
 
                 db.Commit();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Ass_PurchaseApplyMethod.cs

@@ -10,17 +10,21 @@ namespace Learun.Application.WorkFlow
     public class Ass_PurchaseApplyMethod: IWorkFlowMethod
     {
         Ass_PurchaseApplyIBLL ass_PurchaseApplyIBLL = new Ass_PurchaseApplyBLL();
-      
+        NWFTaskIBLL nWFTaskIBLL=new NWFTaskBLL();
 
         public void Execute(WfMethodParameter parameter)
         {
             if (parameter.code == "agree")
             {
-                ass_PurchaseApplyIBLL.ModifyPAStatusByProcessId(2, parameter.processId);
+                ass_PurchaseApplyIBLL.ModifyPAStatusByProcessId(2, parameter.processId,"");
             }
             else
             {
-                ass_PurchaseApplyIBLL.ModifyPAStatusByProcessId(0, parameter.processId);
+                //获取不同意的审批意见
+                var logDes = nWFTaskIBLL.GetLogList(parameter.processId)
+                    .FirstOrDefault(a => a.F_OperationCode == "disagree")?.F_Des;
+
+                    ass_PurchaseApplyIBLL.ModifyPAStatusByProcessId(0, parameter.processId,logDes);
             }
         }