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

UAS-MES/CustomControl/RichText/RichTextAutoBottom.cs

@@ -66,19 +66,19 @@ namespace UAS_MES.CustomControl.RichText
             {
                 return;
             }
-            SpeechLib.SpVoiceClass pp = new SpeechLib.SpVoiceClass();
-            SpeechLib.SpFileStreamClass spFs = new SpeechLib.SpFileStreamClass();
-            spFs.Open(FileName, SpeechLib.SpeechStreamFileMode.SSFMOpenForRead, true);
-            SpeechLib.ISpeechBaseStream Istream = spFs as SpeechLib.ISpeechBaseStream;
             try
             {
+                SpeechLib.SpVoiceClass pp = new SpeechLib.SpVoiceClass();
+                SpeechLib.SpFileStreamClass spFs = new SpeechLib.SpFileStreamClass();
+                spFs.Open(FileName, SpeechLib.SpeechStreamFileMode.SSFMOpenForRead, true);
+                SpeechLib.ISpeechBaseStream Istream = spFs as SpeechLib.ISpeechBaseStream;
                 pp.SpeakStream(Istream, SpeechLib.SpeechVoiceSpeakFlags.SVSFIsFilename);
+                spFs.Close();
             }
             catch (Exception)
             {
                 Entity.SystemInf.CheckAudioEnable = false;
             }
-            spFs.Close();
         }
     }
 }

UAS-MES/FunctionCode/Make/Make_NewMatainInf.Designer.cs

@@ -98,6 +98,7 @@
             this.nrg_name_lsv.UseCompatibleStateImageBehavior = false;
             this.nrg_name_lsv.View = System.Windows.Forms.View.Details;
             this.nrg_name_lsv.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.ListView_ItemSelectionChanged);
+            this.nrg_name_lsv.SelectedIndexChanged += new System.EventHandler(this.nrg_name_lsv_SelectedIndexChanged);
             // 
             // nrg_code
             // 
@@ -252,7 +253,7 @@
             // bc_name
             // 
             this.bc_name.AllPower = null;
-            this.bc_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.bc_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.bc_name.BackColor = System.Drawing.Color.White;
             this.bc_name.Enabled = false;
@@ -282,7 +283,7 @@
             // bg_name
             // 
             this.bg_name.AllPower = null;
-            this.bg_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.bg_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.bg_name.BackColor = System.Drawing.Color.White;
             this.bg_name.Enabled = false;

UAS-MES/FunctionCode/Make/Make_NewMatainInf.cs

@@ -75,14 +75,6 @@ namespace UAS_MES.Make
                 else
                     nrg_code += "'" + dt.Rows[i]["nrg_code"] + "',";
             }
-            sql.Clear();
-            sql.Append("select nr_code,nr_name,nr_group from QUA_NGReason where ");
-            sql.Append("nr_group in(" + (nrg_code == "" ? "''" : nrg_code) + ")");
-            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-            //未查询到查询全部数据
-            if (dt.Rows.Count == 0)
-                dt = (DataTable)dh.ExecuteSql("select nr_code,nr_name,nr_group from QUA_NGReason", "select");
-            AddDataToListView(nr_name_lsv, dt);
             //加载责任别
             dt = (DataTable)dh.ExecuteSql("select nd_code,nd_name from ngduty", "select");
             AddDataToListView(mbr_dutycode_lsv, dt);
@@ -177,17 +169,13 @@ namespace UAS_MES.Make
                 {
                     string macode = dt.Rows[0]["ms_makecode"].ToString();
                     string mbr_id = dh.GetSEQ("makebadreason_seq");
-                    if (!dh.CheckExist("makebadreason", "mbr_sncode='" + sncode + "' and mbr_badcode='" + bccode + "' "))
-                    {
-                        sql.Clear();
-                        sql.Append("insert into makebadreason (mbr_mbid,mbr_id,mbr_brcode,mbr_solutioncode,");
-                        sql.Append("mbr_dutycode,mbr_brgcode,mbr_badcode,mbr_sncode,mbr_makecode,mbr_indate,");
-                        sql.Append("mbr_inman) select '" + mbid + "','" + mbr_id + "','" + nrcode + "',");
-                        sql.Append("'" + mbrsolutioncode + "','" + mbrdutycode + "','" + nrgcode + "','" + bccode + "',");
-                        sql.Append("'" + sncode + "','" + macode + "',sysdate,'" + User.UserCode + "' from dual");
-                        dh.ExecuteSql(sql.GetString(), "insert");
-                    }
-                    else ErrorMessage = "序列号" + sncode + "已存在不良代码" + bccode + "\n";
+                    sql.Clear();
+                    sql.Append("insert into makebadreason (mbr_mbid,mbr_id,mbr_brcode,mbr_solutioncode,");
+                    sql.Append("mbr_dutycode,mbr_brgcode,mbr_badcode,mbr_sncode,mbr_makecode,mbr_indate,");
+                    sql.Append("mbr_inman) select '" + mbid + "','" + mbr_id + "','" + nrcode + "',");
+                    sql.Append("'" + mbrsolutioncode + "','" + mbrdutycode + "','" + nrgcode + "','" + bccode + "',");
+                    sql.Append("'" + sncode + "','" + macode + "',sysdate,'" + User.UserCode + "' from dual");
+                    dh.ExecuteSql(sql.GetString(), "insert");
                     if (mbccomponent != "" || mbccomponent != null)
                     {
                         if (!dh.CheckExist("makebadrscom", "mbc_sncode='" + sncode + "' and mbc_component='" + mbccomponent + "'"))
@@ -222,5 +210,19 @@ namespace UAS_MES.Make
                     item.BackColor = Color.White;
             }
         }
+
+        private void nrg_name_lsv_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            string nrg_code = "";
+            if (nrg_name_lsv.SelectedItems.Count > 0) //或者使用SelectedItem!=null判断
+            {
+                nrg_code = nrg_name_lsv.SelectedItems[0].SubItems[0].Text;
+            }
+            sql.Clear();
+            sql.Append("select nr_code,nr_name,nr_group from QUA_NGReason where ");
+            sql.Append("nr_group in('" + (nrg_code == "" ? "''" : nrg_code) + "')");
+            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            AddDataToListView(nr_name_lsv, dt);
+        }
     }
 }

UAS-MES/FunctionCode/Make/Make_Repair.Designer.cs

@@ -775,6 +775,7 @@
             this.Clean.Tag = "IfWrite";
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
+            this.Clean.Click += new System.EventHandler(this.Clean_Click);
             // 
             // cd_stepcode
             // 

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -72,7 +72,7 @@ namespace UAS_MES.Make
             //为DBFind配置Call和Form的名称
             cr_code.FormName = Name;
             cr_code.TableName = "craft";
-            cr_code.SelectField = "cr_name # 工艺名称 ,cr_code # 工艺编号,cr_prodcode # 物料编号";
+            cr_code.SelectField = "cr_name # 工艺名称,cr_code # 工艺编号,cr_prodcode # 物料编号";
             cr_code.SetValueField = new string[] { "cr_code" };
             cr_code.DBTitle = "回流工艺";
 
@@ -438,5 +438,10 @@ namespace UAS_MES.Make
         {
             cd_stepcode.Condition = "ST_STATUSCODE='AUDITED' and cr_code='" + cr_code.Text + "'";
         }
+
+        private void Clean_Click(object sender, EventArgs e)
+        {
+            OperatResult.Clear();
+        }
     }
 }

UAS-MES/FunctionCode/Make/Make_Repair.resx

@@ -126,12 +126,6 @@
   <metadata name="mbp_part1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="mbp_part1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="mbl_loc1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="mbl_loc1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

UAS-MES/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -200,19 +200,19 @@
             // 
             this.columnHeader4.Text = "不良代码组";
             this.columnHeader4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader4.Width = 130;
+            this.columnHeader4.Width = 115;
             // 
             // columnHeader1
             // 
             this.columnHeader1.Text = "不良代码";
             this.columnHeader1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader1.Width = 96;
+            this.columnHeader1.Width = 90;
             // 
             // columnHeader2
             // 
             this.columnHeader2.Text = "备注";
             this.columnHeader2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader2.Width = 175;
+            this.columnHeader2.Width = 75;
             // 
             // label4
             // 
@@ -269,19 +269,19 @@
             // 
             this.columnHeader3.Text = "不良代码组";
             this.columnHeader3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader3.Width = 130;
+            this.columnHeader3.Width = 117;
             // 
             // columnHeader7
             // 
             this.columnHeader7.Text = "不良代码";
             this.columnHeader7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader7.Width = 94;
+            this.columnHeader7.Width = 79;
             // 
             // columnHeader8
             // 
             this.columnHeader8.Text = "备注";
             this.columnHeader8.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader8.Width = 194;
+            this.columnHeader8.Width = 75;
             // 
             // AutoBadCode
             // 

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -187,6 +187,7 @@ namespace UAS_MES.Make
                                 return;
                             }
                         }
+                        bc_code.Focus();
                         SetCollectResult();
                     }
                     else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
@@ -207,24 +208,14 @@ namespace UAS_MES.Make
         {
             //如果ms_makecode的值修改过再去查询
             sql.Clear();
-            sql.Append("select pb_badgroup from make left join product on pr_code=ma_prodcode left join ");
-            sql.Append("productkind on pk_code=pr_kind left join productbadgroup on pk_code=PB_KINDCODE where ma_code='" + ma_code.Text + "' and pb_badgroup is not null");
+            sql.Append("select bg_code||':'||bg_name bg_name,bg_code from badgroup left join (select pb_badgroup,pr_kind ");
+            sql.Append("from product left join productkind on pk_name=pr_kind ");
+            sql.Append("left join productbadgroup on pk_code=PB_KINDCODE where pr_code='" + ma_prodcode.Text + "')");
+            sql.Append("on pb_badgroup=bg_code order by pr_kind desc");
             DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-            if (dt.Rows.Count == 0)
-            {
-                sql.Clear();
-                sql.Append("select bg_code||':'||bg_name bg_name,bg_code from badgroup");
-                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                bc_groupcode.DisplayMember = "bg_name";
-                bc_groupcode.ValueMember = "bg_code";
-                bc_groupcode.DataSource = dt;
-            }
-            else
-            {
-                bc_groupcode.DisplayMember = "pb_badgroup";
-                bc_groupcode.ValueMember = "pb_badgroup";
-                bc_groupcode.DataSource = dt;
-            }
+            bc_groupcode.DisplayMember = "bg_name";
+            bc_groupcode.ValueMember = "bg_code";
+            bc_groupcode.DataSource = dt;
         }
 
 
@@ -399,7 +390,7 @@ namespace UAS_MES.Make
                 dh.ExecuteSql("delete from makebad where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "'", "delete");
                 if (LogicHandler.SetTestNGDetail(ms_sncode.Text, ma_code.Text, User.UserName, User.UserSourceCode, "检查未通过", bgcode, bccode, bcremark, out ErrorMessage))
                 {
-                    OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为不良\n", Color.Green,ms_sncode);
+                    OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为不良\n", Color.Green, ms_sncode);
                     //清除不良信息
                     bc_groupcode.DataSource = null;
                     bc_groupcode.Text = "";
@@ -426,7 +417,7 @@ namespace UAS_MES.Make
                     {
                         if (ChoosedRejectList.Items[i].ListView.Items[i].SubItems[2].Text == bc_code.Text)
                         {
-                            OperateResult.AppendText(">>已添加过不良代码" + bc_code.Text + "\n", Color.Red,bc_code);
+                            OperateResult.AppendText(">>已添加过不良代码" + bc_code.Text + "\n", Color.Red, bc_code);
                             return;
                         }
                     }

UAS-MES/UAS-MES.csproj

@@ -41,7 +41,7 @@
     <MinimumRequiredVersion>1.0.0.201</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>205</ApplicationRevision>
+    <ApplicationRevision>209</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>