From b8e0dc800437624ddb75749eba6f17e7d6621c0f Mon Sep 17 00:00:00 2001
From: hwh2023 <598694955@qq.com>
Date: Fri, 25 Aug 2023 12:18:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E5=90=88=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Purchase_Edu_Apply/FormView.cshtml  |  2 +-
 .../Views/Purchase_Info_Apply/FormView.cshtml |  2 +-
 .../Purchase_Logistic_Apply/FormView.cshtml   |  2 +-
 .../Purchase_Other_Apply/FormView.cshtml      |  2 +-
 .../Purchase_Print_Apply/FormView.cshtml      |  2 +-
 .../Purchase_Service_Apply/FormView.cshtml    |  2 +-
 .../Purchase_Student_Apply/FormView.cshtml    |  2 +-
 .../Purchase_Travel_Apply/FormView.cshtml     |  2 +-
 .../Views/Purchase_Work_Apply/FormView.cshtml |  2 +-
 .../Purchase_Edu_ApplyService.cs              | 29 +++++++++++++-----
 .../Purchase_Info_ApplyService.cs             | 30 +++++++++++++------
 .../Purchase_Logistic_ApplyService.cs         | 30 +++++++++++++------
 .../Purchase_Other_ApplyService.cs            | 30 +++++++++++++------
 .../Purchase_Print_ApplyService.cs            | 30 +++++++++++++------
 .../Purchase_Service_ApplyService.cs          | 30 +++++++++++++------
 .../Purchase_Student_ApplyService.cs          | 30 +++++++++++++------
 .../Purchase_Travel_ApplyService.cs           | 30 +++++++++++++------
 .../Purchase_Work_ApplyService.cs             | 30 +++++++++++++------
 18 files changed, 198 insertions(+), 89 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FormView.cshtml
index 2fc685d2f..a4170a81f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FormView.cshtml	
@@ -3,7 +3,7 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item" data-table="Purchase_Edu" style="display:none">
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Edu_apply" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="Createtime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FormView.cshtml
index a7f9f0d79..0ec32a660 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FormView.cshtml	
@@ -3,7 +3,7 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item" data-table="Purchase_Edu" style="display:none">
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Info_apply" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="Createtime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.cshtml
index bdb597362..6b7e5f21e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.cshtml	
@@ -3,7 +3,7 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item" data-table="Purchase_Edu" style="display:none">
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Logistic_apply" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="Createtime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FormView.cshtml
index 278e0c22c..0fc2778af 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FormView.cshtml	
@@ -3,7 +3,7 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item" data-table="Purchase_Edu" style="display:none">
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Other_apply" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="Createtime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FormView.cshtml
index 414eee741..bee2093b7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FormView.cshtml	
@@ -3,7 +3,7 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item" data-table="Purchase_Edu" style="display:none">
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Print_apply" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="Createtime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FormView.cshtml
index 12b6c8094..2c0ae8284 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FormView.cshtml	
@@ -3,7 +3,7 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item" data-table="Purchase_Edu" style="display:none">
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Service_apply" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="Createtime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FormView.cshtml
index af68f7c34..3c13a7c7c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FormView.cshtml	
@@ -3,7 +3,7 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item" data-table="Purchase_Edu" style="display:none">
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Student_apply" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="Createtime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FormView.cshtml
index 23f5154f1..cbb7aaf62 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FormView.cshtml	
@@ -3,7 +3,7 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item" data-table="Purchase_Edu" style="display:none">
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel_apply" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="Createtime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FormView.cshtml
index c87a606be..08b81a661 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FormView.cshtml	
@@ -3,7 +3,7 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item" data-table="Purchase_Edu" style="display:none">
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Work_apply" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="Createtime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyService.cs
index d78152abd..525e627d3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyService.cs	
@@ -246,15 +246,28 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     var Purchase_Edu_ApplyEntityTmp = GetPurchase_Edu_ApplyEntity(keyValue); 
-                    var Purchase_Edu_ApplydetailsEntityTmp = GetPurchase_Edu_ApplydetailsEntity(Purchase_Edu_ApplyEntityTmp.Id); 
-                    entity.Modify(keyValue);
-                    db.Update(entity);
-                    db.Delete<Purchase_Edu_ApplydetailsEntity>(t=>t.applyid == Purchase_Edu_ApplyEntityTmp.Id);
-                    foreach (Purchase_Edu_ApplydetailsEntity item in Purchase_Edu_ApplydetailsList)
+                    var Purchase_Edu_ApplydetailsEntityTmp = GetPurchase_Edu_ApplydetailsEntity(Purchase_Edu_ApplyEntityTmp.Id);
+                    if (entity.Status==0&&entity.CheckStatus==0&&entity.Approvalamount!=0)
                     {
-                        item.Create();
-                        item.applyid = Purchase_Edu_ApplyEntityTmp.Id;
-                        db.Insert(item);
+                        if (entity.Approvalamount != null)
+                        {
+                            //只是修改核准金额
+                            Purchase_Edu_ApplyEntityTmp.Approvalamount = entity.Approvalamount;
+                            Purchase_Edu_ApplyEntityTmp.Modify(keyValue);
+                            db.Update(Purchase_Edu_ApplyEntityTmp);
+                        }
+                    }
+                    else
+                    {
+                        entity.Modify(keyValue);
+                        db.Update(entity);
+                        db.Delete<Purchase_Edu_ApplydetailsEntity>(t => t.applyid == Purchase_Edu_ApplyEntityTmp.Id);
+                        foreach (Purchase_Edu_ApplydetailsEntity item in Purchase_Edu_ApplydetailsList)
+                        {
+                            item.Create();
+                            item.applyid = Purchase_Edu_ApplyEntityTmp.Id;
+                            db.Insert(item);
+                        }
                     }
                     
                 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyService.cs
index 2bc76b734..45cdf017d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyService.cs	
@@ -246,17 +246,29 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     var Purchase_Info_ApplyEntityTmp = GetPurchase_Info_ApplyEntity(keyValue); 
-                    var Purchase_Info_ApplydetailsEntityTmp = GetPurchase_Info_ApplydetailsEntity(Purchase_Info_ApplyEntityTmp.Id); 
-                    entity.Modify(keyValue);
-                    db.Update(entity);
-                    db.Delete<Purchase_Info_ApplydetailsEntity>(t=>t.applyid == Purchase_Info_ApplyEntityTmp.Id);
-                    foreach (Purchase_Info_ApplydetailsEntity item in Purchase_Info_ApplydetailsList)
+                    var Purchase_Info_ApplydetailsEntityTmp = GetPurchase_Info_ApplydetailsEntity(Purchase_Info_ApplyEntityTmp.Id);
+                    if (entity.Status == 0 && entity.CheckStatus == 0 && entity.Approvalamount != 0)
                     {
-                        item.Create();
-                        item.applyid = Purchase_Info_ApplyEntityTmp.Id;
-                        db.Insert(item);
+                        if (entity.Approvalamount != null)
+                        {
+                            //只是修改核准金额
+                            Purchase_Info_ApplyEntityTmp.Approvalamount = entity.Approvalamount;
+                            Purchase_Info_ApplyEntityTmp.Modify(keyValue);
+                            db.Update(Purchase_Info_ApplyEntityTmp);
+                        }
+                    }
+                    else
+                    {
+                        entity.Modify(keyValue);
+                        db.Update(entity);
+                        db.Delete<Purchase_Info_ApplydetailsEntity>(t => t.applyid == Purchase_Info_ApplyEntityTmp.Id);
+                        foreach (Purchase_Info_ApplydetailsEntity item in Purchase_Info_ApplydetailsList)
+                        {
+                            item.Create();
+                            item.applyid = Purchase_Info_ApplyEntityTmp.Id;
+                            db.Insert(item);
+                        }
                     }
-                    
                 }
                 else
                 {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyService.cs
index 7c7c0ede0..9f0d2d059 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyService.cs	
@@ -246,17 +246,29 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     var Purchase_Logistic_ApplyEntityTmp = GetPurchase_Logistic_ApplyEntity(keyValue); 
-                    var Purchase_Logistic_ApplydetailsEntityTmp = GetPurchase_Logistic_ApplydetailsEntity(Purchase_Logistic_ApplyEntityTmp.Id); 
-                    entity.Modify(keyValue);
-                    db.Update(entity);
-                    db.Delete<Purchase_Logistic_ApplydetailsEntity>(t=>t.applyid == Purchase_Logistic_ApplyEntityTmp.Id);
-                    foreach (Purchase_Logistic_ApplydetailsEntity item in Purchase_Logistic_ApplydetailsList)
+                    var Purchase_Logistic_ApplydetailsEntityTmp = GetPurchase_Logistic_ApplydetailsEntity(Purchase_Logistic_ApplyEntityTmp.Id);
+                    if (entity.Status == 0 && entity.CheckStatus == 0 && entity.Approvalamount != 0)
                     {
-                        item.Create();
-                        item.applyid = Purchase_Logistic_ApplyEntityTmp.Id;
-                        db.Insert(item);
+                        if (entity.Approvalamount != null)
+                        {
+                            //只是修改核准金额
+                            Purchase_Logistic_ApplyEntityTmp.Approvalamount = entity.Approvalamount;
+                            Purchase_Logistic_ApplyEntityTmp.Modify(keyValue);
+                            db.Update(Purchase_Logistic_ApplyEntityTmp);
+                        }
+                    }
+                    else
+                    {
+                        entity.Modify(keyValue);
+                        db.Update(entity);
+                        db.Delete<Purchase_Logistic_ApplydetailsEntity>(t => t.applyid == Purchase_Logistic_ApplyEntityTmp.Id);
+                        foreach (Purchase_Logistic_ApplydetailsEntity item in Purchase_Logistic_ApplydetailsList)
+                        {
+                            item.Create();
+                            item.applyid = Purchase_Logistic_ApplyEntityTmp.Id;
+                            db.Insert(item);
+                        }
                     }
-                    
                 }
                 else
                 {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyService.cs
index 23e4ac659..9ba76f2e4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyService.cs	
@@ -246,17 +246,29 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     var Purchase_Other_ApplyEntityTmp = GetPurchase_Other_ApplyEntity(keyValue); 
-                    var Purchase_Other_ApplydetailsEntityTmp = GetPurchase_Other_ApplydetailsEntity(Purchase_Other_ApplyEntityTmp.Id); 
-                    entity.Modify(keyValue);
-                    db.Update(entity);
-                    db.Delete<Purchase_Other_ApplydetailsEntity>(t=>t.applyid == Purchase_Other_ApplyEntityTmp.Id);
-                    foreach (Purchase_Other_ApplydetailsEntity item in Purchase_Other_ApplydetailsList)
+                    var Purchase_Other_ApplydetailsEntityTmp = GetPurchase_Other_ApplydetailsEntity(Purchase_Other_ApplyEntityTmp.Id);
+                    if (entity.Status == 0 && entity.CheckStatus == 0 && entity.Approvalamount != 0)
                     {
-                        item.Create();
-                        item.applyid = Purchase_Other_ApplyEntityTmp.Id;
-                        db.Insert(item);
+                        if (entity.Approvalamount != null)
+                        {
+                            //只是修改核准金额
+                            Purchase_Other_ApplyEntityTmp.Approvalamount = entity.Approvalamount;
+                            Purchase_Other_ApplyEntityTmp.Modify(keyValue);
+                            db.Update(Purchase_Other_ApplyEntityTmp);
+                        }
+                    }
+                    else
+                    {
+                        entity.Modify(keyValue);
+                        db.Update(entity);
+                        db.Delete<Purchase_Other_ApplydetailsEntity>(t => t.applyid == Purchase_Other_ApplyEntityTmp.Id);
+                        foreach (Purchase_Other_ApplydetailsEntity item in Purchase_Other_ApplydetailsList)
+                        {
+                            item.Create();
+                            item.applyid = Purchase_Other_ApplyEntityTmp.Id;
+                            db.Insert(item);
+                        }
                     }
-                    
                 }
                 else
                 {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyService.cs
index 46bdc5994..b65d1f7a5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyService.cs	
@@ -246,17 +246,29 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     var Purchase_Print_ApplyEntityTmp = GetPurchase_Print_ApplyEntity(keyValue); 
-                    var Purchase_Print_ApplydetailsEntityTmp = GetPurchase_Print_ApplydetailsEntity(Purchase_Print_ApplyEntityTmp.Id); 
-                    entity.Modify(keyValue);
-                    db.Update(entity);
-                    db.Delete<Purchase_Print_ApplydetailsEntity>(t=>t.applyid == Purchase_Print_ApplyEntityTmp.Id);
-                    foreach (Purchase_Print_ApplydetailsEntity item in Purchase_Print_ApplydetailsList)
+                    var Purchase_Print_ApplydetailsEntityTmp = GetPurchase_Print_ApplydetailsEntity(Purchase_Print_ApplyEntityTmp.Id);
+                    if (entity.Status == 0 && entity.CheckStatus == 0 && entity.Approvalamount != 0)
                     {
-                        item.Create();
-                        item.applyid = Purchase_Print_ApplyEntityTmp.Id;
-                        db.Insert(item);
+                        if (entity.Approvalamount != null)
+                        {
+                            //只是修改核准金额
+                            Purchase_Print_ApplyEntityTmp.Approvalamount = entity.Approvalamount;
+                            Purchase_Print_ApplyEntityTmp.Modify(keyValue);
+                            db.Update(Purchase_Print_ApplyEntityTmp);
+                        }
+                    }
+                    else
+                    {
+                        entity.Modify(keyValue);
+                        db.Update(entity);
+                        db.Delete<Purchase_Print_ApplydetailsEntity>(t => t.applyid == Purchase_Print_ApplyEntityTmp.Id);
+                        foreach (Purchase_Print_ApplydetailsEntity item in Purchase_Print_ApplydetailsList)
+                        {
+                            item.Create();
+                            item.applyid = Purchase_Print_ApplyEntityTmp.Id;
+                            db.Insert(item);
+                        }
                     }
-                    
                 }
                 else
                 {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyService.cs
index eca4b9566..af0cee1f7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyService.cs	
@@ -246,17 +246,29 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     var Purchase_Service_ApplyEntityTmp = GetPurchase_Service_ApplyEntity(keyValue); 
-                    var Purchase_Service_ApplydetailsEntityTmp = GetPurchase_Service_ApplydetailsEntity(Purchase_Service_ApplyEntityTmp.Id); 
-                    entity.Modify(keyValue);
-                    db.Update(entity);
-                    db.Delete<Purchase_Service_ApplydetailsEntity>(t=>t.applyid == Purchase_Service_ApplyEntityTmp.Id);
-                    foreach (Purchase_Service_ApplydetailsEntity item in Purchase_Service_ApplydetailsList)
+                    var Purchase_Service_ApplydetailsEntityTmp = GetPurchase_Service_ApplydetailsEntity(Purchase_Service_ApplyEntityTmp.Id);
+                    if (entity.Status == 0 && entity.CheckStatus == 0 && entity.Approvalamount != 0)
                     {
-                        item.Create();
-                        item.applyid = Purchase_Service_ApplyEntityTmp.Id;
-                        db.Insert(item);
+                        if (entity.Approvalamount != null)
+                        {
+                            //只是修改核准金额
+                            Purchase_Service_ApplyEntityTmp.Approvalamount = entity.Approvalamount;
+                            Purchase_Service_ApplyEntityTmp.Modify(keyValue);
+                            db.Update(Purchase_Service_ApplyEntityTmp);
+                        }
+                    }
+                    else
+                    {
+                        entity.Modify(keyValue);
+                        db.Update(entity);
+                        db.Delete<Purchase_Service_ApplydetailsEntity>(t => t.applyid == Purchase_Service_ApplyEntityTmp.Id);
+                        foreach (Purchase_Service_ApplydetailsEntity item in Purchase_Service_ApplydetailsList)
+                        {
+                            item.Create();
+                            item.applyid = Purchase_Service_ApplyEntityTmp.Id;
+                            db.Insert(item);
+                        }
                     }
-                    
                 }
                 else
                 {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyService.cs
index 2f19b8e28..adbcc084b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyService.cs	
@@ -246,17 +246,29 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     var Purchase_Student_ApplyEntityTmp = GetPurchase_Student_ApplyEntity(keyValue); 
-                    var Purchase_Student_ApplydetailsEntityTmp = GetPurchase_Student_ApplydetailsEntity(Purchase_Student_ApplyEntityTmp.Id); 
-                    entity.Modify(keyValue);
-                    db.Update(entity);
-                    db.Delete<Purchase_Student_ApplydetailsEntity>(t=>t.applyid == Purchase_Student_ApplyEntityTmp.Id);
-                    foreach (Purchase_Student_ApplydetailsEntity item in Purchase_Student_ApplydetailsList)
+                    var Purchase_Student_ApplydetailsEntityTmp = GetPurchase_Student_ApplydetailsEntity(Purchase_Student_ApplyEntityTmp.Id);
+                    if (entity.Status == 0 && entity.CheckStatus == 0 && entity.Approvalamount != 0)
                     {
-                        item.Create();
-                        item.applyid = Purchase_Student_ApplyEntityTmp.Id;
-                        db.Insert(item);
+                        if (entity.Approvalamount != null)
+                        {
+                            //只是修改核准金额
+                            Purchase_Student_ApplyEntityTmp.Approvalamount = entity.Approvalamount;
+                            Purchase_Student_ApplyEntityTmp.Modify(keyValue);
+                            db.Update(Purchase_Student_ApplyEntityTmp);
+                        }
+                    }
+                    else
+                    {
+                        entity.Modify(keyValue);
+                        db.Update(entity);
+                        db.Delete<Purchase_Student_ApplydetailsEntity>(t => t.applyid == Purchase_Student_ApplyEntityTmp.Id);
+                        foreach (Purchase_Student_ApplydetailsEntity item in Purchase_Student_ApplydetailsList)
+                        {
+                            item.Create();
+                            item.applyid = Purchase_Student_ApplyEntityTmp.Id;
+                            db.Insert(item);
+                        }
                     }
-                    
                 }
                 else
                 {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs
index 2015d24f0..2b251990a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs	
@@ -246,17 +246,29 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     var Purchase_Travel_ApplyEntityTmp = GetPurchase_Travel_ApplyEntity(keyValue); 
-                    var Purchase_Travel_ApplydetailsEntityTmp = GetPurchase_Travel_ApplydetailsEntity(Purchase_Travel_ApplyEntityTmp.Id); 
-                    entity.Modify(keyValue);
-                    db.Update(entity);
-                    db.Delete<Purchase_Travel_ApplydetailsEntity>(t=>t.applyid == Purchase_Travel_ApplyEntityTmp.Id);
-                    foreach (Purchase_Travel_ApplydetailsEntity item in Purchase_Travel_ApplydetailsList)
+                    var Purchase_Travel_ApplydetailsEntityTmp = GetPurchase_Travel_ApplydetailsEntity(Purchase_Travel_ApplyEntityTmp.Id);
+                    if (entity.Status == 0 && entity.CheckStatus == 0 && entity.Approvalamount != 0)
                     {
-                        item.Create();
-                        item.applyid = Purchase_Travel_ApplyEntityTmp.Id;
-                        db.Insert(item);
+                        if (entity.Approvalamount != null)
+                        {
+                            //只是修改核准金额
+                            Purchase_Travel_ApplyEntityTmp.Approvalamount = entity.Approvalamount;
+                            Purchase_Travel_ApplyEntityTmp.Modify(keyValue);
+                            db.Update(Purchase_Travel_ApplyEntityTmp);
+                        }
+                    }
+                    else
+                    {
+                        entity.Modify(keyValue);
+                        db.Update(entity);
+                        db.Delete<Purchase_Travel_ApplydetailsEntity>(t => t.applyid == Purchase_Travel_ApplyEntityTmp.Id);
+                        foreach (Purchase_Travel_ApplydetailsEntity item in Purchase_Travel_ApplydetailsList)
+                        {
+                            item.Create();
+                            item.applyid = Purchase_Travel_ApplyEntityTmp.Id;
+                            db.Insert(item);
+                        }
                     }
-                    
                 }
                 else
                 {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyService.cs
index 2ce4a77dd..7f48816a9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyService.cs	
@@ -246,17 +246,29 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     var Purchase_Work_ApplyEntityTmp = GetPurchase_Work_ApplyEntity(keyValue); 
-                    var Purchase_Work_ApplydetailsEntityTmp = GetPurchase_Work_ApplydetailsEntity(Purchase_Work_ApplyEntityTmp.Id); 
-                    entity.Modify(keyValue);
-                    db.Update(entity);
-                    db.Delete<Purchase_Work_ApplydetailsEntity>(t=>t.applyid == Purchase_Work_ApplyEntityTmp.Id);
-                    foreach (Purchase_Work_ApplydetailsEntity item in Purchase_Work_ApplydetailsList)
+                    var Purchase_Work_ApplydetailsEntityTmp = GetPurchase_Work_ApplydetailsEntity(Purchase_Work_ApplyEntityTmp.Id);
+                    if (entity.Status == 0 && entity.CheckStatus == 0 && entity.Approvalamount != 0)
                     {
-                        item.Create();
-                        item.applyid = Purchase_Work_ApplyEntityTmp.Id;
-                        db.Insert(item);
+                        if (entity.Approvalamount != null)
+                        {
+                            //只是修改核准金额
+                            Purchase_Work_ApplyEntityTmp.Approvalamount = entity.Approvalamount;
+                            Purchase_Work_ApplyEntityTmp.Modify(keyValue);
+                            db.Update(Purchase_Work_ApplyEntityTmp);
+                        }
+                    }
+                    else
+                    {
+                        entity.Modify(keyValue);
+                        db.Update(entity);
+                        db.Delete<Purchase_Work_ApplydetailsEntity>(t => t.applyid == Purchase_Work_ApplyEntityTmp.Id);
+                        foreach (Purchase_Work_ApplydetailsEntity item in Purchase_Work_ApplydetailsList)
+                        {
+                            item.Create();
+                            item.applyid = Purchase_Work_ApplyEntityTmp.Id;
+                            db.Insert(item);
+                        }
                     }
-                    
                 }
                 else
                 {