From a9538a61156c697b4cfe624b7fb58316e4b0ae2d Mon Sep 17 00:00:00 2001
From: luanhui <1029149336@qq.com>
Date: Wed, 15 Nov 2017 17:28:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=94=99=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BO/Utils/AfterLoginUtil.cs   | 44 ++++++++++++++++++------------------
 ButcherManageClient/Login.cs |  6 ++---
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/BO/Utils/AfterLoginUtil.cs b/BO/Utils/AfterLoginUtil.cs
index 321f2ce..386d292 100644
--- a/BO/Utils/AfterLoginUtil.cs
+++ b/BO/Utils/AfterLoginUtil.cs
@@ -18,27 +18,27 @@ namespace BO.Utils
 
   public static class AfterLoginUtil
   {
+//
+//    static List<Tuple<string, string>> roleToAssemblies = new List<Tuple<string, string>>(){new Tuple<string,string>("排宰员",@"C:\BwpB3Project\src\B3ButcherManageClient\ButcherOrder\bin\Debug\ButcherOrder"),
+//  new Tuple<string,string>("过磅员",@"C:\BwpB3Project\src\B3ButcherManageClient\ButcherWeight\bin\Debug\ButcherWeight"),
+//   new Tuple<string,string>("验质员",@"C:\BwpB3Project\src\B3ButcherManageClient\QualityAndOrder\bin\Debug\QualityAndOrder"),
+//      new Tuple<string,string>("定级员",@"C:\BwpB3Project\src\B3ButcherManageClient\WeighAndGrading\bin\Debug\WeighAndGrading"),
+//      new Tuple<string,string>("窒晕员",@"C:\BwpB3Project\src\B3ButcherManageClient\OrderConfirm\bin\Debug\OrderConfirm"),
+//      new Tuple<string,string>("掉猪处理员",@"C:\BwpB3Project\src\B3ButcherManageClient\DropPigReOrder\bin\Debug\DropPigReOrder"),
+//      new Tuple<string,string>("配货员",@"D:\BWP\BWPB3\src\B3ButcherManageClient\Distribution\bin\Debug\Distribution")
+//      
+//    };
 
-    static List<Tuple<string, string>> roleToAssemblies = new List<Tuple<string, string>>(){new Tuple<string,string>("排宰员",@"C:\BwpB3Project\src\B3ButcherManageClient\ButcherOrder\bin\Debug\ButcherOrder"),
-  new Tuple<string,string>("过磅员",@"C:\BwpB3Project\src\B3ButcherManageClient\ButcherWeight\bin\Debug\ButcherWeight"),
-   new Tuple<string,string>("验质员",@"C:\BwpB3Project\src\B3ButcherManageClient\QualityAndOrder\bin\Debug\QualityAndOrder"),
-      new Tuple<string,string>("定级员",@"C:\BwpB3Project\src\B3ButcherManageClient\WeighAndGrading\bin\Debug\WeighAndGrading"),
-      new Tuple<string,string>("窒晕员",@"C:\BwpB3Project\src\B3ButcherManageClient\OrderConfirm\bin\Debug\OrderConfirm"),
-      new Tuple<string,string>("掉猪处理员",@"C:\BwpB3Project\src\B3ButcherManageClient\DropPigReOrder\bin\Debug\DropPigReOrder"),
-      new Tuple<string,string>("配货员",@"D:\BWP\BWPB3\src\B3ButcherManageClient\Distribution\bin\Debug\Distribution")
-      
-    };
-
-    //    static List<Tuple<string, string>> roleToAssemblies = new List<Tuple<string, string>>()
-    //    {
-    //      new Tuple<string,string>("排宰员",@"\ButcherOrder"),
-    //      new Tuple<string,string>("过磅员",@"ButcherWeight"),
-    //      new Tuple<string,string>("验质员",@"QualityAndOrder"),
-    //      new Tuple<string,string>("定级员",@"WeighAndGrading"),
-    //      new Tuple<string,string>("窒晕员",@"OrderConfirm"),
-    //      new Tuple<string,string>("掉猪处理员",@"DropPigReOrder"),
-    ////      new Tuple<string,string>("定级员",@"C:\B3\src\B3ButcherManageClient\CarcassStateWeight\bin\Debug\CarcassStateWeight")
-    //    };
+        static List<Tuple<string, string>> roleToAssemblies = new List<Tuple<string, string>>()
+        {
+          new Tuple<string,string>("排宰员",@"\ButcherOrder"),
+          new Tuple<string,string>("过磅员",@"ButcherWeight"),
+          new Tuple<string,string>("验质员",@"QualityAndOrder"),
+          new Tuple<string,string>("定级员",@"WeighAndGrading"),
+          new Tuple<string,string>("窒晕员",@"OrderConfirm"),
+          new Tuple<string,string>("掉猪处理员",@"DropPigReOrder"),
+    //      new Tuple<string,string>("定级员",@"C:\B3\src\B3ButcherManageClient\CarcassStateWeight\bin\Debug\CarcassStateWeight")
+        };
 
 
 
@@ -48,10 +48,10 @@ namespace BO.Utils
       if (first == null)
         throw new Exception("未注册的角色");
       //#if debug
-      var filePath = string.Format("{0}.dll", first.Item2);
+//      var filePath = string.Format("{0}.dll", first.Item2);
       //#endif
       //#if !debug
-      // var filePath = Path.Combine(Application.StartupPath, string.Format("{0}.dll", first.Item2));
+       var filePath = Path.Combine(Application.StartupPath, string.Format("{0}.dll", first.Item2));
       //#endif
       if (!File.Exists(filePath))
         throw new Exception("相关模块不存在");
diff --git a/ButcherManageClient/Login.cs b/ButcherManageClient/Login.cs
index 9c9d426..10476fc 100644
--- a/ButcherManageClient/Login.cs
+++ b/ButcherManageClient/Login.cs
@@ -33,7 +33,7 @@ namespace ButcherManageClient
     {
       InitializeComponent();
       userNameTxt.Text = ButcherAppContext.Context.UserConfig.UserName;
-      pwdTxt.Text = "";
+      pwdTxt.Text = "123";
     }
 
     private void settingBtn_Click(object sender, EventArgs e)
@@ -65,8 +65,8 @@ namespace ButcherManageClient
           throw new Exception("离线状态请保持与上次用户名一致");
         ButcherAppContext.Context.UserConfig.Connection = false;
       }
-//      var form = AfterLoginUtil.CreateForm(ButcherAppContext.Context.UserConfig.Role);
-      var form = AfterLoginUtil.CreateForm("配货员");
+      var form = AfterLoginUtil.CreateForm(ButcherAppContext.Context.UserConfig.Role);
+//      var form = AfterLoginUtil.CreateForm("配货员");
       if (form == null)
         throw new Exception("权限不符");
       form.FormClosing += delegate { SubFormClosing(); };