From 6dddaea7cf513f9a55cc54d06a2a3feca750e4f6 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 24 五月 2022 13:15:28 +0800
Subject: [PATCH] 增加了快捷方式

---
 WebAPI/Properties/Settings.settings              |    2 
 WebAPI/Web References/WebS/WebService1.wsdl      |    4 
 DAL/基础资料/公用基础资料/ClsUser.cs                       |    7 
 WarM/条码打印/Sc_ICMOToBarCode.cs                    |   43 +
 BLL/公用模块/FrmLogin.designer.cs                    |   27 
 LMES/Frm_Show.resx                               |  807 +++++++++++++++++-----------
 WebAPI/Controllers/ProductInController.cs        |  272 +++++++++
 WebAPI/Web References/WebS/Reference.map         |    4 
 LMES/Frm_Show.cs                                 |   10 
 WebAPI/Web References/WebS/WebService1.disco     |    6 
 WebAPI/Controllers/MateOutController.cs          |    7 
 LMES/Frm_Show.designer.cs                        |  246 ++++----
 WebAPI/Controllers/SellOutController.cs          |    1 
 WebAPI/Web.config                                |    4 
 WebAPI/Controllers/EntrustOutController.cs       |    1 
 WebAPI/Controllers/Kf_EntrustInBillController.cs |    1 
 WebAPI/WebServer.cs                              |   13 
 WebAPI/Properties/Settings.Designer.cs           |    2 
 BLL/公用模块/FrmLogin.cs                             |  211 +++++++
 WebAPI/WebAPI.csproj                             |    5 
 20 files changed, 1,211 insertions(+), 462 deletions(-)

diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs"
index 2548f64..46aa95d 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs"
@@ -265,6 +265,7 @@
             lblVersion2.Text = "鏈湴鐗堟湰:" + Pub_Class.ClsPub.VersionOld;
             lblIPAddress.Text = "IP:" + Pub_Class.ClsPub.IPAddress + " " + Pub_Class.ClsPub.ComputerName;
             CheckUseOrgID();
+            textBox1.Focus();
         }
 
         //鏍¢獙缁勭粐
@@ -330,5 +331,215 @@
                 Application.Exit();
             }
         }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            //textBox1.Focus();
+            string HPassWord = textBox1.Text.Trim().ToString();
+            //MessageBox.Show(HPassWord);
+            SQLHelper.ClsCN oCn1 = new SQLHelper.ClsCN();
+            //1.鏌ユ壘鏁版嵁搴撴搷浣滃憳绠$悊琛ㄩ噷闈㈡槸鍚︽湁瀵瑰簲杩欎釜鍔犲瘑瀛楃涓插搴旂殑璁板綍
+            DataSet DSet = oCn1.RunProcReturn("select Czymc,Czmm from Gy_Czygl where   HICNumber  ='" + HPassWord + "'", "Gy_Czygl");
+            if (DSet == null || DSet.Tables[0].Rows.Count == 0)
+            //if (DSet == null|| DSet.Tables[0].Rows.Count == 0)
+            {
+                MessageBox.Show("娌℃湁鎵惧埌瀵瑰簲鑱屽憳淇℃伅锛岃閲嶆柊鍒峰崱" + DBUtility.ClsPub.sExeReturnInfo);
+                //textBox1.Text = "";
+                return;
+            }
+            else
+            {
+                cmbUser.Text = ClsPub.isStrNull(DSet.Tables[0].Rows[0]["Czymc"]);
+
+                if (AllowLogin() != true)
+                    return;
+                DataSet ds = null;
+                ClsCNmaster oCn = new ClsCNmaster();
+                ClsCN oCnLoc = new ClsCN();
+                string sDataBase;
+                string sDataBase_K3 = "";
+                string sDataBase_K32 = "";
+                string sDataBase_K33 = "";
+                sDataBase = oCn.GetDataBase(cmbAccount.Text.Trim(), ref sDataBase_K3);
+                ClsIni oIni = new ClsIni();
+                ClsIni.WriteIni("Erp", "DataBase", sDataBase.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+                ClsIni.WriteIni("K3Erp", "DataBase", sDataBase_K3.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+                DAL.ClsUser oUser = new DAL.ClsUser();
+
+                ds = oUser.CheckCzymc_AB(cmbUser.Text.Trim(), textBox1.Text.Trim());
+                if (ds == null)
+                {
+                    MessageBox.Show("閫夋嫨鐨勫笎濂椾笉瀛樺湪锛�", "鎻愮ず");
+                    return;
+                }
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    ClsPub.CurUserID = ds.Tables[0].Rows[0]["Czybm"].ToString();
+                    this.Close();
+                    isOk = true;
+                }
+                else
+                {
+                    MessageBox.Show("閿欒鐨勭敤鎴峰瘑鐮侊紒", "鎻愮ず", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
+                //寰楀埌褰撳墠浼氳鏈熼棿
+                int sYear = 0;
+                int sPeriod = 0;
+                if (!ClsPub.Sub_GetCurPeriod(ref sYear, ref sPeriod))
+                {
+                    MessageBox.Show("寰楀埌褰撳墠浼氳鏈熼棿澶辫触锛�", "鎻愮ず", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    isOk = false;
+                    return;
+                }
+                //
+                this.Close();
+                isOk = true;
+                ClsIni.WriteIni("Erp", "DataBaseNumber", cmbAccount.Text.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+                //瀛樺叆鐢ㄦ埛鍚嶅瘑鐮�
+                //
+                UserName = cmbUser.Text.Trim() + "," + UserName;
+                string[] str = UserName.Split(',');
+                List<string> listStr = new List<string>();
+                foreach (string eachStr in str)
+                {
+                    if (!listStr.Contains(eachStr))
+                        listStr.Add(eachStr);
+                }
+                UserName = "";
+                if (listStr.Count > 10)
+                {
+                    listStr.RemoveAt(10);
+                }
+                foreach (string eachStr in listStr)
+                {
+                    UserName = UserName + eachStr + ",";
+                }
+                UserName = UserName.Remove(UserName.LastIndexOf(","), 1);
+                //
+                ClsIni.WriteIni("UserInfo", "UserName", UserName, DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+                ClsIni.WriteIni("UserInfo", "HOrgName", cmbHOrg.Text.ToString(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+                ClsPub.CurUserName = cmbUser.Text.Trim();
+                ClsPub.AppPath = System.Environment.CurrentDirectory;
+                ClsPub.HOrgID = ClsPub.get_ORGANIZATIONSIDByName(ClsPub.isStrNull(cmbHOrg.Text));
+                ClsPub.HOrgNumber = ClsPub.get_ORGANIZATIONSNOByName(ClsPub.isStrNull(cmbHOrg.Text));
+                ClsPub.HOrgName = ClsPub.isStrNull(cmbHOrg.Text);
+                if (chkRemember.Checked == true)
+                {
+                    ClsIni.WriteIni("UserInfo", "UserPsd", "", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+                    ClsIni.WriteIni("UserInfo", "Remember", "1", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+                }
+                else
+                {
+                    ClsIni.WriteIni("UserInfo", "UserPsd", "", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+                    ClsIni.WriteIni("UserInfo", "Remember", "0", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+                }
+            }
+        }
+
+        private void textBox1_TextChanged(object sender, EventArgs e)
+        {
+            //string HPassWord = textBox1.Text.Trim().ToString();
+            ////MessageBox.Show(HPassWord);
+            //SQLHelper.ClsCN oCn1 = new SQLHelper.ClsCN();
+            ////1.鏌ユ壘鏁版嵁搴撴搷浣滃憳绠$悊琛ㄩ噷闈㈡槸鍚︽湁瀵瑰簲杩欎釜鍔犲瘑瀛楃涓插搴旂殑璁板綍
+            //DataSet DSet = oCn1.RunProcReturn("select Czybm,Czmm from Gy_Czygl where   HICNumber  ='" + HPassWord + "'", "Gy_Czygl");
+            //if (DSet == null || DSet.Tables[0].Rows.Count == 0)
+            ////if (DSet == null|| DSet.Tables[0].Rows.Count == 0)
+            //{
+            //    MessageBox.Show("娌℃湁鎵惧埌瀵瑰簲鑱屽憳淇℃伅锛岃閲嶆柊鍒峰崱" + DBUtility.ClsPub.sExeReturnInfo);
+            //    //textBox1.Text = "";
+            //    return;
+            //}
+            //else
+            //{
+            //    cmbUser.Text = ClsPub.isStrNull(DSet.Tables[0].Rows[0]["Czybm"]);
+
+            //    if (AllowLogin() != true)
+            //        return;
+            //    DataSet ds = null;
+            //    ClsCNmaster oCn = new ClsCNmaster();
+            //    ClsCN oCnLoc = new ClsCN();
+            //    string sDataBase;
+            //    string sDataBase_K3 = "";
+            //    string sDataBase_K32 = "";
+            //    string sDataBase_K33 = "";
+            //    sDataBase = oCn.GetDataBase(cmbAccount.Text.Trim(), ref sDataBase_K3);
+            //    ClsIni oIni = new ClsIni();
+            //    ClsIni.WriteIni("Erp", "DataBase", sDataBase.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+            //    ClsIni.WriteIni("K3Erp", "DataBase", sDataBase_K3.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+            //    DAL.ClsUser oUser = new DAL.ClsUser();
+
+            //    ds = oUser.CheckCzymc(cmbUser.Text.Trim(),textBox1.Text.Trim());
+            //    if (ds == null)
+            //    {
+            //        MessageBox.Show("閫夋嫨鐨勫笎濂椾笉瀛樺湪锛�", "鎻愮ず");
+            //        return;
+            //    }
+            //    if (ds.Tables[0].Rows.Count > 0)
+            //    {
+            //        ClsPub.CurUserID = ds.Tables[0].Rows[0]["Czybm"].ToString();
+            //        this.Close();
+            //        isOk = true;
+            //    }
+            //    else
+            //    {
+            //        MessageBox.Show("閿欒鐨勭敤鎴峰瘑鐮侊紒", "鎻愮ず", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            //        return;
+            //    }
+            //    //寰楀埌褰撳墠浼氳鏈熼棿
+            //    int sYear = 0;
+            //    int sPeriod = 0;
+            //    if (!ClsPub.Sub_GetCurPeriod(ref sYear, ref sPeriod))
+            //    {
+            //        MessageBox.Show("寰楀埌褰撳墠浼氳鏈熼棿澶辫触锛�", "鎻愮ず", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            //        isOk = false;
+            //        return;
+            //    }
+            //    //
+            //    this.Close();
+            //    isOk = true;
+            //    ClsIni.WriteIni("Erp", "DataBaseNumber", cmbAccount.Text.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+            //    //瀛樺叆鐢ㄦ埛鍚嶅瘑鐮�
+            //    //
+            //    UserName = cmbUser.Text.Trim() + "," + UserName;
+            //    string[] str = UserName.Split(',');
+            //    List<string> listStr = new List<string>();
+            //    foreach (string eachStr in str)
+            //    {
+            //        if (!listStr.Contains(eachStr))
+            //            listStr.Add(eachStr);
+            //    }
+            //    UserName = "";
+            //    if (listStr.Count > 10)
+            //    {
+            //        listStr.RemoveAt(10);
+            //    }
+            //    foreach (string eachStr in listStr)
+            //    {
+            //        UserName = UserName + eachStr + ",";
+            //    }
+            //    UserName = UserName.Remove(UserName.LastIndexOf(","), 1);
+            //    //
+            //    ClsIni.WriteIni("UserInfo", "UserName", UserName, DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+            //    ClsIni.WriteIni("UserInfo", "HOrgName", cmbHOrg.Text.ToString(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+            //    ClsPub.CurUserName = cmbUser.Text.Trim();
+            //    ClsPub.AppPath = System.Environment.CurrentDirectory;
+            //    ClsPub.HOrgID = ClsPub.get_ORGANIZATIONSIDByName(ClsPub.isStrNull(cmbHOrg.Text));
+            //    ClsPub.HOrgNumber = ClsPub.get_ORGANIZATIONSNOByName(ClsPub.isStrNull(cmbHOrg.Text));
+            //    ClsPub.HOrgName = ClsPub.isStrNull(cmbHOrg.Text);
+            //    if (chkRemember.Checked == true)
+            //    {
+            //        ClsIni.WriteIni("UserInfo", "UserPsd", "", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+            //        ClsIni.WriteIni("UserInfo", "Remember", "1", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+            //    }
+            //    else
+            //    {
+            //        ClsIni.WriteIni("UserInfo", "UserPsd", "", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+            //        ClsIni.WriteIni("UserInfo", "Remember", "0", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+            //    }
+            //}
+
+        }
     }
 }
\ No newline at end of file
diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.designer.cs" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.designer.cs"
index 89a77c8..cb36c14 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.designer.cs"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.designer.cs"
@@ -50,6 +50,8 @@
             this.cmbUser = new System.Windows.Forms.ComboBox();
             this.cmbHOrg = new System.Windows.Forms.ComboBox();
             this.label5 = new System.Windows.Forms.Label();
+            this.button1 = new System.Windows.Forms.Button();
+            this.textBox1 = new System.Windows.Forms.TextBox();
             this.SuspendLayout();
             // 
             // label1
@@ -65,7 +67,7 @@
             // txtUser
             // 
             this.txtUser.ImeMode = System.Windows.Forms.ImeMode.On;
-            this.txtUser.Location = new System.Drawing.Point(77, 127);
+            this.txtUser.Location = new System.Drawing.Point(78, 149);
             this.txtUser.Name = "txtUser";
             this.txtUser.Size = new System.Drawing.Size(167, 21);
             this.txtUser.TabIndex = 1;
@@ -244,12 +246,33 @@
             this.label5.TabIndex = 17;
             this.label5.Text = "缁�    缁�:";
             // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(269, 339);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(81, 25);
+            this.button1.TabIndex = 19;
+            this.button1.Text = "鍒峰崱鐧婚檰";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // textBox1
+            // 
+            this.textBox1.ImeMode = System.Windows.Forms.ImeMode.On;
+            this.textBox1.Location = new System.Drawing.Point(347, 149);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(167, 21);
+            this.textBox1.TabIndex = 20;
+            this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
+            // 
             // FrmLogin
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
             this.ClientSize = new System.Drawing.Size(613, 401);
+            this.Controls.Add(this.textBox1);
+            this.Controls.Add(this.button1);
             this.Controls.Add(this.cmbHOrg);
             this.Controls.Add(this.label5);
             this.Controls.Add(this.cmbUser);
@@ -304,6 +327,8 @@
         private System.Windows.Forms.ComboBox cmbUser;
         private System.Windows.Forms.ComboBox cmbHOrg;
         private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.TextBox textBox1;
     }
 }
 
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsUser.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsUser.cs"
index ad8ed86..c41b316 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsUser.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsUser.cs"
@@ -40,6 +40,13 @@
             };
             return oCn.RunProcReturn("select * from Gy_Czygl where Czymc='" + sUser + "' and Czmm='" + sPsd + "' ", prams, "Gy_Czygl");
         }
+        public DataSet CheckCzymc_AB(string sUser, string sPsd)
+        {
+            SqlParameter[] prams ={oCn.MakeInParam("@Czymc",SqlDbType.VarChar,100,sUser ),
+                                    oCn.MakeInParam("@Czmm",SqlDbType.VarChar ,100,sPsd ),
+            };
+            return oCn.RunProcReturn("select * from Gy_Czygl where Czymc='" + sUser + "' and HICNumber='" + sPsd + "' ", prams, "Gy_Czygl");
+        }
         public DataSet GetUserByMainID(string MainID)
         {
             SqlParameter[] prams={oCn.MakeInParam("@MainID",SqlDbType.VarChar,30,MainID)
diff --git a/LMES/Frm_Show.cs b/LMES/Frm_Show.cs
index 1a96718..e94a1ee 100644
--- a/LMES/Frm_Show.cs
+++ b/LMES/Frm_Show.cs
@@ -469,9 +469,11 @@
             SetTool(sup);
         }
 
-      
-
-       
-
+        private void pBarCodeEdit_Click(object sender, EventArgs e)
+        {
+            WarM.Sc_ICMOToBarCode oSc_ICMOToBarCode = new WarM.Sc_ICMOToBarCode();
+            oSc_ICMOToBarCode.ModCaption = "鏉$爜蹇�熺敓鎴�";
+            oSc_ICMOToBarCode.ShowDialog();
+        }
     }
 }
\ No newline at end of file
diff --git a/LMES/Frm_Show.designer.cs b/LMES/Frm_Show.designer.cs
index e9a71c0..37b012f 100644
--- a/LMES/Frm_Show.designer.cs
+++ b/LMES/Frm_Show.designer.cs
@@ -92,13 +92,15 @@
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.panel2 = new System.Windows.Forms.Panel();
             this.panel3 = new System.Windows.Forms.Panel();
-            this.panel10 = new System.Windows.Forms.Panel();
-            this.lblUserName = new System.Windows.Forms.Label();
-            this.pictureBox3 = new System.Windows.Forms.PictureBox();
-            this.lblAccountName = new System.Windows.Forms.Label();
-            this.pictureBox4 = new System.Windows.Forms.PictureBox();
             this.lblDate = new System.Windows.Forms.Label();
+            this.panel10 = new System.Windows.Forms.Panel();
+            this.pictureBox4 = new System.Windows.Forms.PictureBox();
+            this.lblAccountName = new System.Windows.Forms.Label();
+            this.pictureBox3 = new System.Windows.Forms.PictureBox();
+            this.lblUserName = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.label9 = new System.Windows.Forms.Label();
+            this.pBarCodeEdit = new System.Windows.Forms.PictureBox();
             this.panel4.SuspendLayout();
             this.toolStrip2.SuspendLayout();
             this.panel5.SuspendLayout();
@@ -119,9 +121,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
             this.panel3.SuspendLayout();
             this.panel10.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pBarCodeEdit)).BeginInit();
             this.SuspendLayout();
             // 
             // panel4
@@ -129,10 +132,9 @@
             this.panel4.Controls.Add(this.toolStrip2);
             this.panel4.Controls.Add(this.panel5);
             this.panel4.Dock = System.Windows.Forms.DockStyle.Left;
-            this.panel4.Location = new System.Drawing.Point(0, 67);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4);
+            this.panel4.Location = new System.Drawing.Point(0, 54);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(248, 861);
+            this.panel4.Size = new System.Drawing.Size(186, 688);
             this.panel4.TabIndex = 10;
             // 
             // toolStrip2
@@ -168,10 +170,10 @@
             this.gy,
             this.xt});
             this.toolStrip2.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow;
-            this.toolStrip2.Location = new System.Drawing.Point(0, 30);
+            this.toolStrip2.Location = new System.Drawing.Point(0, 24);
             this.toolStrip2.Name = "toolStrip2";
             this.toolStrip2.ShowItemToolTips = false;
-            this.toolStrip2.Size = new System.Drawing.Size(248, 831);
+            this.toolStrip2.Size = new System.Drawing.Size(186, 664);
             this.toolStrip2.Stretch = true;
             this.toolStrip2.TabIndex = 9;
             this.toolStrip2.Text = "toolStrip2";
@@ -194,7 +196,7 @@
             // toolStripSeparator5
             // 
             this.toolStripSeparator5.Name = "toolStripSeparator5";
-            this.toolStripSeparator5.Size = new System.Drawing.Size(246, 6);
+            this.toolStripSeparator5.Size = new System.Drawing.Size(184, 6);
             this.toolStripSeparator5.Tag = "鍒嗗壊绾夸竴";
             // 
             // cg
@@ -247,7 +249,7 @@
             // toolStripSeparator7
             // 
             this.toolStripSeparator7.Name = "toolStripSeparator7";
-            this.toolStripSeparator7.Size = new System.Drawing.Size(246, 6);
+            this.toolStripSeparator7.Size = new System.Drawing.Size(184, 6);
             this.toolStripSeparator7.Tag = "鍒嗗壊绾夸簩";
             // 
             // sup
@@ -298,7 +300,7 @@
             // toolStripSeparator6
             // 
             this.toolStripSeparator6.Name = "toolStripSeparator6";
-            this.toolStripSeparator6.Size = new System.Drawing.Size(246, 6);
+            this.toolStripSeparator6.Size = new System.Drawing.Size(184, 6);
             this.toolStripSeparator6.Tag = "鍒嗗壊绾夸笁";
             // 
             // sc
@@ -334,7 +336,7 @@
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(246, 6);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(184, 6);
             this.toolStripSeparator3.Tag = "鍒嗗壊绾垮洓";
             // 
             // mj
@@ -371,7 +373,7 @@
             // 
             this.toolStripSeparator1.ForeColor = System.Drawing.SystemColors.ActiveBorder;
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(246, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(184, 6);
             this.toolStripSeparator1.Tag = "鍒嗗壊绾夸簲";
             // 
             // pz
@@ -392,7 +394,7 @@
             // toolStripSeparator4
             // 
             this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(246, 6);
+            this.toolStripSeparator4.Size = new System.Drawing.Size(184, 6);
             this.toolStripSeparator4.Tag = "鍒嗗壊绾垮叚";
             // 
             // tx
@@ -413,7 +415,7 @@
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(246, 6);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(184, 6);
             this.toolStripSeparator2.Tag = "鍒嗗壊绾夸竷";
             // 
             // gy
@@ -452,9 +454,8 @@
             this.panel5.Controls.Add(this.grdMod);
             this.panel5.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel5.Location = new System.Drawing.Point(0, 0);
-            this.panel5.Margin = new System.Windows.Forms.Padding(4);
             this.panel5.Name = "panel5";
-            this.panel5.Size = new System.Drawing.Size(248, 30);
+            this.panel5.Size = new System.Drawing.Size(186, 24);
             this.panel5.TabIndex = 0;
             // 
             // grdMod
@@ -473,7 +474,6 @@
             this.Column1});
             this.grdMod.Dock = System.Windows.Forms.DockStyle.Fill;
             this.grdMod.Location = new System.Drawing.Point(0, 0);
-            this.grdMod.Margin = new System.Windows.Forms.Padding(4);
             this.grdMod.MultiSelect = false;
             this.grdMod.Name = "grdMod";
             this.grdMod.RowHeadersVisible = false;
@@ -482,7 +482,7 @@
             this.grdMod.ShowCellToolTips = false;
             this.grdMod.ShowEditingIcon = false;
             this.grdMod.ShowRowErrors = false;
-            this.grdMod.Size = new System.Drawing.Size(248, 30);
+            this.grdMod.Size = new System.Drawing.Size(186, 24);
             this.grdMod.TabIndex = 0;
             this.grdMod.TabStop = false;
             // 
@@ -507,8 +507,7 @@
             // splitContainer1
             // 
             this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.Location = new System.Drawing.Point(248, 67);
-            this.splitContainer1.Margin = new System.Windows.Forms.Padding(4);
+            this.splitContainer1.Location = new System.Drawing.Point(186, 54);
             this.splitContainer1.Name = "splitContainer1";
             // 
             // splitContainer1.Panel1
@@ -520,9 +519,8 @@
             // 
             this.splitContainer1.Panel2.Controls.Add(this.grdSub);
             this.splitContainer1.Panel2.Controls.Add(this.panel8);
-            this.splitContainer1.Size = new System.Drawing.Size(1361, 861);
-            this.splitContainer1.SplitterDistance = 651;
-            this.splitContainer1.SplitterWidth = 5;
+            this.splitContainer1.Size = new System.Drawing.Size(1021, 688);
+            this.splitContainer1.SplitterDistance = 488;
             this.splitContainer1.TabIndex = 11;
             // 
             // grdList
@@ -547,7 +545,6 @@
             this.grdList.GridColor = System.Drawing.Color.White;
             this.grdList.ImeMode = System.Windows.Forms.ImeMode.On;
             this.grdList.Location = new System.Drawing.Point(0, 0);
-            this.grdList.Margin = new System.Windows.Forms.Padding(4);
             this.grdList.MultiSelect = false;
             this.grdList.Name = "grdList";
             this.grdList.ReadOnly = true;
@@ -557,7 +554,7 @@
             this.grdList.RowTemplate.Height = 23;
             this.grdList.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
             this.grdList.ShowCellToolTips = false;
-            this.grdList.Size = new System.Drawing.Size(651, 661);
+            this.grdList.Size = new System.Drawing.Size(488, 528);
             this.grdList.TabIndex = 0;
             this.grdList.TabStop = false;
             this.grdList.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdList_CellMouseClick);
@@ -617,13 +614,14 @@
             // 
             // panel6
             // 
+            this.panel6.Controls.Add(this.label9);
+            this.panel6.Controls.Add(this.pBarCodeEdit);
             this.panel6.Controls.Add(this.grdList1);
             this.panel6.Controls.Add(this.panel7);
             this.panel6.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel6.Location = new System.Drawing.Point(0, 661);
-            this.panel6.Margin = new System.Windows.Forms.Padding(4);
+            this.panel6.Location = new System.Drawing.Point(0, 528);
             this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(651, 200);
+            this.panel6.Size = new System.Drawing.Size(488, 160);
             this.panel6.TabIndex = 1;
             // 
             // grdList1
@@ -640,8 +638,7 @@
             this.grdList1.Cursor = System.Windows.Forms.Cursors.Hand;
             this.grdList1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.grdList1.GridColor = System.Drawing.Color.White;
-            this.grdList1.Location = new System.Drawing.Point(0, 28);
-            this.grdList1.Margin = new System.Windows.Forms.Padding(4);
+            this.grdList1.Location = new System.Drawing.Point(0, 23);
             this.grdList1.MultiSelect = false;
             this.grdList1.Name = "grdList1";
             this.grdList1.ReadOnly = true;
@@ -653,7 +650,7 @@
             this.grdList1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
             this.grdList1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.grdList1.ShowCellToolTips = false;
-            this.grdList1.Size = new System.Drawing.Size(651, 172);
+            this.grdList1.Size = new System.Drawing.Size(488, 137);
             this.grdList1.TabIndex = 2;
             this.grdList1.TabStop = false;
             this.grdList1.DoubleClick += new System.EventHandler(this.grdList1_DoubleClick);
@@ -668,19 +665,17 @@
             this.panel7.Controls.Add(this.lblMore);
             this.panel7.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel7.Location = new System.Drawing.Point(0, 0);
-            this.panel7.Margin = new System.Windows.Forms.Padding(4);
             this.panel7.Name = "panel7";
-            this.panel7.Size = new System.Drawing.Size(651, 28);
+            this.panel7.Size = new System.Drawing.Size(488, 23);
             this.panel7.TabIndex = 0;
             // 
             // label1
             // 
             this.label1.Dock = System.Windows.Forms.DockStyle.Left;
             this.label1.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(28, 0);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(21, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(93, 26);
+            this.label1.Size = new System.Drawing.Size(70, 21);
             this.label1.TabIndex = 3;
             this.label1.Text = "娑堟伅閫氱煡";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -690,9 +685,8 @@
             this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Left;
             this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
             this.pictureBox1.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(28, 26);
+            this.pictureBox1.Size = new System.Drawing.Size(21, 21);
             this.pictureBox1.TabIndex = 5;
             this.pictureBox1.TabStop = false;
             // 
@@ -700,10 +694,9 @@
             // 
             this.lblMore.Dock = System.Windows.Forms.DockStyle.Right;
             this.lblMore.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblMore.Location = new System.Drawing.Point(525, 0);
-            this.lblMore.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblMore.Location = new System.Drawing.Point(393, 0);
             this.lblMore.Name = "lblMore";
-            this.lblMore.Size = new System.Drawing.Size(124, 26);
+            this.lblMore.Size = new System.Drawing.Size(93, 21);
             this.lblMore.TabIndex = 4;
             this.lblMore.Text = "鏌ョ湅鏇村...";
             this.lblMore.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -731,7 +724,6 @@
             this.grdSub.GridColor = System.Drawing.Color.White;
             this.grdSub.ImeMode = System.Windows.Forms.ImeMode.On;
             this.grdSub.Location = new System.Drawing.Point(0, 0);
-            this.grdSub.Margin = new System.Windows.Forms.Padding(4);
             this.grdSub.MultiSelect = false;
             this.grdSub.Name = "grdSub";
             this.grdSub.ReadOnly = true;
@@ -740,7 +732,7 @@
             this.grdSub.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
             this.grdSub.RowTemplate.Height = 23;
             this.grdSub.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.grdSub.Size = new System.Drawing.Size(705, 661);
+            this.grdSub.Size = new System.Drawing.Size(529, 528);
             this.grdSub.TabIndex = 1;
             this.grdSub.TabStop = false;
             this.grdSub.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellDoubleClick);
@@ -816,10 +808,9 @@
             this.panel8.Controls.Add(this.grdList2);
             this.panel8.Controls.Add(this.panel9);
             this.panel8.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel8.Location = new System.Drawing.Point(0, 661);
-            this.panel8.Margin = new System.Windows.Forms.Padding(4);
+            this.panel8.Location = new System.Drawing.Point(0, 528);
             this.panel8.Name = "panel8";
-            this.panel8.Size = new System.Drawing.Size(705, 200);
+            this.panel8.Size = new System.Drawing.Size(529, 160);
             this.panel8.TabIndex = 2;
             // 
             // grdList2
@@ -836,8 +827,7 @@
             this.grdList2.Cursor = System.Windows.Forms.Cursors.Hand;
             this.grdList2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.grdList2.GridColor = System.Drawing.Color.White;
-            this.grdList2.Location = new System.Drawing.Point(0, 28);
-            this.grdList2.Margin = new System.Windows.Forms.Padding(4);
+            this.grdList2.Location = new System.Drawing.Point(0, 23);
             this.grdList2.MultiSelect = false;
             this.grdList2.Name = "grdList2";
             this.grdList2.ReadOnly = true;
@@ -849,7 +839,7 @@
             this.grdList2.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
             this.grdList2.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.grdList2.ShowCellToolTips = false;
-            this.grdList2.Size = new System.Drawing.Size(705, 172);
+            this.grdList2.Size = new System.Drawing.Size(529, 137);
             this.grdList2.TabIndex = 3;
             this.grdList2.TabStop = false;
             this.grdList2.DoubleClick += new System.EventHandler(this.grdList2_DoubleClick);
@@ -863,19 +853,17 @@
             this.panel9.Controls.Add(this.lblMore2);
             this.panel9.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel9.Location = new System.Drawing.Point(0, 0);
-            this.panel9.Margin = new System.Windows.Forms.Padding(4);
             this.panel9.Name = "panel9";
-            this.panel9.Size = new System.Drawing.Size(705, 28);
+            this.panel9.Size = new System.Drawing.Size(529, 23);
             this.panel9.TabIndex = 1;
             // 
             // label2
             // 
             this.label2.Dock = System.Windows.Forms.DockStyle.Left;
             this.label2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(28, 0);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(21, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(100, 26);
+            this.label2.Size = new System.Drawing.Size(75, 21);
             this.label2.TabIndex = 4;
             this.label2.Text = "宸ヤ綔鑱旂郴鍗�";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -885,9 +873,8 @@
             this.pictureBox2.Dock = System.Windows.Forms.DockStyle.Left;
             this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
             this.pictureBox2.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox2.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(28, 26);
+            this.pictureBox2.Size = new System.Drawing.Size(21, 21);
             this.pictureBox2.TabIndex = 6;
             this.pictureBox2.TabStop = false;
             // 
@@ -895,10 +882,9 @@
             // 
             this.lblMore2.Dock = System.Windows.Forms.DockStyle.Right;
             this.lblMore2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblMore2.Location = new System.Drawing.Point(584, 0);
-            this.lblMore2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblMore2.Location = new System.Drawing.Point(438, 0);
             this.lblMore2.Name = "lblMore2";
-            this.lblMore2.Size = new System.Drawing.Size(119, 26);
+            this.lblMore2.Size = new System.Drawing.Size(89, 21);
             this.lblMore2.TabIndex = 5;
             this.lblMore2.Text = "鏌ョ湅鏇村...";
             this.lblMore2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -915,10 +901,9 @@
             this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.panel2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel2.Location = new System.Drawing.Point(0, -16);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4);
+            this.panel2.Location = new System.Drawing.Point(0, -12);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1609, 83);
+            this.panel2.Size = new System.Drawing.Size(1207, 66);
             this.panel2.TabIndex = 5;
             // 
             // panel3
@@ -929,10 +914,18 @@
             this.panel3.Controls.Add(this.panel10);
             this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel3.Location = new System.Drawing.Point(0, 0);
-            this.panel3.Margin = new System.Windows.Forms.Padding(4);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(1609, 73);
+            this.panel3.Size = new System.Drawing.Size(1207, 58);
             this.panel3.TabIndex = 6;
+            // 
+            // lblDate
+            // 
+            this.lblDate.BackColor = System.Drawing.Color.Transparent;
+            this.lblDate.Location = new System.Drawing.Point(769, 7);
+            this.lblDate.Name = "lblDate";
+            this.lblDate.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
+            this.lblDate.Size = new System.Drawing.Size(167, 23);
+            this.lblDate.TabIndex = 9;
             // 
             // panel10
             // 
@@ -942,64 +935,49 @@
             this.panel10.Controls.Add(this.pictureBox3);
             this.panel10.Controls.Add(this.lblUserName);
             this.panel10.Dock = System.Windows.Forms.DockStyle.Right;
-            this.panel10.Location = new System.Drawing.Point(1256, 0);
-            this.panel10.Margin = new System.Windows.Forms.Padding(4);
+            this.panel10.Location = new System.Drawing.Point(942, 0);
             this.panel10.Name = "panel10";
-            this.panel10.Size = new System.Drawing.Size(353, 73);
+            this.panel10.Size = new System.Drawing.Size(265, 58);
             this.panel10.TabIndex = 8;
-            // 
-            // lblUserName
-            // 
-            this.lblUserName.AutoSize = true;
-            this.lblUserName.BackColor = System.Drawing.Color.Transparent;
-            this.lblUserName.Location = new System.Drawing.Point(36, 9);
-            this.lblUserName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.lblUserName.Name = "lblUserName";
-            this.lblUserName.Size = new System.Drawing.Size(52, 15);
-            this.lblUserName.TabIndex = 7;
-            this.lblUserName.Text = "鐢ㄦ埛锛�";
-            // 
-            // pictureBox3
-            // 
-            this.pictureBox3.BackColor = System.Drawing.Color.Transparent;
-            this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image")));
-            this.pictureBox3.Location = new System.Drawing.Point(7, 5);
-            this.pictureBox3.Margin = new System.Windows.Forms.Padding(4);
-            this.pictureBox3.Name = "pictureBox3";
-            this.pictureBox3.Size = new System.Drawing.Size(28, 26);
-            this.pictureBox3.TabIndex = 6;
-            this.pictureBox3.TabStop = false;
-            // 
-            // lblAccountName
-            // 
-            this.lblAccountName.BackColor = System.Drawing.Color.Transparent;
-            this.lblAccountName.Location = new System.Drawing.Point(36, 35);
-            this.lblAccountName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.lblAccountName.Name = "lblAccountName";
-            this.lblAccountName.Size = new System.Drawing.Size(313, 38);
-            this.lblAccountName.TabIndex = 9;
-            this.lblAccountName.Text = "浼佷笟锛�";
             // 
             // pictureBox4
             // 
             this.pictureBox4.BackColor = System.Drawing.Color.Transparent;
             this.pictureBox4.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox4.Image")));
-            this.pictureBox4.Location = new System.Drawing.Point(7, 31);
-            this.pictureBox4.Margin = new System.Windows.Forms.Padding(4);
+            this.pictureBox4.Location = new System.Drawing.Point(5, 25);
             this.pictureBox4.Name = "pictureBox4";
-            this.pictureBox4.Size = new System.Drawing.Size(28, 26);
+            this.pictureBox4.Size = new System.Drawing.Size(21, 21);
             this.pictureBox4.TabIndex = 8;
             this.pictureBox4.TabStop = false;
             // 
-            // lblDate
+            // lblAccountName
             // 
-            this.lblDate.BackColor = System.Drawing.Color.Transparent;
-            this.lblDate.Location = new System.Drawing.Point(1025, 9);
-            this.lblDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.lblDate.Name = "lblDate";
-            this.lblDate.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.lblDate.Size = new System.Drawing.Size(223, 29);
-            this.lblDate.TabIndex = 9;
+            this.lblAccountName.BackColor = System.Drawing.Color.Transparent;
+            this.lblAccountName.Location = new System.Drawing.Point(27, 28);
+            this.lblAccountName.Name = "lblAccountName";
+            this.lblAccountName.Size = new System.Drawing.Size(235, 30);
+            this.lblAccountName.TabIndex = 9;
+            this.lblAccountName.Text = "浼佷笟锛�";
+            // 
+            // pictureBox3
+            // 
+            this.pictureBox3.BackColor = System.Drawing.Color.Transparent;
+            this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image")));
+            this.pictureBox3.Location = new System.Drawing.Point(5, 4);
+            this.pictureBox3.Name = "pictureBox3";
+            this.pictureBox3.Size = new System.Drawing.Size(21, 21);
+            this.pictureBox3.TabIndex = 6;
+            this.pictureBox3.TabStop = false;
+            // 
+            // lblUserName
+            // 
+            this.lblUserName.AutoSize = true;
+            this.lblUserName.BackColor = System.Drawing.Color.Transparent;
+            this.lblUserName.Location = new System.Drawing.Point(27, 7);
+            this.lblUserName.Name = "lblUserName";
+            this.lblUserName.Size = new System.Drawing.Size(41, 12);
+            this.lblUserName.TabIndex = 7;
+            this.lblUserName.Text = "鐢ㄦ埛锛�";
             // 
             // panel1
             // 
@@ -1008,20 +986,44 @@
             this.panel1.Controls.Add(this.panel2);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Margin = new System.Windows.Forms.Padding(4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1609, 67);
+            this.panel1.Size = new System.Drawing.Size(1207, 54);
             this.panel1.TabIndex = 4;
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.BackColor = System.Drawing.Color.Transparent;
+            this.label9.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label9.ForeColor = System.Drawing.Color.Navy;
+            this.label9.Location = new System.Drawing.Point(6, 140);
+            this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(110, 16);
+            this.label9.TabIndex = 10;
+            this.label9.Text = "鏉$爜蹇�熺敓鎴�";
+            // 
+            // pBarCodeEdit
+            // 
+            this.pBarCodeEdit.BackColor = System.Drawing.Color.Transparent;
+            this.pBarCodeEdit.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pBarCodeEdit.BackgroundImage")));
+            this.pBarCodeEdit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.pBarCodeEdit.Location = new System.Drawing.Point(16, 44);
+            this.pBarCodeEdit.Margin = new System.Windows.Forms.Padding(2);
+            this.pBarCodeEdit.Name = "pBarCodeEdit";
+            this.pBarCodeEdit.Size = new System.Drawing.Size(86, 92);
+            this.pBarCodeEdit.TabIndex = 9;
+            this.pBarCodeEdit.TabStop = false;
+            this.pBarCodeEdit.Click += new System.EventHandler(this.pBarCodeEdit_Click);
             // 
             // Frm_Show
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1609, 928);
+            this.ClientSize = new System.Drawing.Size(1207, 742);
             this.Controls.Add(this.splitContainer1);
             this.Controls.Add(this.panel4);
             this.Controls.Add(this.panel1);
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Frm_Show";
             this.Text = "NETERP";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -1038,6 +1040,7 @@
             this.splitContainer1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit();
             this.panel6.ResumeLayout(false);
+            this.panel6.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.grdList1)).EndInit();
             this.panel7.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
@@ -1049,9 +1052,10 @@
             this.panel3.ResumeLayout(false);
             this.panel10.ResumeLayout(false);
             this.panel10.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
             this.panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pBarCodeEdit)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1119,6 +1123,8 @@
         private System.Windows.Forms.PictureBox pictureBox3;
         private System.Windows.Forms.Label lblUserName;
         private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.PictureBox pBarCodeEdit;
     }
 }
 
diff --git a/LMES/Frm_Show.resx b/LMES/Frm_Show.resx
index 5406448..f550fe3 100644
--- a/LMES/Frm_Show.resx
+++ b/LMES/Frm_Show.resx
@@ -506,292 +506,326 @@
   <data name="oa.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <data name="cg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
-        ef0BSOnLUjX8nMgAAAAASUVORK5CYII=
+        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
+        ypM9hIngAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="xs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAQXSURBVEhLrVVrTFtlGD4xJproZiSObEsWUNFpXKYuXnAu
-        6aYTCRKBjOIw7kfnBAEvyECTieGHzghRgXWQcQiX7gcYKq0QbmEQpDKxXEsDWUc7y6VQ7gHhh3/e8/q+
-        H2WeHFsviV/y9n2enud7nu98p9+ptLy8vGtxcfHK0tKSiar2/6iVlZWr5HtR4kGgdG1tDdfX13FzcxO3
-        trZudy1W81Ca9Y0N3KCiEFxdXU2RaPUyARwZGYExpwNtvb3Y09MDP9lsyKXGah5M09v7o8Ar5MeedDdn
-        RQCnWS0W5VRSIrz1Zip89ukFhbsWq3koTd75HOXn/n4gc/T7/QaJPkRA17UuOP/hB3jhk48xNUUP3LVY
-        zUNpEuJfg8mbN5EW/mcAPQfs7OiAjHfO4Ufvv4eJJOKuxWoeShNz4ji4btzAhZ0An88nc9rlS5cUnU4H
-        r750At59+6zCXYvVPJTmzOk3FH4O834/krdBmp6elv0LC/iDxQr6xAQ8k3oaOYi7Fqt5KA3jMecYzs3N
-        4czMzHbA/Pw8mhu+g/iYV1Cf8LoQcddiNQ+lYTw6Ooqzs7PbAV6vV/ZR2sUvPld0Lx4FFsSfPCm2S4vV
-        PJTmePTzYoto4UjeBsnj8cicdrW2Bl44chhfPhaNumPRwF2L1TyU5rnDT4Dd/gtOTU0heRukyclJmUlB
-        QYHy1MEoOHrkSS4l0LVYzYNqDkVFijvw3LqF5G2QJiYm5F+9Xrxy2QiPHtiPTz/2CBcEuhareVDNw/vC
-        wUYn2u124/j4+HaA2+NBY/G3cCDsPjxIIVQQ6Fqs5kE1+3bfAz3dXehyubYDnE6n7KKT9/VXX0LY3Xdi
-        xJ4wLgh0LVbzoJpdd0hwrbMTaeFI3gZpeHhYdjgcaDZ/rzx76HF4aO8eiNofrlBx12I1/4smIjwMEmNj
-        xDPgnyqVQRoaGqqiEm9Bt9tDx3sB+WXFh49LjdU8qIbmsg/7cQ0ODp6TKCVF9QUODAxwMvJdce1M4O/t
-        drvg/f39otMr/raG+47PTtHuRIk/nZaWlvutVmtke3t7JOG92dnZ1zMyMjAuLg7S09OVkpISaGhoALoO
-        JpNJbEFVVZWi1+shNjYWsrKylLS0NKypqeH5EU1NTQ+2tbXdJcyDjfz8/LHc3FzMy8vDpKQkKC8vx/r6
-        eqRJYrV9fX3Y3d0NxcXFmJOTg8nJycDazMzMewMWfz8qKiqqi4qKkKuwsBCMRiPW1tYirU4E2Ojfy2w2
-        iwC6LnSlpaW/Bab/86CV7ibD32k7xAmvrq7mLYHKykpgLsuy6LQlwMGso8D4wPR/N2ilD1gslpHW1lbs
-        6OgQ28NVVlamcKfnIaqxsXGrubk5JjDtv4+6urpnyOQbMrlOxtMU5qNQB4Wb6FpyQBZiSNIf9Y0Q38OC
-        Y5UAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQXSURBVEhLrVVrTFtlGD4xJproZiSObEsWUNFpXKYuXnAu
+        KcYNRMloBCaL2Y9uEwS8IANNJobEW4So0JSQcbjvByxtKEK4NAzCqDAs10Ig62hnuZd7QPjhn/e8vu9H
+        mSfH1kvilzx9n6fn+d7nO9/pdyqtrKzsWVpaurK8vFxDqP4/sLq6epX6fiPxIGJcX1/HjY0N3Nrawu3t
+        7btVy9U6mGdjcxM3CRSCa2trZyRavUwEh4aGYHTMifbubuzq6oKf7XZkqLlaB/J0d98QfJX6cU+6m/Mi
+        gNOs9fXK2/p4ePdsMnzx+WWFq5ardTBPzqUspffmTaDm6PP5DBJ9iICO6x1w6eOP8PJnn2JyUiJw1XK1
+        DuY5/dabMHn7NtLC/wyg54DtNhukvXcRP/nwA4wnE1ctV+tgnlNROnDduoWLuwFzc3Myp5mMRkWn00H0
+        a1Hw/oXzClctV+tgnnPJ7yj8HBZ8PqTeBml6elr2LS7iT9YGSNLH47mzychBXLVcrYN5mI+OjeL8/DzO
+        zMzsBCwsLKDFfA3iok9hUvxpYeKq5WodzMN8ZGQEZ2dndwK8Xq88R2lff/Wlonv1OLAh7uRJsV1artbB
+        PFGRL4stooUj9TZIHo9H5rSr1VXwyrGj+PqJSNSdiASuWq7WwTwvHX0GHI5fcGpqCqm3QZqcnJRZ5OXl
+        Kc8djoDjx55lKP6q5Wod0HMkIlzcgefOHaTeBmliYkL+1evFK8UmePLQQXz+qScY4K9artYBPY8fCAU7
+        nWi3243j4+M7AW6PB02FP8KhkIfwMIUQwF+1XK0Deg7sfQC6OjvQ5XLtBIyNjckuOnnff/cthNx/L4bt
+        C2GAv2q5Wgf07LlHguvt7UgLR+ptkOglJzudTjSbLcqLR56Gx/bvg4iDoQqBq5ar9V88YaEhoH8jWjwD
+        /qkSDNLg4GAFQbwF3W4PHe9F5JcVHz6Gmqt1QA/N5T7cjzEwMHBRopQzqi+wv7+fk5HvirE7gb93OBxC
+        9/X1iTo8PHzXw3W3zy5odyLEn05zc/PDDQ0N4W1tbeHE92dmZvampaVhbGwspKamKkVFRWA2m4GuQ3V1
+        tdiC8vJyJTExEWJiYiAjI0NJSUnBqqoqnh/W2Nj4aGtr632ieaCRm5s7mp2djTk5OajX66GkpATr6uqQ
+        JonV9vT0YGdnJxQWFmJWVhYmJCQAe9PT0x/0t/j7UVpaWllQUICM/Px8MJlMSCtHWp0IsNO/l8ViEQF0
+        XfiMRuNv/un/PGile6nh7zU1NeKEV1ZWQkVFBZSVlQFrWZZFpS3hLUP2UWCcf/q/G7TSR6xW63BLSwva
+        bDaxPYzi4mKFKz0Pgfr6+u2mpqZo/7T/Pmpra1+gJj9Qk15qPE1hcxTqpPAaupbotwUZkvQHM4AQPWi8
+        3DoAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="kf.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <data name="sup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
-        LWuqk9NfJyfF16eZxM8AAAAASUVORK5CYII=
+        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
 </value>
   </data>
   <data name="jh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAXNSURBVEhLdVV5TJRHFAcTE23awBJEWKqI2iKNaWK09Yhk
-        a9LQxsZWbJSEmjT+0zQ90gQFtNHQFjlMBeRoS1XAIxymRS0krRzyscsuBvcCWViB5VAWWFjuRUDkfa/v
-        DbBolEl+eTPv+P1m3jez67HcGB8fT+rv778zNjJ2csH10piZmfm0r6+vnFC44Fp+5Evxq45rPn4nWgrf
-        8qvum6BnUzJOTEyg1dI6l208HsT+U7rwLbH39odGkz1Ze2ijY9h+f2LchdOTT7HUmnfgB+2+kNiaD0NT
-        DF+tX6CdH7kt36t+rNmPmY3HMN38Jf5U/wniLOL09DQ2N7fIP9Oa/c8jSX8Ibc4GfDo9ix0PO+CPxm8x
-        1XQU0xuOYYo+ChPUh0sW6D08Eg3vVaYY9mFEdTAckjbB1zness3SAWaTGR6YLfJHlQrhZ5zI3SSz/e6i
-        ryzpJGhqbIF2S4ecJKngYHUQxTfKkdJW+EX/PsbfUnkLgXPW9eoEYzCeNW0QiJK8wdreiaP9z1CSJDhj
-        ULhjZ6UNwPaotAbKrbn4xImo17ZCguFtTDCtF/EEUxAmm4PxePlaPyHwe/c6dVpLIDJSW5SYLimJ1Bfj
-        tEFE5AtpLQEUU4p4mhRIa7ZKSGjwxVhdEB6R1kKa1f+FePrDQDyl8V8jBC7aleqstgAiVkA2JcT/5yNf
-        oFNckLzE/DfpTfIrIUvyh/g7AXKWFCBsNtlsIo8v9xe+RT/bbJsS43ULJ/iTBNKsPlhmP4aOKSMWUT+r
-        +k9gtSMOb6lVYBrJwSpHDKZSTgYVZ7QGLNll5pntSkxcPEFmt1Kd3OSDFX1xWNx1GCXzP1DRF4tVfWcw
-        hU5S0RuLBZ0H8FzTGjxPBOebA5bsMnNutbtF59rWqU8bFRgpvQaM038p5CPSKjgiraa5N81Xk/914I/P
-        a2H/Zqsgn4LmiqU51X4h+cAZsxfGl78736KxoUn1YI8Lh3pdONz/BI11FhgbmMbxwRlsqLeCa3gWXcNz
-        ODkyhw8MbeAi26hvhQnnU8qZRdM9K4w6pnCEautrH4DTPoFO+yRqNP/On2BoaEjd09ODGrUGtFotQScb
-        DUZoa2uDjo4OmQBNTU2g1+vhfv19EWttbRV+W7uN34tcV1cH2lot1NbWymq1Gh4/fow6XcP8CRYFGPS7
-        gmazGej+Y0hICFIYfHx8MDU1FWVZRqPRCPQbhWFhYUAx9PLywry8PJicnMTe3l4kAWAeFtBoNEsnePTo
-        EdrtduRiflxcHBgYiKWlpbBnzx4Wwhs3biDvmueenp5QU1ODERERYhMGgwEHBgaQd/9KAXYwBgcHsays
-        TJBQG7C9vV0U8zomJgZv3rwpYizc3NyMFosFc3Nzgev4BEQKvNmXBLq7u4U6o76+3t13IpD9/PyYlPsL
-        0dHRMs9XrlwpLCM4OFhubGwEJqd6mTvAIjqdbv4bOJ1OdVdXl1Dl47HI1NQUVlZWiuMTkNvBIzw8XKxV
-        KhXwuqSkROTExcXhyMiIaC+T84bdJ3A4HOrOzk7kAIN3k5mZKdqyfft2QcSDf74zMjKEQH5+PszOzoqW
-        0hqioqJwdHRUCDA5b/gFAWqJCHIbcnJy3MePjIyUebd8ay5dugRWq1XEVqxYIRcXF8POnTs5T757966o
-        ra6uFi3iDbtbRDdHCDC4TZywY8cO3LVrF27btg0IGBoaisnJyeJ0/PH37t3LIrh582a8ffs2DA8Pi11z
-        rc1mE1xuAbr7FYtOBvUb6D8ZXS6XIOQ7zqDLIGL8VtjPLeMcInK35XkBun1eQoCKdnOAE/gb0Jpfo0w9
-        FODX+SosxjmXaxY/LvPQg8wX5AUFBW9dvXo168qVK1XU066ioqKBwsLCCfI/oZ5PJSYmznGvX4WkpKQ5
-        zuFcruFaQjet79ElSKMX/pYHXQ7Py5cvv0EOfxLZdO3ata0kuPv69ethZFWEz8j3+SIo73l7kPI+WMjd
-        TeutzMFczImInv8DAF698YJEu48AAAAASUVORK5CYII=
+        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
 </value>
   </data>
   <data name="Zp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        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
+        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
 </value>
   </data>
   <data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAU7SURBVEhLnVV7bJNVFK9EAzozWmAsvBSW6jYGuoAmArJF
-        Bf4QYvaHcWhMxEUTxcQQoxIi5oOoIyxB2Bi4sXXd260t7fpaW9b1bn2wuheu3RjLNtmrbB170BWmCPc7
-        nvvxyUM2h/6Sk+9+957zu+eee865krngiY9/ti4uTl0jl+8SpwSUlJSsLSgoSBN//x+8CQn7qlatgvzI
-        SChfvhxMS5fGsHmlUrmgsbExFAgEoLy8/KSg/F/glcsj62JjvaVLlgAnk/G5Mhkck0hAvX17gBDyuMFi
-        8VmtVujp6YHLly9DZWWlUzSdG974+BTT6tWglEohXyajXEQEnyGRUNMbh2hj9yDYrSV/+Ns7GSlfW1tL
-        cUPa2dkJarU6gKeJFmlmhyY6WvA6D70+MW8e5MrltMN3EXpGpuDK+W/BdeIT3k1MYDCaaX9/P/h8PmCb
-        tLa2gtFohLKysiUi1cwokskcpxcuhKMYknP79wNxuujoYDMM62PgqjEByZLprQuHBNKsrCxoa2sTxm63
-        GxoaGqC4uHiPSDUzDMuWPXUyKurm6fSjPDMsSf+KJyUSStRSSgyxVMdtwvlkqj/FCetMMjIyeKfTCVqt
-        Noyhe1Kkmh09fYGvPR47DFStB2JaR4fUC2GoMgKChngg+lg6ZntNOMmlZht4GhrhyJEjvNlsZuF5TqSY
-        G6NqiXYYiYlxHb1q2QKDFfPhinY5EMtmOlwVA6QmmU437AWnuwHO2WuhsLDwLdH00TGQ/fRNDbeGJ9ZX
-        KTGupaQygmq5DTzbRMM9zxNHMh31fg8KpfIb0eTRoSyt+sxuyAaimU+Dxhdh0r4LApooILo1dLJmJ54s
-        gQZNiRCuewemf9n3gWj2aMjLy9vS1dUFiiItf5R7kydVK6hwitpkWslJ8QSvUHP6+zzRRAuXHnbtAd73
-        +dw1wIA9ZllOTg5fXV0NLS0tQgoG9LGYouthonYXEFsSHdHLgW0Wqt8NAfViGDv3OoTdH3WIFP8Og8Fw
-        pb6+HkZGRkCj0YDmrJ5e/NUFY7poGLcmCdkTNCcCsSbRsOdTGLNsBqJdQSdwk9u+774QaWZGfn6+OxgM
-        Cl6zvO7t7WW5TZ3nL8Alx0EYN8YJnk9hSIg5kU463obfmw5gKm+gEy2ZMO3PMYtUD6O0tPRUKBRiXtPj
-        x4/fLaLs7Gxh7EAZqt4Oem6rUGjmH97Fu9iEOseoScHxk20FcMP3U7tI9yCw+tJYvG02G4gtmGLzutsG
-        PB4P1LvOg6Ysyx60vHBzomaHEKqpXh1M/WbBsYpe6yiCKb/ihkh5DwDwWHp6Oj8+Pg5NTU3Q3t4ukFos
-        FmhubhbGrM8UV6gGmH7Yuva9UOtBuH7VB9eH6iDcZ0WdKhruVgEMqEAg/Scwzosxa/r7+voEwr/DwsTl
-        cgE+MLeKiooWi+oSnh/dPT3SOBEe9kD1z4d559nDqF9I01J3wLZtG58R1R4Ghsru9/uFTbxeL7CLZg8L
-        Xv5LosoD4K+17g1Pea6X5XLMc4iULoKVK1cm3VmdBQqFIoO1XRZ3h8MBWBMfikuzQiaTfYny5yp8XuPi
-        4mauanYXubm5T3AcN+/MmTMfq1SqHvT8R6zqRdglY/B065nodDrhi9kWgw1uBRP2yKCdNDU19VRKSsoB
-        kfIe9Hq9HGN8AlPVhuLHR6MT4z6I4yDOX8NNppHg9v3C5nA9hCeewOofw8zrRqeaKyoqTPifiU7IRfo7
-        yMzMnI+kUuYRflfjJuvQKAH/NyJREhptvV9wns29zHSYLsoa0VaKsuAOq0TyFwzCybyk9OgUAAAAAElF
-        TkSuQmCC
+        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
+        SUVORK5CYII=
 </value>
   </data>
   <data name="cj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAALrSURBVEhLrVVbSNNhFB9I1ksREoQFPRT1EAQ+9FD0Zgn2
-        Zg9BFL5FQQT5EgQxNi8wkV3MyXAXck53V3Z1btPhFHIO2/LBQQPnwIfEh6ALFBT/nX7n79eoHsJdfvDj
-        2/985zuX75zvTPEvCoXCrY2NDUs2m3Xl8/knQtwcEFFLJpOxpVIpWlpakrm+vv61VCqdEyrNwdra2n12
-        sri4SPF4nJ1kxVbzsLq6eiOZTJLJZKqsrKz8FOLasbu721Yul4+Jzyp8Pl8LR7+wsECJRGJbiGtHOp2+
-        jSv4UiwWzwqRDMgeRaNRCofD7MArxLUDUT7gKHEllMvlulm2tbXVHYvFaHR0tGIwGCrz8/OEuryWD9QK
-        RNfBV2E0GivcNchIjjoUCskMBoPS7OwsMVGLd3DeKo4eHihmjKOMRCJssMq5uTmmhHqQ1+slp9PJ1/UZ
-        b+SSOHp4LC8vP8XhN3CUxfVosXb5/f5PbNztdkvMmZkZaWpqigKBAGd6VxytH3B0FFFvwjAxHQ4HTU5O
-        SjabTf5G5jqh2hjgxM6Rq1SqCtNisUi8TkxMEDotLdQaw/T09GMYJiYbxgOU0Bik1+vJ4/Hso35/tXld
-        QBZXEfmP8fFxGhsbk9DGpNPpSKPRkN1u567rEqr1AzU4iai3OXKtVksjIyM0PDwsDQwM8Lvhdn4pVBsD
-        jAdhuFoXOJDrwtmgpSNCrTHAwQuOnA0PDg4Ss7e3lx2Ry+XagaM2oVo/kMnN/v5+2TivMH4KWVxRKpXc
-        DA6h1hhQj3a1Wr3HNcGYuW42mzc5i6GhoTtCpTmA0TRnAmeckVuImwtE/RzsE58HfywYaO0oyGWs17B2
-        4uH0gPcEH4J9mEXP/iTLxJ6sh9feg1HSiRHSgf0LKPJpts1j4CL4CpsxbObAIn7vYd3H+tFqtX7D7++/
-        CVl15T3WwWzah+wD+B7fb8EYbGrB8yKPA7BHsBUHjmM0nOA2QyRn/kfWYV0mintEjroKheIXbFFYG8QR
-        pDEAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVEhLrVVdaJJhFBZGq5siRhAr6KKoiyDYRRdFd6vB
+        ulsXQdQuoyCCdhMEIf5soIhOc25sTtK5Ted0TKfT/ShTIacs1y42SJgbeNHYRdAPFBSfp+d8e5PqIubP
+        Aw+v73nPe37ec76j4l9sbW3dWltbs+dyOc/6+voTIW4MiKhpdXXVkUgkKB6Py8xms1+LxeI5odIYZDKZ
+        ++xkeXmZFhYW2ElOHDUO6XT6xtLSEg0ODpZTqdRPIa4epVKpZXd395jYVjA9Pd3E0cdiMVpcXNwW4uqR
+        TCZv4wm+FAqFs0IkA7JHkUiE5ubm2IFPiKsHonzAUeJJKJ/Pd7Jsc3OzMxqNktlsLvf395fn5+cJdXkt
+        X6gWiK6Nn8JqtZa5a5CRHHUoFJIZDAalQCBATNTiHZw3i6uHB4oZ5SjD4TAbrHBmZoYpoR7k8/locnKS
+        n+szvpFL4urhsbKy8hSX38BRDs9jxNrh9/s/sXGv1ysxJyYmpLGxMZqdneVM74qrtQOOjiLqDRgmptvt
+        JqfTKTkcDnmPzE1CtT7AiYsjV6lUZabdbpd4HR4eJnRaUqjVh/Hx8ccwTEw2PDQ0JA0MDBC6jKampvZR
+        v7/avCYgi6uI/IfNZuOukywWC5lMJtLpdORyubjrOoRq7UANTiLqbY7caDSSwWAgvV4vabVaYodo55dC
+        tT7AeBCGK3WBA7kunA1aOizU6gMcvODI2XBvby8xu7u72RF5PJ4dOGoRqrUDmdzUaDSycV5h/BSyuKJU
+        KrkZ3EKtPqAerWq1eo9rgjFzfWRkZIOz6OvruyNUGgMYTXImcMYZeYW4sUDUz8EesT34Y8FAa0VBLmO9
+        hrUdH04XeE/wIdiDWfTsT7JMnMl6+Nq7MEraMULacH4BRT7NtnkMXARf4TCKwzxYwO89rPtYP46Ojn7D
+        7++/CVll5TPWwWzah+wD+B77t2AUNo3geZHHAdgj2IwLxzEaTnCbIZIz/yPrsC4TxT0iR12BQvELEVVY
+        DHtUQ9kAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="mj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAXXSURBVEhLdVULTJNXFAYTE122QAkiLVPEx5DFLDG6+YiE
+        mRizSNym05iQZc5EF+e2LEEBXTS4oYKZgED3VMRHeJgFdZAs46E/rbY4KG15Vt4FWloo7yIgcv6zcy5Q
+        NMpNvpx7z+u759zzt17zreHh4QsOh+PfoYGhkzOqV9bExMTH3d3dRYScGdX8K0uKX3Rc+9G70dLOtT/r
+        jgU/H5NxZGQE7R2OKXXV8WDWn9LtXBtbvissmuTJh3tXOvttFSPDbhwffYYFlmu7v3+0PTS2bEdYkuGr
+        5TNpp1dmw3cRP5TtwvTqQ5hqOohn/4tEnEQcHx/Hri6b/COdWf8iLlTuxRaXGZ+NT6Kr2wW/VX+DycbP
+        MdV8CJMqozBBsz9/Jr2X13nD+yVJhu148EEIfCmtgqM5vnJvpwtaW1rB2top7y9RCD3jxF+rZJbf5vnL
+        2loJOtpt0NPpki9IEfDFg2Cyr5SPSOvgp8oPMP5uhK8guGhZrkmoCsFzxhUCRyVfsDS34aDjOUp6Cc4Y
+        FB7bOWkFsDwmLYEiSyY+dSE21jggwfAOJhiXC3uCMRgTTSF4vGhpgCD41bpMk9IQhIzkBhWmalWU1B/j
+        HgVTIn9IaVCSTSXsKdogOrNUQYLZH2N1wXhYWgoplsCX7KlPgvCUNnCJIPjTptJkNCkx9ZEC1PogiNf5
+        yZd1vnBZ7yP2v5S/TXoVZOgDIV6vlDP0SiHVJNXlS+FseaDQzepZqltUGK+bqeAPIkix+GGh7RA6x6ow
+        tzICSh0n8IEzDu+adoBx4HcsdcZgMvmk6ZSQ1qick/Ps05tVeH62gnSrSpNY64fF3XGY174fH7b+DcXd
+        sVjafQaT6D2K7bGY3bYbL9YuwUsaJVyqV87Jefbcak+LLjYt05yuUuAR6Q1gnC5SyIelRXBYWkx7X9ov
+        Jv2bwI/PZyGLWSpIp6C9Ym5PsV9LfnDG5IPxRe9Nt2iob1TT2+XGPrsb+x1PsbmuE4Z6xnG4dwLbLHZw
+        90+iu38KRwem0NrkBDfJ9kYHjLiekc8kttTbYdA5hgMUa6m2gss2gi7bKGq1/0xX0NfXp+nq6kKzyQw1
+        NTWEWrm5qRmcTie4XC6ZAB0dHdDY2AhPLE+EjX5GhL63p5e/F7murg5qqmugurpaNplM0NnZiTqdebqC
+        WQIG/a5ga2srSJKEoaGhSGbw8/PD5ORklGUZm5tFcgwPDweyoY+PD167dg1GR0fRbrcjEQDnYQKtVjtX
+        Ad0QbTYbcrBerxfBQUFBWFBQAFu3bmUivH37NvKtee/t7Q1lZWW4Z88ecQmDwYA9PT3It38tASsYvb29
+        WFhYKJJQSzhIBPM5JiYG79y5I2xMXF9fj9QazMzMBI7jCsxmM7fzVQKr1SrYGRaLxdN3cpQDAgI4KfcX
+        oqOjZd4vXLhQSEZISIjc3t4OnJziZbqQINHpdNNvQMk05CBYuTwmGRsbw5KSElE+AbkdvPbt2yfOkZGR
+        wOf8/HzhExcXhwMDA1hVVSWS84U9FdC0aNra2pANDL5Nenq6aMuGDRtEIl78852WliYIsrKyYHJyUrSU
+        zhAVFYWDg4PIt+fkfOGXCGhyhJHbkJOT4yn/wIEDckREBPDUXLlyBajPwrZgwQI5Ly8PNm3axH7y/fv3
+        RSzlkCsrK4Ev7GkRTY4gYHCbaERh48aNuHnzZly/fj0QMCwsDBMTE0V1/Pjbtm1jEly9ejXeu3cP+vv7
+        xa05eUtLi8jlIaDZL55VMoxGI9B/MrrdbpGQZ5xBwyBs/K2wnlvGPrW1tZ62PH782ENA1fgIAnrALRUV
+        FcAO/AaUhL9GmaZCgL/O12HWzr4cM/u4nIceO0skz87OXnPjxo2M69evl1JP23Nzc3voDUZI/5R6PpaR
+        kTHFvX4d1Gr1FPuwL8dwLMFK53IaghT6wtd40XB4X7169S1SBBLJqps3b64jwi23bt0KJxlB+IR0n82C
+        /F6Un5LfhzO+W+i8jnNwLs6JiN7/AyE1z6RzDsW/AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="sb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAQySURBVEhLrVVrTFtlGD4xJproZiSObEsWUNFpXKYuXnAu
-        qdkYWSIZMzpkPyYpm7RApx0XTSb+1AhRC9SQcRBo9wMc5SKEWxgE23KRW2kZZB0tlEuh3APCD/+83+v7
-        Hco8ObZeEr/k6fu8Pc/3Pu/5zvedI6yuru5bXl6+ubKyYiaY/g+sra3dorpfCXwQKdrY2MDNzU3c3t7G
-        nZ2dB1HJ5Xk4zebWFm4RyATX19eTBOpeJIILCwvgGnOizWrF7u5usNtsyCHn8jyUxmr9Bcfv3oU1qsdr
-        0t2kSgbcra+3l2VoNZB9XQ9ffnGD8ajk8jycJjc7i01NTwMVx0AgoBboRzLovNMJ2Z9+gjc+/wz113TA
-        o5LL83CatCupMHn/PlLjfxrQc8CO9nZI//gqXr+mQw2JeFRyeR5Oczn5Q3Dfu4dLewZ+v1/kbpbbt1nS
-        e4nw0aVk0F5JZTwquTwPpyEDNjQ4BIuBAFJttTA7OysGlpbw5/oGuHghES9fSsb3E88Dj0ouz8Npzp05
-        TZvFxTcNzs3N7RosLi6ipeYnSIg/ixcTz+O7Z+OARyWX5+E0KpUKRkdHcX5+ftfA5/OJfnL7sUxkqrdP
-        wmkSJMTFMR6VXJ6H07wT+yazW61AjSPVVgter1fkbrdMlfDWieN45lQsqk7FAo9KLs/Dad44/hIMDPyK
-        MzMzSLXVwuTkpMgTY6GBvXI0Bk6eeJmDBaOSy/OQmmMx0YwfPO/UFFJttTAxMSFO+3x48wcjPH/kML76
-        wnMcEIxKLs9Dap49FAk2OtEejwfHx8d3DTxeLxoN38ORiCfwKJkQIBiVXJ6H1Bza/xh0d3Wi2+3eNRgb
-        GxPddPK+/eZriHj0YYw6EMEBwajk8jykZt9DAtzp6EBqHKm2WhgZGRGdTnrJ2ezs9WMvwjMHD0DM4UhG
-        4FHJ5flfNFGREXDhXDxzulzSViWoheHh4XIC2u128Hi8dLyXkL+s+OHjkHN5HlJDc0ccDuD1OIaGhq4K
-        5JIk+wMHBwe5M/K74ujr65Mm8P8HBgakV3N/f78UHQ7HAw2Pe3X2QKsTI310mpubn2xoaIhua2uLJn5Q
-        r9f3pqeno1qtBo1GwwoLC6GmpgboOrS3t0vbkHRMp9NBSkoKZGZmsrS0NKysrOTzoxobG59ubW19RCoe
-        auTl5blycnIwNzcXtVotlJSUYHV1NdIkqfOenh7s6uoCg8GAWVlZSAbAtRkZGY8HS/z9KC0trSgoKECO
-        /Px8MBqNaDKZkLqTDGz09bJYLJIBXZd0RUVFvwWn//OgTvdTwd/NZjNS96yiogLKy8uhrKwMaLmYKIpQ
-        XFzMaEmAG3MdGSYEp/+7QZ0+VV9f72hpaUFad2l5OGpraxmP9Dwk1NXV7TQ1NcUHp/33UVVV9RoV+Y6K
-        9FLhWTLzk6mTzM107YOgLMwQhD8AKBQjLg6JEpAAAAAASUVORK5CYII=
+        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
+        c+dCtghDEP4E0NgiOdcYsQkAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="pz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAZpSURBVEhLlZR9TJvXFcY9tVq0aIUtiUmAABkfxl80nxDA
+        wE0TPpKAmkZNltAkrdRpUqMEJq1a1mptbgIhBEhNDMFgXDD+BhyDDcaBAH5pvimLmm1tWiVk/WObtj+m
+        taqyStN07tm54GqqVnXbkR6dx6/e+3vuOa9k1X+rn0aLs05OldSfmd/b1/ab58f3+xbGKnpivVuaho5v
+        5r6U+Gv/f9XPlVW0fLDvY/ODH2PL/QP4xtwePDVbiNsaIljeGcWD/gU8HLiP+zx33t96Ybwgfux/q1/d
+        rghZHhzG+sldyMYYnBjfiScnduHr08WYfzYMhQ1uLDjjgm3cgaaWK3hk5LfILk++Gz/+LYWq7/C71Yv8
+        dg2yMAM2waCelwvZlzRVDMWci5KWAJiom5p8UNTogc2nuajpm8Pynth8nPTN9dad3ffenNuNbJzBz65W
+        oJQEf+XlBKxlGna+E0J2cQRKW69gafMQmpr9kH/GiZXd17CscyoSx329Tt1gb/Lb1XgisgPZVQktx7qJ
+        cmRRBnXRcqwn/fxaITKzApWWCPUx2GUexefaRpG1BaG0JYAFZ91Y3fceFrSNHYtjl6vuYfaKpnuV+Dov
+        EizG4BQvE2ymDNgsg1/wHYJN03qklHyo5BcE67oKVbQidmkcpHZK/04IWNsIbCdfaZ/8Mo5ervMfbv9l
+        47wJT98sQn7LhM8pxfD2zWI8fb0Edygl8NYNE779ngnP3HoWWZcCz9tmkVmnodo6hXsuR5F1RKCyfQzL
+        STJErqq4Y+poHK9SmR8U3m+4uxnPL2zHcwuF2KQUQtP7hdgopWyHc/NF2EBqvmdAZlNgv30OmT0G+3pm
+        sIbEuq7B3q5JrOqcQGaJAGsdwSr7zWgcLwM2Ie/YIi4q2+CishV4x1bRRl2KW/JFKz2XMisaeJHbBHMo
+        1M8L1qcA61XgBbki2yyw7mnYS76CVGSdebIErw8nrW3/RI8WZRNYPtqMlo82YTv5Sx9uwiWRN/9uC7aT
+        Oh9mInMrUOteWOqHnHfwQP8tZP3LU+23xWjCGaimFVVYY7gUwG8kp3d8koO8N09YlY0gxXs3ii7qUty2
+        UXQoz4KFvF3ZAK9yi2BjChzhlwTz0gQuBQ7zVsEGyNNEL/JzgvXGoKpHwYMHh59SveFN/KF1cQPaFAPY
+        HuWh7ZGRvJG8EXs+NaKV/Lu38jBYq8eoOhcnU9TQcfAnyIYUeCm8iMcGP0DmW56q1j2PzKnAgf6buKf3
+        +vIEsno+TUPu0An7YyNKyYDuz4w4oBgwwgwQS9bjZLYOJ7Q6HMvNhfCPMjCUnAStR+vwldGPkYUUkEHH
+        vL9GOdUh1zzu7r/7lzheper+Y8qcbVGDvX8wYM/nBnRFDDCxW4/XU42oaPNg1mjEawYDRrVaDGu1MJqb
+        i4GcHBhOX4+DKeuwkTF4Zfz3eDT8CNkgTeO5hy9473vjeJWq76+pL3f+LRMdwzoImbTAk3ViRmMAxWiE
+        hrw8QQFAAUABwLVaQQHANRrhpxBPZibw1HWiPzUFGDsLL3OPODTyEA8HF3fG8cvlS1v7RXhNFo5rdHhV
+        r5dAnNHrUcKnyU+Sn9DpMEQhIzTBsEYD3pwcdGdnY39WFtg3bED7uiTsXLsWT55ofBzH/rvCq5P2DaWm
+        YpgOR3Q6oBCckiIv4XI94/GAIIGHsrPBR91JAQ4ZkJmJ1owMNP8gEbu+93R+HPv1CqjV9itp9MFpfBlC
+        Nwau0y15Cga5f56bKwJ0e56TI7wEpgDgWVnClpEBl9RqNCck8Djum2tw1arB4ZQUHKXbERDHCCp7SKNB
+        uRoJp92jj+ByPQ4ST08XltWr0bxyZXsc8+3lS0+v8z/zDAYoiGdniyDBr5Bo7zhIH9ZHUIKDg1ZiI7Bl
+        xQpoT06ujR//zxoeHn6K9P2RkZHV7mBwvdvtXu9pbi4bqKqadSQk/JMnJgq+Zo3gSUmCq9WCr1ol+MqV
+        4nJCwj+6a2oiAxcuFHi93hz/6GhaMBhMikajCcT77hJ8aGhITUCzy+WKeTyeB06n808ut/szj9f7d2cw
+        +Lk1GHzC6c/L+dprOFBbi44jR9Bx/DjKZ/ZQ6EuPz/eFm96l95/Q+T/T+cfU7xDTRb5kKURRlKflBHSL
+        NfL2DodD6/P5DPRiHv0udfv9pe5AYFlfefmcRJBt1PVSfr8/jc6uI1bi8gQq1b8AfSQechmF0bEAAAAA
+        SUVORK5CYII=
+</value>
+  </data>
+  <data name="tx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAZqSURBVEhLlZR7TJvnFcY9tWq0aIUtiUmAABkX4xvNFcL9
         TQmXJKCmUZMlNEkrdZrUKIFJq5a1WpuXhFJCSE0MwWBcML4Djo0NxoEA/mjulEbNtjatEtL+0U3bH9Na
         VVmlaTrv2XnB1VSt6rYjPTqPP33v73nP+SSr/lv9IlqcdWKqtLFpfk9/+++eGd/nXRir6o31bWkZPraZ
         e1Pir/3/1ThXXtX2wd6PTfd+hm139+Orc7vx5GwhbjsTwcquKB7wLeAh/13c67713taz4wXxY/9b/fZm
@@ -822,77 +856,43 @@
         AElFTkSuQmCC
 </value>
   </data>
-  <data name="tx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-        AAAASUVORK5CYII=
-</value>
-  </data>
   <data name="gy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAMxSURBVEhLjVU9SFtRFBahFDo4dG07GLt3a8cMQtuppZPg
-        0A6OBh3a2UBB4pJgFkFE8RdxcKiDRDP4GzFGE7WmMRqVqCGR/KgYRYrm9nw377zc9/oiXvg437n3nvPd
-        796QV/PQuL29/ZLP57sLhYL7IRSLRc/U1NRPrezxgwrjJCByuZwOztX5q6srMTk5KRobG2e10seNi4uL
-        39lsVjZjzM3N3Z+fn8uozvl8PtHS0iKam5uri9zd3f0gfAfoVG1UnOYGjIGBgRLi0NCQjOqc3W6/b29v
-        F62trTNay/JIJpMNl5eXgu7zP6DQnDc1NcmImrOzM8lxEFwV+M3NjSC80tpLARuKVctWnPOOjg6B00Yi
-        EcHXBSEWQ7y+vn6htS8L8Eagr69Pt69yYHh4uOT1eu8dDkcJIpjr7e3V9/T09JTS6TQEXmrtywL4NeBB
-        AWy04pzzVaEmk8lInkqlBMDc4CAej0sBs00zV3OOOC348fGxAJhTP6MAFwGwacXVXJ13u90693g8paOj
-        IwhUrggCsGq2aeZqzvHk5ETyRCIhAOYGB9vb27bT01O5CNAj6idSuZqr8y6XS+ddXV0lOjCEKw4gQA8t
-        YA3ARiuu5hwPDg4kj0ajAmBO72B0cHh4KC2qNs1czTnu7e1JvrW1JQDm5KIisLa2Ztvf38ekBDZZcTXn
-        GIvFJN/Y2BAAc1ozCuzu7spFoLOzU79Tlau5Ou90Og08GAzCTeUNlpaWbDs7O4KuSgIbrbiac8TfBTj1
-        EAD48vIy5isOILC5uSnC4bAENllxNecYCoXE/Py8bA4sLCzIaHDg9/tt6+vrsggwW2au5ogAfcn+BgKB
-        7OLiYg6g68kTUvT4T7X2ZYGVlRUBawAaWHE150h1Ia1N9TE9Pd3AFgEUmzmdzpBzXF1dDWttqg8SqCOb
-        AsCpOAJ8FVbAvlkaIyMjdRMTE8/pup7RX/cTrW15jI+PN9Dnz0v4RQjS5+9Pf39/cnBwMAMQL9AfW9EK
-        WOM9iCSUoO9FeHR0dIbQTfx1DZ2kFuqU1BPeEN6R0AeKH6ngE8Wv1UDr36jRZ+LY+35sbOwtcfSoR0+n
-        01n7DwYOBpB5U/UxAAAAAElFTkSuQmCC
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAM0SURBVEhLjVU9SFtRFBahFDo4dG07GLt3a0cHoe3U0klw
+        aAdHQx3a2UARXUxJhogKir9IBoc6iJrBfzFGo6ZaTYxK1JBI/hSjSNHcnu/mnZf7Xl/ECx/nO/fec777
+        3RvyKu4bNzc3nzKZjCubzTrvQz6f/zk+Pv5DK3v4oMIwCYh0Oq2Dc3X+8vJSjI2Nibq6ummt9GHj/Pz8
+        dyqVks0YMzMzd7lcTkZ1bnJyUjQ2NoqGhobyIre3t98J3wA61VcqTnADRm9vbwGxv79fRnWutrb2rrm5
+        WTQ1NU1pLYsjFovVXFxcCLrP/4BCc15fXy8jas7OziTHQXBV4NfX14LwQmsvBWwoVi1bcc5bWloETrux
+        sSH4uiDEYohXV1fPtPZFAd4I9PT06PZVDgwMDBTcbved3W4vQARzXV1d+h6Px1NIJBIQeK61Lwrg14AH
+        BbDRinPOV4WaZDIpeTweFwBzg4NwOCwFzDbNXM054rTgx8fHAmBO/YwCXATAphVXc3W+o6ND506ns3B0
+        dASB0hVBAFbNNs1czTmenJxIHo1GBcDc4CAUCtlOT0/lIuByufQTqVzN1fm2tjadt7e3F+jAEC45gAA9
+        tIA1AButuJpzPDg4kHxnZ0cAzOkdjA4ODw+lRdWmmas5x0gkIvnW1pYAmJOLksDq6qptf38fkxLYZMXV
+        nOPu7q7k6+vrAmBOa0aBvb09uQi0trbqd6pyNVfnHQ6Hgfv9frgpvcHCwoJte3tb0FVJYKMVV3OO+LsA
+        px4CAF9cXMR8yQEENjc3RTAYlMAmK67mHAOBgJidnZXNgbm5ORkNDnw+n21tbU0WAWbLzNUcEaAv2d+l
+        paXU/Px8GqDryRDi9PiPtfZFgeXlZQFrABpYcTXnSHUBrU35MTExUcMWARSbOZ3OkHNcWVkJam3KDxKo
+        IpsCwKk4AnwVVsC+aRpDQ0NVXq/3KV3Xk+7u7kda2+IYHR2tof94N+EXwd/X1/eHPoEx+iQmAeLZzs7O
+        vBWwxnsQSSg6ODgYHB4eniK4iL+soJNUQp2SasIrwhsSekfxPRV8oPi5HGj9CzX6SBx7346MjLwmjh7V
+        6OlwOCr/AX6RBkhyB4sjAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="xt.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAALiSURBVEhLrVVJaJNREC4UqxdFiiBV8KDoQRB68KB4ayzU
-        Wz0IoldREMFeBEFClhYaSlJiW0KSBrPvLUmbpUtSsoBtQk3toQEDjYUeLDkILqCg/I7f/H0N6kGa5YOP
-        lzdv3ixv5p90/ItyuXxzfX3dWiwWfRsbG4+FuD0gos61tTXbysoKpdNpmYVC4Wu1Wj0nVNqD1dXVe+wk
-        lUrR4uIiOymKo/Yhn8/fWF5eJpVK9SuXy/0U4saxu7vbvbOzc0xs6wiFQp0c/cLCAi0tLW0LcePIZrO3
-        8ARfKpXKWSGSAdnDeDxO8/Pz7CAoxI0DUd7nKPEkVCqVBli2tbU1kEwm5edhJhIJQl1eyRcaBaLr5adg
-        Q9w1yEiOem5uTmY0GpVmZmaIiVq8hfMucfXwQDGTHGUsFmODdc7OzjIl1IOCwSB5vV5+rs/4Ri6Jq4dH
-        JpN5gsuv4aiI59Fj7Q+Hw5/YuN/vl5gej0dyOp0UiUQ40zviavOAo6OIehOGielyuchut0s2m03eI3OD
-        UG0NcOLgyA+KbrVaJV7NZjOh07JCrTW43e5HMExMNmwymaTJyUkaHx+nQCBQQ/3+avOmgCyuIvIfU1NT
-        NDExIRmNRjIYDDQ6OkoOh4O7rl+oNg/U4CSi3ubI9Xo9jY2NkU6nk7RaLbFDtPMLodoaYDwKw/W6wIFc
-        F84GLR0Taq0BDp5z5Gx4eHiYmAqFgh2Rz+d7D0fdQrV5IBOFRqORjfMK46eQxRWlUsnN4BJqrQH16FGr
-        1XtcE4yZ6xaLZZOzGBkZuS1U2gMYzXImcMYZ+YW4vUDUz8Ahsd3/Y8FA60FBLmO9hrUPH84geFfwATiE
-        WfT0T7JMnMl6+NoHMUr6MEJ6cX4BRT7NtnkMXARf4jCJwxJYwe89rDWsH6enp7/h9/cDQlZf+Yx1MJtq
-        kH0A32H/BkzCph48L/LYB3sEu3DhOEbDCW4zRHLmf2Qd1mWiuEfkqOvo6PgNZZVW6YMdKH0AAAAASUVO
-        RK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALkSURBVEhLrVVdSJNhFB5I1k0REoQFXRR1EQRedFF0txLs
+        zi6CqNsoiCBvgiBk0wkT2cZyMvZH+3Vz6tjm9NO5iXOQbqyZFwoNtMEulF0E/UBB8XV6zufrqC7C/Tzw
+        8O4973nPz3vOd6b6F1tbW7cKhYIjn88H19fXnwhxa0BEbWtra66lpSVKp9MKc7nc152dnXNCpTVYXV29
+        z05SqRQtLCywk7w4ah2y2eyNxcVF0mg0v1ZWVn4Kcf2oVCod5XL5mNjWMDk52cbRz8/PUzKZ3Bbi+pHJ
+        ZG7jCb6USqWzQqQAskezs7M0MzPDDsJCXD8Q5QOOEk9CxWKxh2Wbm5s9kiQpz8Ocm5sj1OW1cqFeILou
+        fgo2xF2DjJSo4/G4wlgsJk9PTxMTtXgH5+3i6uGBYkocZSKRYIM1RiIRpox6UDgcpvHxcX6uz/hGLomr
+        h8fy8vJTXH4DR3k8jwFr99TU1Cc2HgqFZGYgEJC9Xi9Fo1HO9K642jjg6Cii3oBhYvp8PnK73bLL5VL2
+        yNwoVJsDnHg48oOiOxwOmVebzUbotIxQaw5+v/8xDBOTDVutVtlisZDJZKKJiYkq6vdXmzcEZHEVkf8Y
+        Gxuj0dFR2Ww2k9FoJL1eTx6Ph7uuW6g2DtTgJKLe5sgNBgONjIzQ8PCwPDg4SOwQ7fxSqDYHGI/BcK0u
+        cKDUhbNBSyeEWnOAgxccORvW6XTEVKvV7IiCweAHOOoQqo0DmdwcGBhQjPMK46eQxZX+/n5uBp9Qaw6o
+        R6dWq93jmmDMXLfb7RucxdDQ0B2h0hrAaIYzgTPOKCTErQWifg72ie3+HwsGWicKchnrNaxqfDi94D3B
+        h2AfZtGzP8kycabo4WvvxShRY4R04fwCinyabfMYuAi+wqGEwyJYwu89rFWsH51O5zf8/n5AyGorn7EO
+        ZlMVsl3wPfZvQQk2DeB5kcc+2CPYjgvHMRpOcJshkjP/I+uwLhPFPaJEXYNK9Rtdc1bmQKWJwgAAAABJ
+        RU5ErkJggg==
 </value>
   </data>
   <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -919,6 +919,185 @@
   <metadata name="NameCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <data name="pBarCodeEdit.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        IIuQjFJBkJgKNOjVI7OygpPKYOcBGSCLkIxSQZCYCjTonkIBKdLQxDL49QHvkQGyCMkoFQSJqUIDP8MZ
+        NidlGex8wHvJoEVINqkiSEwVGnwfIZez7dAEM/j1AM/hPTIIySZVBInpQBM4X/iBDFhoohn88oDX8Bze
+        h2SSDoLEdKBJgPvGjhnjsmChCWfwywEew2t4Du9DMkkHQWI6KFYA8KDwIxcfQxPP4OcD3sLjYl47vodk
+        kg6CxHTgJ1KMi4U8nBPerOHAJYOfD3hZ7PDlFfO4hOchmaSDIDEdxCdTjApCS2EDd/FIVPDaFCFL6OEy
+        +CngFTyDd/AQXhbzFN5uwe+QTNJBkJgOkhOK4XfC9cJnwkyBh+BhMtg+4BU8g3fwEF6GeByUSToIEtNB
+        aFIZ7DyEZJIOgsQMyg+CxAzKD4LEDMoPgsQMyg+CxAzKD4LEDMoPgsQMyg+CxAzKD4LEDMoPgsQMyg+C
+        xAzKD4LEDMoPgsQMygss+n+IU0j3qEewygAAAABJRU5ErkJggg==
+</value>
+  </data>
   <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -2322,26 +2501,6 @@
         gVrFLe+KHb4q7fFXb4pdvirWKtjFDWKW98Vdih2KtYpbxQ1ilsYoaxV2KtjFXYq//9k=
 </value>
   </data>
-  <data name="pictureBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGeYUxB9wAAACBjSFJNAAB6
-        JQAAgIMAAPn/AACA6AAAUggAARVYAAA6lwAAF2/XWh+QAAAACXBIWXMAAAsMAAALDAE/QCLIAAAC/klE
-        QVQ4T12Rf0yMcRzHv6Uf90OGUVv8Udr4xyJuUbGoTq3t3N0u8iNljIrUctsdRVfHXYUbGee6dkKdFfXg
-        ynUoNR2L/KhEP/45lEKLTX80U/f2PDdOT+/tvef54/V+7bPnIQDIv3B5vNhNMTGOjMzMaYVS6VTSFUsk
-        ozw+P5jhOFwuq67tTEFEVFRn1pEs5B8/BnWhCqe1xSgu1iI2TtjKcKvC1rDKEnh6EFKuPtA52FaDvhYz
-        +m1G6E/LkZK6F/QVnxkubK2AVZaA4+NJnlO68WmHHRO9NozZK2Epy4VQGIf4hISfDCcID2fVLYgOCyJb
-        1i0jT6sLf3x7ZsZwqwkDFh3sFXIYlMn0BVIHw8lkSay6BaKIYJK0cRlp0u3/9va2Bl01anRUKtGuP4yz
-        8lSnVCqNYLjtMinZJhOTXTuSScrulP+CpqJ4Yi0Ukka1+HVzWQaaL2TAWpqGhpI0aHMkHQzDNF1lJDml
-        VWR9dDwJDPD/L6AKtrpaXyAR1+aJnGZFImpV22HKFUKds/PXseoe5RF9qyfD5t/sIisEMa7v5hYcN9hc
-        VRhbsjWVTU6rXoG76mSUpa1G/skTKH/1G8V33g0dKrP5MfwKweZZghsvidz4ZLPyeuf0ucfjeHO/Apb8
-        RFzOS4Gp4yuoD0DjByfOUN2fGD5kVSRbsDIygWRfvN+nuvUe+vYf6H32EB0WE6jeL6ijx5aPAEX/h3uD
-        UxBnnhK5hjMFHJ7f8qwLDc6i+kFcaf+Ooc+jsI9MgaKHtwaB2gHA3AfU0e/pWvMI8fDwYgl8uXNF9AVQ
-        1Q3A0DaKbscYqt4DNf1A9TvgajdgfOWE6cUkFIZH096+vFB67+UW0FkSEhqpST9LTRjaRlD/dhLGLuBa
-        D2Cin5eeTqLEOgyd1QFFeTN8uPxw1gV/w+Hw5yVukOyjci49cGosDpyxjaKk8RMKanpw1NCCZPn5gZDQ
-        iKM0680MZgv+xcfblxM6f3GgbFFg0H66BxcELN3jt9Bf6Dlnjv9fxhUA5A837gwg2CeRIAAAAABJRU5E
-        rkJggg==
-</value>
-  </data>
   <data name="pictureBox4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
@@ -2401,6 +2560,26 @@
         S2thNNVhhODh7RiCeOlrLlUTuQ9A+AfMR9Fg1rougAAAAABJRU5ErkJggg==
 </value>
   </data>
+  <data name="pictureBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGeYUxB9wAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6AAAUggAARVYAAA6lwAAF2/XWh+QAAAACXBIWXMAAAsMAAALDAE/QCLIAAAC/klE
+        QVQ4T12Rf0yMcRzHv6Uf90OGUVv8Udr4xyJuUbGoTq3t3N0u8iNljIrUctsdRVfHXYUbGee6dkKdFfXg
+        ynUoNR2L/KhEP/45lEKLTX80U/f2PDdOT+/tvef54/V+7bPnIQDIv3B5vNhNMTGOjMzMaYVS6VTSFUsk
+        ozw+P5jhOFwuq67tTEFEVFRn1pEs5B8/BnWhCqe1xSgu1iI2TtjKcKvC1rDKEnh6EFKuPtA52FaDvhYz
+        +m1G6E/LkZK6F/QVnxkubK2AVZaA4+NJnlO68WmHHRO9NozZK2Epy4VQGIf4hISfDCcID2fVLYgOCyJb
+        1i0jT6sLf3x7ZsZwqwkDFh3sFXIYlMn0BVIHw8lkSay6BaKIYJK0cRlp0u3/9va2Bl01anRUKtGuP4yz
+        8lSnVCqNYLjtMinZJhOTXTuSScrulP+CpqJ4Yi0Ukka1+HVzWQaaL2TAWpqGhpI0aHMkHQzDNF1lJDml
+        VWR9dDwJDPD/L6AKtrpaXyAR1+aJnGZFImpV22HKFUKds/PXseoe5RF9qyfD5t/sIisEMa7v5hYcN9hc
+        VRhbsjWVTU6rXoG76mSUpa1G/skTKH/1G8V33g0dKrP5MfwKweZZghsvidz4ZLPyeuf0ucfjeHO/Apb8
+        RFzOS4Gp4yuoD0DjByfOUN2fGD5kVSRbsDIygWRfvN+nuvUe+vYf6H32EB0WE6jeL6ijx5aPAEX/h3uD
+        UxBnnhK5hjMFHJ7f8qwLDc6i+kFcaf+Ooc+jsI9MgaKHtwaB2gHA3AfU0e/pWvMI8fDwYgl8uXNF9AVQ
+        1Q3A0DaKbscYqt4DNf1A9TvgajdgfOWE6cUkFIZH096+vFB67+UW0FkSEhqpST9LTRjaRlD/dhLGLuBa
+        D2Cin5eeTqLEOgyd1QFFeTN8uPxw1gV/w+Hw5yVukOyjci49cGosDpyxjaKk8RMKanpw1NCCZPn5gZDQ
+        iKM0680MZgv+xcfblxM6f3GgbFFg0H66BxcELN3jt9Bf6Dlnjv9fxhUA5A837gwg2CeRIAAAAABJRU5E
+        rkJggg==
+</value>
+  </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>30</value>
   </metadata>
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index 34f1621..a2a7f5e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -225,8 +225,34 @@
             HUserName = ClsPub.isStrNull(DBUtility.ClsPub.CurUserName);
             Int64 HUserID = 0;
             HUserID = ClsPub.isInt(DBUtility.ClsPub.CurUserID);
-            txtHEmpID.Text = HUserName;
-            txtHEmpID.Tag = HUserID;
+
+            DataSet DSet;
+
+            DSet = oCn.RunProcReturn("Select * from gy_czygl Where czymc='" + HUserName + "'", "gy_czygl", ref DBUtility.ClsPub.sExeReturnInfo);
+            
+            if (DSet == null)
+            //if (DSet == null|| DSet.Tables[0].Rows.Count == 0)
+            {
+                MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
+                return;
+            }
+            else
+            {
+                grdMain.DataSource = DSet.Tables[0].DefaultView;
+                //鎶婂綋鍓嶅崟鎹甀D 瀛樺埌涓�涓寜閽噷闈�   鍒锋柊鏃舵瘡娆″瓨涓�閬�
+                if (DSet.Tables[0].Rows.Count > 0)
+                {
+
+
+                    txtHEmpID.Tag = DBUtility.ClsPub.isInt(DSet.Tables[0].Rows[0]["HEmpID"]);
+                }
+                else
+                {
+
+                }
+            }
+
+
         }
 
         private void grdMain_DblClick(object sender, EventArgs e)
@@ -1052,13 +1078,18 @@
                 {
                     if (HZXQty > DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value))
                     {
-                        HZXQty = HZXQty - DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
-                        grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+                        //HZXQty = HZXQty - DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+                        //grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+                        MessageBox.Show("璇风偣鍑昏秴棰濈敓浜ф寜閽敓鎴愭潯鐮侊紒");
+                        return;
                     }
                     else
                     {
-                        grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = HZXQty;
-                        break;
+                        //grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = HZXQty;
+                        //
+
+                        HZXQty = HZXQty - DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+                        grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
                     }
                 }
                 else
diff --git a/WebAPI/Controllers/EntrustOutController.cs b/WebAPI/Controllers/EntrustOutController.cs
index 9d29217..d4ee36e 100644
--- a/WebAPI/Controllers/EntrustOutController.cs
+++ b/WebAPI/Controllers/EntrustOutController.cs
@@ -465,6 +465,7 @@
                 websLsmain.HWHID = lsmain[0].HWHID;
                 websLsmain.HMainSourceBillType = "濮斿璁㈠崟-鎶曟枡";
                 websLsmain.HSupID = lsmain[0].HSupID;
+                websLsmain.HBillType = "1211";//鍥哄畾鍊�
 
                 if (webserver.set_SaveEntrustOutBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
                 {
diff --git a/WebAPI/Controllers/Kf_EntrustInBillController.cs b/WebAPI/Controllers/Kf_EntrustInBillController.cs
index 807dcc9..4df6b2d 100644
--- a/WebAPI/Controllers/Kf_EntrustInBillController.cs
+++ b/WebAPI/Controllers/Kf_EntrustInBillController.cs
@@ -480,6 +480,7 @@
                 websLsmain.HMangerID = lsmain[0].HMangerID;
                 websLsmain.HWHID = lsmain[0].HWHID;
                 websLsmain.HExplanation = lsmain[0].HExplanation;
+                websLsmain.HBillType = "1211";//鍥哄畾鍊�
 
                 string sSourceBillType = "1604";
 
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 7752ac4..506ae91 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -128,8 +128,10 @@
 
                 //WebS.WebService1 oWebs1 = new WebS.WebService1();
                 //WebSoBar = oWebs1.get_SourceBarCode_MateOut(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, sMaker, sPPQty, sPlanMode, sFIFOWHID, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
-                 Model.ClsKf_ICStockBill_WMS WebSoBar = new Model.ClsKf_ICStockBill_WMS();
-                 WebSoBar = get_SourceBarCode_MateOut(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, sMaker, sPPQty, sPlanMode, sFIFOWHID, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+                //Model.ClsKf_ICStockBill_WMS WebSoBar = new Model.ClsKf_ICStockBill_WMS();
+                WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                WebSoBar = oWebs.get_SourceBarCode_MateOut(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, sMaker, sPPQty, sPlanMode, sFIFOWHID, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
                 //oBar = webserver.get_CheckTypeByBarCode_Out(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
                 if (WebSoBar == null)
                 {
@@ -469,6 +471,7 @@
                 websLsmain.HEmpID = lsmain[0].HEmpID;
                 websLsmain.HRemark = lsmain[0].HRemark;
                 websLsmain.HMaker = lsmain[0].HMaker;
+                websLsmain.HBillType = "1204";//鍥哄畾鍊�
 
                 if (webserver.set_SaveMateOutBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
                 {
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index a347b73..a85280a 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -244,6 +244,43 @@
         }
 
         /// <summary>
+        /// 鐩存帴璋冩嫧鍗曟牎楠屾壂鎻忓崟鎹彿/鐩存帴璋冪敤webservice
+        /// </summary>
+        /// <returns></returns>
+        //[Route("OtherOutBill_Check_New/BillNo")]
+        [Route("MoveStockBill/BillNo2")]
+        [HttpGet]
+        public Object BillNo2(string HBillNo, string HBillType, string HMaker, Int64 HOwnerID)
+        {
+            //if (sRedBlue == true)
+            //{
+            //    HBillType = "1245";
+            //}
+            //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+            WebS.WebService1 oWebs = new WebS.WebService1();
+            WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+            string sExpressNumber = "";
+            //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+            WebSoBar = oWebs.get_BillBarCode_MoveStockCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
+            if (WebSoBar == null)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            else
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+                objJsonResult.data = WebSoBar;
+                return objJsonResult;
+            }
+        }
+
+        /// <summary>
         /// 鍏朵粬鍑哄簱鏍¢獙鎵弿鏉$爜/鐩存帴璋冪敤webservice
         /// </summary>
         /// <returns></returns>
@@ -256,6 +293,38 @@
             string sExpressNumber = "";
             //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
             WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sCode, sInterID, HBillType, sBillNo, sMaker,  WhID,  SPID,  sQty,  HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+            if (WebSoBar == null)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            else
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+                objJsonResult.data = WebSoBar;
+                return objJsonResult;
+            }
+        }
+
+
+        /// <summary>
+        /// 鐩存帴璋冩嫧鏍¢獙鎵弿鏉$爜/鐩存帴璋冪敤webservice
+        /// </summary>
+        /// <returns></returns>
+        [Route("MoveStockBill_Check_New/get_InfoByBarCode_Source_Json1")]
+        [HttpGet]
+        public Object get_InfoByBarCode_Source_Json1(string sCode, Int64 sInterID, string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 SCWhID, Int64 SCSPID, Int64 sQty, Int64 HOWNERID)
+        {
+            WebS.WebService1 oWebs = new WebS.WebService1();
+            WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+            string sExpressNumber = "";
+            //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+            WebSoBar = oWebs.get_BarCode_MoveStockBillCheck(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, SCWhID, SCSPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
             if (WebSoBar == null)
             {
                 objJsonResult.code = "0";
@@ -570,7 +639,17 @@
         {
             try
             {
-                ds = webserver.GetBarCode_Temp(HInterID, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sBillType, sWhere);
+
+                if (HMTONo == null)
+                {
+                    HMTONo = "";
+                }
+                if (HBatchNo == null)
+                {
+                    HBatchNo = "";
+                }
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                ds = oWebs.GetBarCode_Temp(HInterID, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sBillType, sWhere);
                 if (ds == null || ds.Tables[0].Rows.Count <= 0)
                 {
                     objJsonResult.code = "0";
@@ -599,6 +678,47 @@
                 return objJsonResult;
             }
         }
+
+
+
+        #region 鐐瑰嚮缂栬緫鎸夐挳杩斿洖鍙傛暟淇℃伅
+        /// <summary>
+        /// 鐐瑰嚮缂栬緫鎸夐挳杩斿洖鍙傛暟淇℃伅
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Kf_BarCodeEditDlg/Kf_BarCodeEditDlg_Json")]
+        [HttpGet]
+        public object Kf_BarCodeEditDlg_Json(string sWhere)
+        {
+            DataSet ds;
+            try
+            {
+
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+               
+                    string sql1 = "select * from KF_PonderationBillMain_Temp Where HQty<>0 ";
+                    string sql = sql1 + sWhere + " order by hinterid desc";
+                    ds = oCN.RunProcReturn(sql, "KF_PonderationBillMain_Temp");
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+                objJsonResult.data = ds.Tables[0];
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        #endregion
+
 
         //鐐瑰嚮缂栬緫  鍏敤绐椾綋鍒犻櫎鏂规硶
         [Route("Kf_BarCodeEditDlg/DeltetBill")]
@@ -1006,6 +1126,7 @@
                 websLsmain.HWHID = lsmain[0].HWHID;
                 websLsmain.HSupID = lsmain[0].HSupID;
                 websLsmain.HExplanation = lsmain[0].HExplanation;
+                websLsmain.HBillType = "1202";//鍥哄畾鍊�
 
 
                 if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
@@ -1139,6 +1260,69 @@
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
                     objJsonResult.Message = "鐢熶骇棰嗘枡鍗曟牎楠屾垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+
+        /// <summary>
+        /// 鐢熶骇璋冩嫧鏍¢獙
+        /// </summary>
+        /// <returns></returns>
+        [Route("MoveStockBill_Check_New/set_SaveMoveStockBill_Check_Json")]
+        [HttpPost]
+        public object set_SaveMoveStockBill_Check_Json([FromBody] JObject oMain)
+        {
+            var _value = oMain["oMain"].ToString();
+            string msg1 = _value.ToString();
+            //List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
+            //ListModels oListModels = new ListModels();
+            //lsmain = oListModels.getProductInBillMainByJson(msg1);
+            //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+            //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+            //string sSourceBillType = lsmain[0].HBillType;
+            //BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
+            //return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
+
+            try
+            {
+                List<Model.ClsKf_MoveStockBillMain> lsmain = new List<Model.ClsKf_MoveStockBillMain>();
+                ListModels oListModels = new ListModels();
+                lsmain = oListModels.getMoveStockBillMainByJson(msg1);
+                //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+                //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+                //string sSourceBillType = lsmain[0].HBillType;
+
+                WebAPI.WebS.ClsKf_MoveStockBillMain websLsmain = new WebS.ClsKf_MoveStockBillMain();
+
+                websLsmain.HInterID = lsmain[0].HInterID;
+                websLsmain.HBillNo = lsmain[0].HBillNo;
+                websLsmain.HBillType = "1207";
+
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                if (oWebs.set_SaveMoveStockBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鐩存帴璋冩嫧鍗曟牎楠屾垚鍔燂紒鍗曟嵁鍙蜂负锛�";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -1345,6 +1529,92 @@
         }
 
 
+        /// <summary>
+        /// 鏉$爜缂栬緫鐣岄潰 缂栬緫鎸夐挳鏂规硶
+        /// </summary>
+        /// <returns></returns>
+        [Route("Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill")]
+        [HttpGet]
+        public object GetCheckQtyByBarCodeBill(Int64 HInterID, string HBillType, string sBatchNo,string sBarCode,Int64 sSCWhID
+            ,Int64 sSCSPID, Int64 sAuxPropID,string sMTONo,double iQty,Int64 HMaterID
+            ,Int64 sWhID,Int64 sSPID,Int64 HSourceInterID,Int64 HSourceEntryID, double EndQty, double sQty)
+        {
+            try
+            {
+                if (sBatchNo == null)
+                {
+                    sBatchNo = "";
+                }
+                if (sMTONo == null)
+                {
+                    sMTONo = "";
+                }
+                if ( HBillType == "1204" || HBillType == "1205" || HBillType == "1206" || HBillType == "1211" || HBillType == "1213")
+                {
+                    WebS.WebService1 oWebs = new WebS.WebService1();
+                    if (webserver.Get_CheckQtyByBarCode(sBarCode, sWhID, sSPID, sAuxPropID, sBatchNo, sMTONo, iQty, ref sRelQty))
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "搴撳瓨瓒冲锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else if (sRelQty == 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鏃犲簱瀛橈紒";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        EndQty = sRelQty - sQty;
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "搴撳瓨涓嶈冻锛屽凡鑾峰彇瀹為檯搴撳瓨鏁伴噺锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else if (HBillType == "1203" || HBillType == "1205" || HBillType == "1202")
+                {
+                    WebS.WebService1 oWebs = new WebS.WebService1();
+                 if (oWebs.set_SavePonderationBillMain_Temp_ChangGui(HInterID, HMaterID, sAuxPropID, sMTONo, sWhID, sSPID, sSCWhID, sSCSPID, sBatchNo, HSourceInterID, HSourceEntryID, sBarCode, HBillType, EndQty, ref DBUtility.ClsPub.sErrInfo))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "璋冩暣鎴愬姛";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "璋冩暣澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                }
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
 
     }
 }
\ No newline at end of file
diff --git a/WebAPI/Controllers/SellOutController.cs b/WebAPI/Controllers/SellOutController.cs
index 2dfde99..8d64af3 100644
--- a/WebAPI/Controllers/SellOutController.cs
+++ b/WebAPI/Controllers/SellOutController.cs
@@ -572,6 +572,7 @@
                 websLsmain.HRemark = lsmain[0].HRemark;
                 websLsmain.HMaker = lsmain[0].HMaker;
                 websLsmain.HKeeperID= lsmain[0].HKeeperID;
+                websLsmain.HBillType = "1205";//鍥哄畾鍊�
 
                 if (webserver.set_SaveSellOutBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
                 {
diff --git a/WebAPI/Properties/Settings.Designer.cs b/WebAPI/Properties/Settings.Designer.cs
index c8fd941..9d44150 100644
--- a/WebAPI/Properties/Settings.Designer.cs
+++ b/WebAPI/Properties/Settings.Designer.cs
@@ -26,7 +26,7 @@
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
-        [global::System.Configuration.DefaultSettingValueAttribute("http://localhost:8098/WebService1.asmx")]
+        [global::System.Configuration.DefaultSettingValueAttribute("http://61.164.86.218:8090/WEBS-WMS/WebService1.asmx")]
         public string WebAPI_WebS_WebService1 {
             get {
                 return ((string)(this["WebAPI_WebS_WebService1"]));
diff --git a/WebAPI/Properties/Settings.settings b/WebAPI/Properties/Settings.settings
index d37166d..91c846a 100644
--- a/WebAPI/Properties/Settings.settings
+++ b/WebAPI/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="WebAPI_WebS_WebService1" Type="(Web Service URL)" Scope="Application">
-      <Value Profile="(Default)">http://localhost:8098/WebService1.asmx</Value>
+      <Value Profile="(Default)">http://61.164.86.218:8090/WEBS-WMS/WebService1.asmx</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/Reference.map b/WebAPI/Web References/WebS/Reference.map
index 952b627..493bd8a 100644
--- a/WebAPI/Web References/WebS/Reference.map
+++ b/WebAPI/Web References/WebS/Reference.map
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost:8098/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost:8098/WebService1.asmx?disco" filename="WebService1.disco" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://47.96.97.237/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://47.96.97.237/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" />
   </Results>
 </DiscoveryClientResultsFile>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/WebService1.disco b/WebAPI/Web References/WebS/WebService1.disco
index 9475a15..3150354 100644
--- a/WebAPI/Web References/WebS/WebService1.disco
+++ b/WebAPI/Web References/WebS/WebService1.disco
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="http://localhost:8098/WebService1.asmx?wsdl" docRef="http://localhost:8098/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-  <soap address="http://localhost:8098/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-  <soap address="http://localhost:8098/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <contractRef ref="http://47.96.97.237/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://47.96.97.237/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+  <soap address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <soap address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
 </discovery>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/WebService1.wsdl b/WebAPI/Web References/WebS/WebService1.wsdl
index 648dcf5..ae026f8 100644
--- a/WebAPI/Web References/WebS/WebService1.wsdl
+++ b/WebAPI/Web References/WebS/WebService1.wsdl
@@ -25271,10 +25271,10 @@
   </wsdl:binding>
   <wsdl:service name="WebService1">
     <wsdl:port name="WebService1Soap" binding="tns:WebService1Soap">
-      <soap:address location="http://localhost:8098/WebService1.asmx" />
+      <soap:address location="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />
     </wsdl:port>
     <wsdl:port name="WebService1Soap12" binding="tns:WebService1Soap12">
-      <soap12:address location="http://localhost:8098/WebService1.asmx" />
+      <soap12:address location="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 286cbe0..e430be9 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
 	  <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
 	  <!--<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
 	  <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
-	  <add key="sUrl" value="http://47.96.97.237:8018/Web_WJ/WebService1.asmx" /> 
+	  <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" /> 
 	  <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    鍗氭棩绉戞妧-->
 	  <!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/>    鐟炰笌绁�-->
     <add key="webpages:Version" value="3.0.0.0" />
@@ -87,7 +87,7 @@
   <applicationSettings>
     <WebAPI.Properties.Settings>
       <setting name="WebAPI_WebS_WebService1" serializeAs="String">
-        <value>http://localhost:8098/WebService1.asmx</value>
+        <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
       </setting>
     </WebAPI.Properties.Settings>
   </applicationSettings>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 8aca390..1a4884a 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -305,7 +305,6 @@
     </Content>
     <None Include="Web References\WebS\Reference.map">
       <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
     <None Include="Web References\WebS\WebService1.disco" />
     <Content Include="Web.config">
@@ -858,10 +857,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <WebReferenceUrl Include="http://localhost:8098/WebService1.asmx">
+    <WebReferenceUrl Include="http://47.96.97.237/WEBS-WMS/WebService1.asmx">
       <UrlBehavior>Dynamic</UrlBehavior>
       <RelPath>Web References\WebS\</RelPath>
-      <UpdateFromURL>http://localhost:8098/WebService1.asmx</UpdateFromURL>
+      <UpdateFromURL>http://47.96.97.237/WEBS-WMS/WebService1.asmx</UpdateFromURL>
       <ServiceLocationURL>
       </ServiceLocationURL>
       <CachedDynamicPropName>
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index 9e2f5af..72f7147 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -4373,6 +4373,19 @@
             //return dal.GetInfoByID_View(HInterID, sBillType, sWhere);
         }
 
+        public bool Get_CheckQtyByBarCode(string sBarcode, long HWHID, long HSPID, long HAuxPropID, string sBatchNo, string HMTONo, double sQty, ref double sRelQty)
+        {
+            DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
+            if (dal.CheckQtyByBarCode(sBarcode, HWHID, HSPID, HAuxPropID, sBatchNo, HMTONo, sQty, ref sRelQty))
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
         public DataSet GetSPInfoByIDandHWHIDandOrg(long sItemID, long sHWHID, long HUSEORGID, ref string sErrMsg)
         {
             BLL.ClsIF_StockPlace_View bll = new BLL.ClsIF_StockPlace_View();

--
Gitblit v1.9.1