diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Form.cshtml index 4f2c473f0..d3a1ede99 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Form.cshtml @@ -28,17 +28,22 @@
开始时间
@**@ - +
结束时间
@**@ - +
出差地点
+
+
申报时间
+ + @**@ +
附件上传
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Form.cshtml index 3a969d73d..ff9b95253 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Form.cshtml @@ -6,26 +6,31 @@
部门*
- + +
+
+
申报时间
+ + @**@
申请人*
- +
-
+
总价格*
-
+
备注
- +
-
+
附件上传
-
+
-
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduService.cs index dca5b906d..b8b188fc8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduService.cs @@ -378,7 +378,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement //审核通过 if (status == 2) { - + if (entity.Status != 1) + { + entity.Status = 1; + } } else { 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 6a7764e9b..7ebac96d2 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 @@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement purchasemodel.ApplyStatus = 2; db.Update(purchasemodel); } + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_applyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_applyEntity.cs index 4de6f2989..0f2685a45 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_applyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_applyEntity.cs @@ -108,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement public void Create() { this.Id = Guid.NewGuid().ToString(); + this.Status = 0; + this.CheckStatus = 0; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoService.cs index 1073d4756..fb491346a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoService.cs @@ -327,7 +327,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement //审核通过 if (status == 2) { - + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyEntity.cs index bc8b63827..a7c070d08 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyEntity.cs @@ -108,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement public void Create() { this.Id = Guid.NewGuid().ToString(); + this.Status = 0; + this.CheckStatus = 0; } /// /// 编辑调用 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 88e59a7a2..e7a08c8b7 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 @@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement purchasemodel.ApplyStatus = 2; db.Update(purchasemodel); } + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticService.cs index a1c12bc23..1cc45b33f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticService.cs @@ -327,7 +327,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement //审核通过 if (status == 2) { - + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyEntity.cs index 96dab2892..7b462a1b2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyEntity.cs @@ -108,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement public void Create() { this.Id = Guid.NewGuid().ToString(); + this.Status = 0; + this.CheckStatus = 0; } /// /// 编辑调用 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 69a6a91b2..472167fff 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 @@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement purchasemodel.ApplyStatus = 2; db.Update(purchasemodel); } + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherService.cs index ac7accba7..2a0d409e8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherService.cs @@ -327,7 +327,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement //审核通过 if (status == 2) { - + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyEntity.cs index 24074bf27..8e65dd350 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyEntity.cs @@ -108,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement public void Create() { this.Id = Guid.NewGuid().ToString(); + this.Status = 0; + this.CheckStatus = 0; } /// /// 编辑调用 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 046fd0da5..f1bad40db 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 @@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement purchasemodel.ApplyStatus = 2; db.Update(purchasemodel); } + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintService.cs index 67f52aab6..90ae3c6f3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintService.cs @@ -327,7 +327,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement //审核通过 if (status == 2) { - + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyEntity.cs index e11317722..ca04d2509 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyEntity.cs @@ -108,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement public void Create() { this.Id = Guid.NewGuid().ToString(); + this.Status = 0; + this.CheckStatus = 0; } /// /// 编辑调用 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 cd20eb8e6..f2ca8466e 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 @@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement purchasemodel.ApplyStatus = 2; db.Update(purchasemodel); } + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceEntity.cs index 088c4fc62..39819e6dd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceEntity.cs @@ -108,7 +108,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement public void Create() { this.Id = Guid.NewGuid().ToString(); - this.CreateTime = DateTime.Now; + //this.CreateTime = DateTime.Now; this.Status = 0; this.CheckStatus = 0; this.ApplyStatus = 0; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceService.cs index ea5daa302..371c31335 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceService.cs @@ -378,7 +378,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement //审核通过 if (status == 2) { - + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyEntity.cs index 6ea638a3b..6190c1c24 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyEntity.cs @@ -65,6 +65,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement [Column("APPROVALAMOUNT")] public decimal? Approvalamount { get; set; } /// + /// 核准金额编辑状态 + /// + [Column("EDITSTATE")] + public int editstate { get; set; } + /// /// Status /// [Column("STATUS")] @@ -108,6 +113,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement public void Create() { this.Id = Guid.NewGuid().ToString(); + this.Status = 0; + this.CheckStatus = 0; + this.editstate = 0; } /// /// 编辑调用 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 4c2d94fb7..b65c7c737 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 @@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement purchasemodel.ApplyStatus = 2; db.Update(purchasemodel); } + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs index 1e8305de0..7a0930023 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs @@ -327,7 +327,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement //审核通过 if (status == 2) { - + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyEntity.cs index 323f30fa2..b9c4719d4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyEntity.cs @@ -108,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement public void Create() { this.Id = Guid.NewGuid().ToString(); + this.Status = 0; + this.CheckStatus = 0; } /// /// 编辑调用 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 a4c04b84e..8de76d21e 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 @@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement purchasemodel.ApplyStatus = 2; db.Update(purchasemodel); } + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelEntity.cs index 83a63a3b2..a2899e958 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelEntity.cs @@ -122,7 +122,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement public void Create() { this.Id = Guid.NewGuid().ToString(); - this.CreateTime = DateTime.Now; + //this.CreateTime = DateTime.Now; this.Status = 0; this.CheckStatus = 0; this.ApplyStatus = 0; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelService.cs index 096b2a096..3f046e553 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelService.cs @@ -322,7 +322,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement //审核通过 if (status == 2) { - + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyEntity.cs index 843533573..df4ef06a5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyEntity.cs @@ -65,6 +65,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement [Column("APPROVALAMOUNT")] public decimal? Approvalamount { get; set; } /// + /// 核准金额编辑状态 + /// + [Column("EDITSTATE")] + public int editstate { get; set; } + /// /// Status /// [Column("STATUS")] @@ -108,6 +113,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement public void Create() { this.Id = Guid.NewGuid().ToString(); + this.Status = 0; + this.CheckStatus = 0; + this.editstate = 0; } /// /// 编辑调用 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 c27418c03..ba7d04cc3 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 @@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement purchasemodel.ApplyStatus = 2; db.Update(purchasemodel); } + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs index 2fd5ea23c..c4fd9468c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs @@ -327,7 +327,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement //审核通过 if (status == 2) { - + if (entity.Status != 1) + { + entity.Status = 1; + } } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyEntity.cs index 2d9e204a8..05a9436fc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyEntity.cs @@ -108,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement public void Create() { this.Id = Guid.NewGuid().ToString(); + this.Status = 0; + this.CheckStatus = 0; } /// /// 编辑调用 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 48681f34d..c9fb94ece 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 @@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement purchasemodel.ApplyStatus = 2; db.Update(purchasemodel); } + if (entity.Status != 1) + { + entity.Status = 1; + } } else {