Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/CustomControl/HeadBar/HeadBar.Designer.cs

@@ -106,6 +106,8 @@
             this.Change_psw.Name = "Change_psw";
             this.Change_psw.TabStop = false;
             this.Change_psw.Click += new System.EventHandler(this.Change_psw_Click);
+            this.Change_psw.MouseEnter += new System.EventHandler(this.LoginOut_MouseEnter);
+            this.Change_psw.MouseLeave += new System.EventHandler(this.LoginOut_MouseLeave);
             // 
             // pictureBox2
             // 

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -61,8 +61,8 @@ namespace UAS_MES.Make
             if (e.KeyCode == Keys.Enter)
             {
                 sql.Clear();
-                sql.Append("select max(ms_id) from makeserial where ms_sncode ='" + sn_code.Text + "' or  exists (select 1");
-                sql.Append(" from  makesnrelation where beforesn='" + sn_code.Text + "'  and ms_makecode=makecode)");
+                sql.Append("select max(ms_id) from makeserial where ms_sncode ='" + sn_code.Text + "' or ms_sncode = (select  max(SN)");
+                sql.Append(" from  makesnrelation left join makeserial on ms_makecode=makecode where beforesn='"+ sn_code.Text + "')");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 ms_id = dt.Rows[0][0].ToString();
                 sncode_1 = sn_code.Text;

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -48,6 +48,8 @@ namespace UAS_MES.Make
         string ms_id="";
 
         DataTable formValue;//界面赋值
+
+        string type = "";
         public Make_RePrintLabel()
         {
             InitializeComponent();
@@ -181,20 +183,23 @@ namespace UAS_MES.Make
             }
             if (fuselagel.Checked)
             {
+                type = "机身标";
                 getlabel = "select pl_labelcode ||':'||pl_labelname pl_name,pl_labelname,pl_labelcode, pl_indate,pl_labelurl from productlabel where pl_prodcode='" + pr_code.Text + "'and PL_LABELTYPE='机身标' order by pl_isdefault desc";
             }
             else if (giftBox.Checked)
             {
+                type = "彩盒标";
                 getlabel = "select pl_labelcode ||':'||pl_labelname pl_name,pl_labelname,pl_labelcode, pl_indate,pl_labelurl from productlabel where pl_prodcode='" + pr_code.Text + "'and PL_LABELTYPE='彩盒标' order by pl_isdefault desc";
             }
             else
             {
+                type = "卡通箱标";
                 getlabel = "select pl_labelcode ||':'||pl_labelname pl_name,pl_labelname,pl_labelcode, pl_indate,pl_labelurl from productlabel where pl_prodcode='" + pr_code.Text + "'and PL_LABELTYPE='卡通箱标' order by pl_isdefault desc";
             }
             listA = (DataTable)dh.ExecuteSql(getlabel, "select");
             if (listA.Rows.Count == 0)
             {
-                OperateResult.AppendText("<<产品:" + pr_code.Text + "未维护机身标标签模板\n", Color.Red);
+                OperateResult.AppendText("<<产品:" + pr_code.Text + "未维护"+type+"模板\n", Color.Red);
             }
             PrintLabel.DataSource = listA;
             PrintLabel.DisplayMember = "pl_name";
@@ -359,6 +364,7 @@ namespace UAS_MES.Make
                             //记录操作日志commandlog ， 补打核对，核对成功
                             LogicHandler.DoCommandLog(User.UserCode, "", User.UserLineCode, User.UserSourceCode, "标签补打核对", "核对成功", TSN, "");
                         }
+                        OperateResult.AppendText("<<核对失败\n", Color.Red);
                         //清空TSN的值
                         TSN = "";
                         rePrintCheck.Text = "";
@@ -399,6 +405,7 @@ namespace UAS_MES.Make
                             //记录操作日志commandlog ， 补打核对，核对成功
                             LogicHandler.DoCommandLog(User.UserCode, "", User.UserLineCode, User.UserSourceCode, "标签补打核对,卡通箱号:"+TSN, "核对成功", "", "");
                         }
+                        OperateResult.AppendText("<<核对失败\n", Color.Red);
                         //清空TSN的值
                         TSN = "";
                         rePrintCheck.Text = "";