From 70857ac18d4093abd6dbb3b9039414e63da07851 Mon Sep 17 00:00:00 2001
From: duanluohua <duanluohua@bwp.com>
Date: Mon, 22 Oct 2018 09:01:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=A5=E5=AE=B0=E5=8D=95=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3SheepButcherManage.Web/B3SheepButcherManage.Web.csproj      | 4 ++--
 .../Bills/HurryButcher_/SelectHurryButcherDetailDialog.cs     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/B3SheepButcherManage.Web/B3SheepButcherManage.Web.csproj b/B3SheepButcherManage.Web/B3SheepButcherManage.Web.csproj
index 22c00a9..02369ee 100644
--- a/B3SheepButcherManage.Web/B3SheepButcherManage.Web.csproj
+++ b/B3SheepButcherManage.Web/B3SheepButcherManage.Web.csproj
@@ -226,8 +226,8 @@
     <EmbeddedResource Include="Pages\B3SheepButcherManage\Bills\Butcher_\CreateButcher.xml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Pages\B3SheepButcherManage\Bills\HurryButcher_\HurryButcherList.xml" />
-    <Content Include="Pages\B3SheepButcherManage\Bills\HurryButcher_\SelectHurryButcherDetailDialog.xml" />
+    <EmbeddedResource Include="Pages\B3SheepButcherManage\Bills\HurryButcher_\HurryButcherList.xml" />
+    <EmbeddedResource Include="Pages\B3SheepButcherManage\Bills\HurryButcher_\SelectHurryButcherDetailDialog.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/SelectHurryButcherDetailDialog.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/SelectHurryButcherDetailDialog.cs
index 763cfd2..65fd005 100644
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/SelectHurryButcherDetailDialog.cs
+++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/SelectHurryButcherDetailDialog.cs
@@ -52,6 +52,7 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Bills.HurryButcher_
       dmo.Weigh_ID = (long)row["ID"];
       //dmo.LiveMark = (string)row["LiveMark"];
       dmo.Number = (int?)row["RemainNumber"] ?? 0;
+      dmo.Weight = (Money<decimal>?)row["Weight"]??0;
       //dmo.Technics = (NamedValue<工艺>?)row["SuggestedProcess1"];
       dmo.LiveVarieties_ID = (long?)row["LiveVarieties_ID"];
       dmo.LiveColonyHouse_Name = (string)row["LiveVarieties_Name"];