From d6a2562226a89c52f9a3eccca8a224acff6a53e6 Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Mon, 21 May 2018 17:52:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.139987?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3SubstituteKill.Web/B3SubstituteKill.Web.csproj            | 2 +-
 .../Bills/SubKillWeightBill_/SubKillWeightBillEdit.cs       | 5 ++++-
 B3SubstituteKill/B3SubstituteKill.csproj                    | 2 +-
 B3SubstituteKill/Utils/B3SubstituteKillConsts.cs            | 6 ++++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/B3SubstituteKill.Web/B3SubstituteKill.Web.csproj b/B3SubstituteKill.Web/B3SubstituteKill.Web.csproj
index 2e75770..2e4c9f1 100644
--- a/B3SubstituteKill.Web/B3SubstituteKill.Web.csproj
+++ b/B3SubstituteKill.Web/B3SubstituteKill.Web.csproj
@@ -124,7 +124,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Pages\B3SubstituteKill\BaseInfos\GenerationCostItem_\GenerationCostItemEdit.cs">
+    <Compile Include="..\..\..\version\B3SubstituteKill_version.cs"><Link>B3SubstituteKill_version.cs</Link></Compile><Compile Include="Pages\B3SubstituteKill\BaseInfos\GenerationCostItem_\GenerationCostItemEdit.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Pages\B3SubstituteKill\BaseInfos\GenerationCostItem_\GenerationCostItemList.cs">
diff --git a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillWeightBill_/SubKillWeightBillEdit.cs b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillWeightBill_/SubKillWeightBillEdit.cs
index d34b944..3cf40e9 100644
--- a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillWeightBill_/SubKillWeightBillEdit.cs
+++ b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillWeightBill_/SubKillWeightBillEdit.cs
@@ -15,6 +15,7 @@ using System.Web.UI.WebControls;
 using TSingSoft.WebControls2;
 using Forks.Utils.Collections;
 using BWP.B3SubstituteKill.Utils;
+using TSingSoft.WebPluginFramework;
 
 namespace BWP.Web.Pages.B3SubstituteKill.Bills.SubKillWeightBill_
 {
@@ -200,6 +201,8 @@ __DFContainer.setValue('PriceBill_ID','');
           return CheckDefaultRole("编辑头数");
         if (field.Name == "MaoWeight" || field.Name == "PiWeight")
           return CheckDefaultRole("编辑重量");
+        if (field.Name == "Weight")
+          return GlobalFlags.get(B3SubstituteKillConsts.Flags.SubKillWeightBill_Detail_WeightIsEdit);
         return true;
       };
       _detailGrid = titlePanel.EAdd(new DFEditGrid(editor) { Width = Unit.Percentage(100) });
@@ -217,7 +220,7 @@ __DFContainer.setValue('PriceBill_ID','');
       };
       _detailGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("MaoWeight"));
       _detailGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("PiWeight"));
-      _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Weight"));
+      _detailGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("Weight"));
       _detailGrid.Columns.EAdd(new DFEditGridColumn<DFChoiceBox>("LiveColonyHouse_ID")).InitEditControl += (sender, e) =>
       {
         e.Control.DataKind = B3ProduceUnitedInfosDataSources.活体圈舍;
diff --git a/B3SubstituteKill/B3SubstituteKill.csproj b/B3SubstituteKill/B3SubstituteKill.csproj
index 6cc7e0e..dbafcf5 100644
--- a/B3SubstituteKill/B3SubstituteKill.csproj
+++ b/B3SubstituteKill/B3SubstituteKill.csproj
@@ -101,7 +101,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BL\BaseInfos\GenerationCostItem\GenerationCostItemBL.cs" />
+    <Compile Include="..\..\..\version\B3SubstituteKill_version.cs"><Link>B3SubstituteKill_version.cs</Link></Compile><Compile Include="BL\BaseInfos\GenerationCostItem\GenerationCostItemBL.cs" />
     <Compile Include="BL\BaseInfos\SubKillProductLine\SubKillProductLineBL.cs" />
     <Compile Include="BL\BaseInfos\SubKillFlag\SubKillFlagBL.cs" />
     <Compile Include="BL\BaseInfos\SubKillCallBack\SubKillCallBackBL.cs" />
diff --git a/B3SubstituteKill/Utils/B3SubstituteKillConsts.cs b/B3SubstituteKill/Utils/B3SubstituteKillConsts.cs
index 13e6536..8b16fc5 100644
--- a/B3SubstituteKill/Utils/B3SubstituteKillConsts.cs
+++ b/B3SubstituteKill/Utils/B3SubstituteKillConsts.cs
@@ -29,5 +29,11 @@ namespace BWP.B3SubstituteKill.Utils
       public const byte StatPay = 5;
       public const byte SubKillGathering = 6;
     }
+
+    public static class Flags
+    {
+      public const string SubKillWeightBill_Detail_WeightIsEdit = "B3SubstituteKill_SubKillWeightBill_Detail_WeightIsEdit";
+
+    }
   }
 }