From 4aae6423b69c742a665293d4eb95a4e33370df5a Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Sat, 29 Feb 2020 08:52:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=98=AF=E7=95=99=E7=BB=99=E8=91=97=E4=BD=9C=E6=9D=83=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=9A=84=EF=BC=8C=E4=B8=8A=E6=AC=A1=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=BF=98=E8=AE=B0=E6=94=B9=E5=9B=9E=E6=9D=A5=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ButcherFactory.Form/ButcherFactory.Form.csproj                | 2 +-
 .../SegmentProductionAuto_/SegmentProductionAutoForm.cs       | 4 ++--
 .../SegmentProduction_/SegmentProductionForm.cs               | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ButcherFactory.Form/ButcherFactory.Form.csproj b/ButcherFactory.Form/ButcherFactory.Form.csproj
index 29f12f5..810c849 100644
--- a/ButcherFactory.Form/ButcherFactory.Form.csproj
+++ b/ButcherFactory.Form/ButcherFactory.Form.csproj
@@ -456,8 +456,8 @@
     <Content Include="Files\today.png" />
     <Content Include="Files\uCheck.png" />
     <Content Include="Files\wtl.wav" />
-    <Content Include="SegmentProduction_\SegmentProductionPrint1.html" />
     <Content Include="SegmentProduction_\SegmentProductionPrint.html" />
+    <Content Include="SegmentProduction_\SegmentProductionPrint1.html" />
     <Content Include="SegmentProduction_\SegmentProductionPrintEnd.html" />
     <Content Include="SegmentStockUp_\SegmentStockUpPrint.html" />
     <Content Include="SegmentStockUp_\SegmentStockUpPrint.txt" />
diff --git a/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs b/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs
index 1108648..bb04776 100644
--- a/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs
+++ b/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs
@@ -24,8 +24,8 @@ namespace ButcherFactory.SegmentProductionAuto_
   {
     public List<short> RoleName
     {
-      get { return new List<short> { (short)设备类别.分割生产自动化 }; }
-      //get { return new List<short> { (short)设备类别.分割生产 }; }
+      //get { return new List<short> { (short)设备类别.分割生产自动化 }; }
+      get { return new List<short> { (short)设备类别.分割生产 }; }
     }
 
     public Form Generate()
diff --git a/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.cs b/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.cs
index b4b7a03..776acb9 100644
--- a/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.cs
+++ b/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.cs
@@ -22,7 +22,9 @@ namespace ButcherFactory.SegmentProduction_
   {
     public List<short> RoleName
     {
-      get { return new List<short> { (short)设备类别.分割生产 }; }
+      //get { return new List<short> { (short)设备类别.分割生产 }; }
+
+      get { return new List<short> { -1 }; }
     }
 
     public Form Generate()