From ea6484fa9919e4acb6716a96ae088fcc84da8c50 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Sat, 3 Feb 2018 08:08:59 +0800
Subject: [PATCH] .

---
 BO/BO.csproj                                    |  1 -
 BO/BO/Bill/GradeAndWeight/WeightData.cs         | 17 -----------------
 MaterialRequisition/MaterialRequisition.csproj  |  4 +++-
 MaterialRequisition/领料退料.txt            |  1 +
 SegmentationInStore/SegmentationInStore.csproj  |  3 +++
 SegmentationInStore/分割品入库.txt         |  1 +
 SegmentationWeight/SegmentationWeightForm.cs    | 10 +++++-----
 .../TrunksIousOutInStore.csproj                 |  2 +-
 ...�块说明.txt => 白条出入库称重.txt} |  0
 9 files changed, 14 insertions(+), 25 deletions(-)
 delete mode 100644 BO/BO/Bill/GradeAndWeight/WeightData.cs
 create mode 100644 MaterialRequisition/领料退料.txt
 create mode 100644 SegmentationInStore/分割品入库.txt
 rename TrunksIousOutInStore/{模块说明.txt => 白条出入库称重.txt} (100%)

diff --git a/BO/BO.csproj b/BO/BO.csproj
index b97d887..1a118ed 100644
--- a/BO/BO.csproj
+++ b/BO/BO.csproj
@@ -75,7 +75,6 @@
     <Compile Include="BO\Bill\GradeAndWeight\DetailLastIndex.cs" />
     <Compile Include="BO\Bill\GradeAndWeight\GradeAndWeight_Detail.cs" />
     <Compile Include="BO\Bill\GradeAndWeight\OrderGradeFinishRelate.cs" />
-    <Compile Include="BO\Bill\GradeAndWeight\WeightData.cs" />
     <Compile Include="BO\Bill\OrderDetail\DropPigOrderList.cs" />
     <Compile Include="BO\Bill\OrderDetail\HurryRecord.cs" />
     <Compile Include="BO\Bill\OrderDetail\NeedOrderEntity.cs" />
diff --git a/BO/BO/Bill/GradeAndWeight/WeightData.cs b/BO/BO/Bill/GradeAndWeight/WeightData.cs
deleted file mode 100644
index ab2c10b..0000000
--- a/BO/BO/Bill/GradeAndWeight/WeightData.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Forks.EnterpriseServices.DomainObjects2;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BO.BO.Bill
-{
-  [MapToTable("WeightData")]
-  public class WeightData
-  {
-    public decimal Weight { get; set; }
-
-    public DateTime Time { get; set; }
-  }
-}
diff --git a/MaterialRequisition/MaterialRequisition.csproj b/MaterialRequisition/MaterialRequisition.csproj
index 315cb08..073ff44 100644
--- a/MaterialRequisition/MaterialRequisition.csproj
+++ b/MaterialRequisition/MaterialRequisition.csproj
@@ -110,6 +110,8 @@
       <Name>BWP.WinFormControl</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="领料退料.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/MaterialRequisition/领料退料.txt b/MaterialRequisition/领料退料.txt
new file mode 100644
index 0000000..5f28270
--- /dev/null
+++ b/MaterialRequisition/领料退料.txt
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/SegmentationInStore/SegmentationInStore.csproj b/SegmentationInStore/SegmentationInStore.csproj
index 78db7e2..2d9490e 100644
--- a/SegmentationInStore/SegmentationInStore.csproj
+++ b/SegmentationInStore/SegmentationInStore.csproj
@@ -91,6 +91,9 @@
       <Name>BWP.WinFormControl</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="分割品入库.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/SegmentationInStore/分割品入库.txt b/SegmentationInStore/分割品入库.txt
new file mode 100644
index 0000000..5f28270
--- /dev/null
+++ b/SegmentationInStore/分割品入库.txt
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/SegmentationWeight/SegmentationWeightForm.cs b/SegmentationWeight/SegmentationWeightForm.cs
index a9d1e9b..970c749 100644
--- a/SegmentationWeight/SegmentationWeightForm.cs
+++ b/SegmentationWeight/SegmentationWeightForm.cs
@@ -662,12 +662,12 @@ namespace SegmentationWeight
     void PrintGoodsEntity(SegmentationWeightRecord record)
     {
       var entity = CreatePrintEntity(record);
-#if DEBUG
+//#if DEBUG
       SegmentationWeightPrint.Print(entity);
-#endif
-#if !DEBUG
-       SegmentationWeightPrint.Print5050(entity);
-#endif
+//#endif
+//#if !DEBUG
+//       SegmentationWeightPrint.Print5050(entity);
+//#endif
 
     }
 
diff --git a/TrunksIousOutInStore/TrunksIousOutInStore.csproj b/TrunksIousOutInStore/TrunksIousOutInStore.csproj
index f10e268..2166d00 100644
--- a/TrunksIousOutInStore/TrunksIousOutInStore.csproj
+++ b/TrunksIousOutInStore/TrunksIousOutInStore.csproj
@@ -110,7 +110,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="模块说明.txt" />
+    <Content Include="白条出入库称重.txt" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/TrunksIousOutInStore/模块说明.txt b/TrunksIousOutInStore/白条出入库称重.txt
similarity index 100%
rename from TrunksIousOutInStore/模块说明.txt
rename to TrunksIousOutInStore/白条出入库称重.txt