解决冲突

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextBookIndentController.cs

@@ -48,6 +48,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 明细
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormDetail()
+        {
+            return View();
+        }
 
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIndentDetail/Form.cshtml

@@ -1,39 +0,0 @@
-@{
-    ViewBag.Title = "教材订单明细";
-    Layout = "~/Views/Shared/_Form.cshtml";
-}
-<div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">ID<font face="宋体">*</font></div>
-        <input id="ID" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">IndentId<font face="宋体">*</font></div>
-        <input id="IndentId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">DeptNo<font face="宋体">*</font></div>
-        <input id="DeptNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">MajorNo<font face="宋体">*</font></div>
-        <input id="MajorNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">ClassNo<font face="宋体">*</font></div>
-        <input id="ClassNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">TeachSum<font face="宋体">*</font></div>
-        <input id="TeachSum" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">StuSum<font face="宋体">*</font></div>
-        <input id="StuSum" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">Remark<font face="宋体">*</font></div>
-        <input id="Remark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-</div>
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TextBookIndentDetail/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -838,7 +838,6 @@
     <Compile Include="Areas\PersonnelManagement\Controllers\FD_BudgetFileController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\TextBookInfoController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\TextBookIndentController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\TextBookIndentDetailController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -1172,6 +1171,7 @@
     <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\IndexManage.js" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormView.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormDetail.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\IndexResult.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\StatisticIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\SubmitIndex.js" />
@@ -6645,7 +6645,7 @@
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndentDetail\Index.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndentDetail\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndentDetail\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormDetail.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndentDetail\Form.js" />
   </ItemGroup>
   <ItemGroup>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -592,7 +592,6 @@
     <Compile Include="PersonnelManagement\FD_BudgetFileMap.cs" />
     <Compile Include="EducationalAdministration\TextBookInfoMap.cs" />
     <Compile Include="EducationalAdministration\TextBookIndentMap.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndentDetailMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIndent/TextBookIndentEntity.cs

@@ -60,6 +60,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("PUBLISHNO")]
         public string PublishNo { get; set; }
         /// <summary>
+        /// 教材号
+        /// </summary>
+        [Column("TEXTBOOKNO")]
+        public string TextBookNo { get; set; }
+        /// <summary>
         /// 教材名称
         /// </summary>
         [Column("TEXTBOOKNAME")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -1798,10 +1798,6 @@
     <Compile Include="EducationalAdministration\TextBookIndent\TextBookIndentService.cs" />
     <Compile Include="EducationalAdministration\TextBookIndent\TextBookIndentBLL.cs" />
     <Compile Include="EducationalAdministration\TextBookIndent\TextBookIndentIBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndentDetail\TextBookIndentDetailEntity.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndentDetail\TextBookIndentDetailService.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndentDetail\TextBookIndentDetailIBLL.cs" />
-    <Compile Include="EducationalAdministration\TextBookIndentDetail\TextBookIndentDetailBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">