修改测试采集不良组别和代码的选择

UAS-MES/DataOperate/DataHelper.cs

@@ -1,5 +1,6 @@
 using Oracle.ManagedDataAccess.Client;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
@@ -602,9 +603,7 @@ namespace UAS_MES.DataOperate
                     }
                 }
                 for (int i = 0; i < addpar.Length; i++)
-                {
                     command.Parameters.Add(new OracleParameter(addpar[i].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
-                }
             }
             Console.WriteLine(SQL);
             switch (Type.ToUpper())
@@ -932,10 +931,11 @@ namespace UAS_MES.DataOperate
             command.CommandText = ProcedureName;
             command.CommandType = CommandType.StoredProcedure;
             for (int i = 0; i < param.Length; i++)
-                command.Parameters.Add(new OracleParameter(param[i], OracleDbType.Varchar2, 20, param[i], ParameterDirection.InputOutput));
+                command.Parameters.Add(new OracleParameter(param[i].ToString(), OracleDbType.Varchar2, 20, param[i], ParameterDirection.InputOutput));
             command.ExecuteNonQuery();
-            for (int i = 0; i < command.Parameters.Count; i++)
+            for (int i = 0; i < command.Parameters.Count; i++) {
                 param[i] = command.Parameters[i].Value.ToString();
+            }
             command.Dispose();
         }
 

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -70,8 +70,8 @@ namespace UAS_MES.Make
                 pd_barcode.Text = dh.getFieldDataByCondition("makeserial left join package on ms_prodcode=pa_prodcode", "ms_sncode", "pa_outboxcode='" + outboxcode.Text + "'").ToString();
                 sql.Clear();
                 sql.Append("select pa_totalqty,pd_barcode,ma_code,mcd_okqty,ma_qty,ma_qty-mcd_okqty as mcd_waitqty,ma_salecode,pr_detail,pr_cartonunit,pr_code,pr_cartongw,");
-                sql.Append("pr_cartonmaxw,pr_cartonminw from  package left join product on pr_code=pa_prodcode left join make on ma_prodcode=");
-                sql.Append("pr_code left join makecraftdetail on mcd_macode=ma_code left join  packagedetail on pd_outboxcode=pa_outboxcode where pa_outboxcode='" + outboxcode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                sql.Append("pr_cartonmaxw,pr_cartonminw from  package left join product on pr_code=pa_prodcode left join make on ma_prodcode=pr_code left join makecraftdetail ");
+                sql.Append("on mcd_macode=ma_code left join  packagedetail on pd_outboxcode=pa_outboxcode where pa_outboxcode='" + outboxcode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 //填充Form的值
                 BaseUtil.SetFormValue(this.Controls, dt);

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

@@ -70,9 +70,9 @@
             this.ChooseedReject = new UAS_MES.CustomControl.ButtonUtil.ArrowRightButton();
             this.WaitReject = new UAS_MES.CustomControl.ButtonUtil.ArrowLeftButton();
             this.bc_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.bc_code = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.bc_groupcode = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.bc_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -103,7 +103,7 @@
             // 
             this.bc_remark_label.AutoSize = true;
             this.bc_remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bc_remark_label.Location = new System.Drawing.Point(27, 287);
+            this.bc_remark_label.Location = new System.Drawing.Point(447, 239);
             this.bc_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_remark_label.Name = "bc_remark_label";
             this.bc_remark_label.Size = new System.Drawing.Size(92, 27);
@@ -214,7 +214,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(552, 240);
+            this.label3.Location = new System.Drawing.Point(27, 286);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(92, 27);
@@ -256,10 +256,10 @@
             this.columnHeader5,
             this.columnHeader1,
             this.columnHeader2});
-            this.WaitRejectList.Location = new System.Drawing.Point(29, 422);
+            this.WaitRejectList.Location = new System.Drawing.Point(29, 362);
             this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.WaitRejectList.Name = "WaitRejectList";
-            this.WaitRejectList.Size = new System.Drawing.Size(393, 244);
+            this.WaitRejectList.Size = new System.Drawing.Size(393, 304);
             this.WaitRejectList.TabIndex = 37;
             this.WaitRejectList.UseCompatibleStateImageBehavior = false;
             this.WaitRejectList.View = System.Windows.Forms.View.Details;
@@ -284,7 +284,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(32, 384);
+            this.label4.Location = new System.Drawing.Point(27, 331);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(92, 27);
@@ -295,7 +295,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(547, 386);
+            this.label5.Location = new System.Drawing.Point(542, 331);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(92, 27);
@@ -321,10 +321,10 @@
             this.columnHeader3,
             this.columnHeader7,
             this.columnHeader8});
-            this.ChoosedRejectList.Location = new System.Drawing.Point(544, 422);
+            this.ChoosedRejectList.Location = new System.Drawing.Point(544, 362);
             this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
-            this.ChoosedRejectList.Size = new System.Drawing.Size(393, 244);
+            this.ChoosedRejectList.Size = new System.Drawing.Size(393, 304);
             this.ChoosedRejectList.TabIndex = 50;
             this.ChoosedRejectList.UseCompatibleStateImageBehavior = false;
             this.ChoosedRejectList.View = System.Windows.Forms.View.Details;
@@ -356,7 +356,7 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(248, 394);
+            this.label7.Location = new System.Drawing.Point(248, 336);
             this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(174, 20);
@@ -519,27 +519,17 @@
             this.bc_remark.AllPower = null;
             this.bc_remark.BackColor = System.Drawing.Color.White;
             this.bc_remark.ID = null;
-            this.bc_remark.Location = new System.Drawing.Point(164, 284);
+            this.bc_remark.Location = new System.Drawing.Point(547, 237);
             this.bc_remark.Margin = new System.Windows.Forms.Padding(4);
             this.bc_remark.Multiline = true;
             this.bc_remark.Name = "bc_remark";
             this.bc_remark.Power = null;
-            this.bc_remark.Size = new System.Drawing.Size(773, 82);
+            this.bc_remark.Size = new System.Drawing.Size(393, 77);
             this.bc_remark.Str = null;
             this.bc_remark.Str1 = null;
             this.bc_remark.Str2 = null;
             this.bc_remark.TabIndex = 41;
             // 
-            // bc_code
-            // 
-            this.bc_code.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bc_code.FormattingEnabled = true;
-            this.bc_code.Location = new System.Drawing.Point(684, 240);
-            this.bc_code.Margin = new System.Windows.Forms.Padding(4);
-            this.bc_code.Name = "bc_code";
-            this.bc_code.Size = new System.Drawing.Size(253, 26);
-            this.bc_code.TabIndex = 33;
-            // 
             // bc_groupcode
             // 
             this.bc_groupcode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -569,12 +559,28 @@
             this.ms_sncode.Tag = "IfWrite";
             this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_code_KeyDown);
             // 
+            // bc_code
+            // 
+            this.bc_code.AllPower = null;
+            this.bc_code.BackColor = System.Drawing.Color.White;
+            this.bc_code.ID = null;
+            this.bc_code.Location = new System.Drawing.Point(164, 286);
+            this.bc_code.Name = "bc_code";
+            this.bc_code.Power = null;
+            this.bc_code.Size = new System.Drawing.Size(251, 25);
+            this.bc_code.Str = null;
+            this.bc_code.Str1 = null;
+            this.bc_code.Str2 = null;
+            this.bc_code.TabIndex = 68;
+            this.bc_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.bc_code_KeyDown);
+            // 
             // Make_TestCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(1230, 740);
+            this.Controls.Add(this.bc_code);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.LockMakeCode);
             this.Controls.Add(this.label2);
@@ -597,7 +603,6 @@
             this.Controls.Add(this.WaitRejectList);
             this.Controls.Add(this.Reject);
             this.Controls.Add(this.GoodProduct);
-            this.Controls.Add(this.bc_code);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.mc_restqty_label);
             this.Controls.Add(this.panel2);
@@ -641,7 +646,6 @@
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label label2;
-        private CustomControl.ComBoxWithFocus.ComBoxWithFocus bc_code;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.RadioButton GoodProduct;
         private System.Windows.Forms.RadioButton Reject;
@@ -671,5 +675,6 @@
         private System.Windows.Forms.ColumnHeader columnHeader3;
         private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
         private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
+        private CustomControl.TextBoxWithIcon.EnterTextBox bc_code;
     }
 }

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -142,10 +142,8 @@ namespace UAS_MES.Make
                                 OperateResult.AppendText(">>该序列号已执行过" + User.CurrentStepCode + "工序,采集结果为良品\n", Color.Red);
                                 return;
                             }
-                            SetCollectResult();
                         }
-                        if (!Reject.Checked)
-                            ms_sncode.Text = "";
+                        SetCollectResult();
                     }
                     else
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
@@ -187,13 +185,14 @@ namespace UAS_MES.Make
             sql.Clear();
             sql.Append("select bc_code,bc_name  from badgroup left join badcode on bc_groupcode=bg_code where bc_groupcode='" + bc_groupcode.Text + "'");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-            bc_code.DataSource = dt;
-            bc_code.DisplayMember = "bc_name";
-            bc_code.ValueMember = "bc_code";
+            //如果未获取到不良代码则去除限制条件获取全部的
+            if (dt.Rows.Count == 0)
+            {
+                dt = (DataTable)dh.ExecuteSql("select bc_code,bc_name  from badgroup left join badcode on bc_groupcode=bg_code", "select");
+            }
             //往listview中添加数据
             WaitRejectList.Items.Clear();
             WaitRejectList.BeginUpdate();
-
             for (int i = 0; i < dt.Rows.Count; i++)
             {
                 ListViewItem lvi = new ListViewItem();
@@ -223,20 +222,16 @@ namespace UAS_MES.Make
                 string RejectRecordNum = dh.getFieldDataByCondition("makeBad", "count(1) cn", "mb_sncode='" + ms_sncode.Text + "' and mb_status not in (1,-1)").ToString();
                 //存在不良记录
                 if (int.Parse(RejectRecordNum) > 0)
-                {
-                    OperateResult.AppendText(ms_sncode.Text + "存在不良记录，不允许通过!\n", Color.Red);
-                }
+                    OperateResult.AppendText(">>" + ms_sncode.Text + "存在不良记录，不允许通过!\n", Color.Red);
                 else
                 {
                     //良品信息采集
                     if (LogicHandler.UpdateMakeMessage(ms_sncode.Text, ma_code.Text, User.UserSourceCode, User.UserName, "检测合格", out ErrorMessage))
-                    {
                         OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为良品\n", Color.Green);
-                        ms_sncode.Text = "";
-                    }
                     else
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                 }
+                ms_sncode.Text = "";
             }
             dt = (DataTable)dh.ExecuteSql("select mcd_inqty,ma_qty-mcd_inqty mcd_remainqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
             BaseUtil.SetFormValue(Controls, dt);
@@ -286,7 +281,6 @@ namespace UAS_MES.Make
                     //清除不良信息
                     bc_groupcode.DataSource = null;
                     bc_groupcode.Text = "";
-                    bc_code.DataSource = null;
                     bc_code.Text = "";
                     WaitRejectList.Items.Clear();
                     ChoosedRejectList.Items.Clear();
@@ -296,5 +290,30 @@ namespace UAS_MES.Make
                     OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
             }
         }
+
+        private void bc_code_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                DataTable dt = dh.getFieldsDataByCondition("badcode", new string[] { "bc_groupcode", "bc_code", "bc_note" }, "bc_code='" + bc_code.Text + "'");
+                if (dt.Rows.Count > 0)
+                {
+                    for (int i = 0; i < ChoosedRejectList.Items.Count; i++)
+                    {
+                        if (ChoosedRejectList.Items[i].ListView.Items[0].SubItems[2].Text == bc_code.Text)
+                        {
+                            MessageBox.Show("已添加过不良代码" + bc_code.Text);
+                            return;
+                        }
+                    }
+                    ListViewItem lvi = new ListViewItem();
+                    lvi.Text = "";
+                    for (int j = 0; j < dt.Columns.Count; j++)
+                        lvi.SubItems.Add(dt.Rows[0][j].ToString());
+                    ChoosedRejectList.Items.Add(lvi);
+                }
+                else MessageBox.Show("不良代码不存在");
+            }
+        }
     }
 }

UAS-MES/Program.cs

@@ -91,7 +91,7 @@ namespace UAS_MES
             if (ex != null)
             {
                 sb.AppendLine(ex.Message);
-                //sb.AppendLine("【异常方法】：" + ex.TargetSite);
+                sb.AppendLine("【异常方法】：" + ex.TargetSite);
 
             }
             else { sb.AppendLine("【未处理异常】：" + backStr); }

UAS-MES/PublicMethod/LogicHandler.cs

@@ -237,7 +237,10 @@ namespace UAS_MES.PublicMethod
             if (ma_statuscode == "STARTED")
                 return true;
             else
+            {
+                ErrorMessage = "工单必须是已下放状态";
                 return false;
+            }
         }
 
         /// <summary>
@@ -408,7 +411,7 @@ namespace UAS_MES.PublicMethod
             oErrorMessage = "";
             string[] param = new string[] { iCaller, iSource, oErrorMessage };
             dh.CallProcedure("CS_CHECKSTEPATTRIBUTE", ref param);
-            if (oErrorMessage == "")
+            if (oErrorMessage == "" || oErrorMessage == null)
                 return true;
             else
                 return false;
@@ -421,7 +424,10 @@ namespace UAS_MES.PublicMethod
             oMsID = "";
             string[] param = new string[] { iMakeCode, iSource, iSN, iUserCode, oMakeCode, oMsID, oErrorMessage };
             dh.CallProcedure("CS_CHECKSTEPSNANDMACODE", ref param);
-            if (oErrorMessage == "")
+            oMakeCode = param[4];
+            oMsID = param[5];
+            oErrorMessage = param[6];
+            if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
                 return true;
             else
                 return false;
@@ -992,7 +998,7 @@ namespace UAS_MES.PublicMethod
             oErrorMessage = "";
             string[] param = new string[] { iMakeCode, iSource, iSN, iUserCode, oErrorMessage };
             dh.CallProcedure("CS_SETFINISH", ref param);
-            if (oErrorMessage == "")
+            if (oErrorMessage == "" || oErrorMessage == null)
                 return true;
             else
                 return false;
@@ -1119,8 +1125,8 @@ namespace UAS_MES.PublicMethod
                 return false;
             }
             sql.Clear();
-            sql.Append("select nvl(cd_ifreduce,0) cd_ifreduce  from craft left join ");
-            sql.Append("craftdetail on cd_crid=cr_id where cr_code=(select ma_craftcode  from makeserial left join make on ma_code = ms_makecode ");
+            sql.Append("select nvl(cd_ifreduce,0) cd_ifreduce from craft left join craftdetail on cd_crid=cr_id ");
+            sql.Append("where cr_code=(select ma_craftcode  from makeserial left join make on ma_code = ms_makecode ");
             sql.Append("where ms_sncode = '" + iSnCode + "') and cd_stepcode='" + StepCode + "'");
             DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             sql.Clear();
@@ -1130,21 +1136,21 @@ namespace UAS_MES.PublicMethod
                 if (cd_ifreduce == "-1")
                 {
                     sql.Clear();
-                    sql.Append("select dsl_location,dsl_table, max(dsl_baseqty) baseqty from devsmtlocation where dsl_makecode='" + iMakeCode + "' and ");
+                    sql.Append("select dsl_location,dsl_table,max(dsl_baseqty) baseqty from devsmtlocation where dsl_makecode='" + iMakeCode + "' and ");
                     sql.Append("dsl_linecode='" + LineCode + "' and dsl_status=0 and dsl_remainqty>0 and dsl_invalidtime is null group by dsl_location,dsl_table");
                     dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                     for (int i = 0; i < dt.Rows.Count; i++)
                     {
                         sql.Clear();
-                        sql.Append("selet dsl_id,dsl_remainqty from devsmtlocation where dsl_makecode='" + iMakeCode + "' and dsl_linecode='" + LineCode + "' ");
+                        sql.Append("select dsl_id,dsl_remainqty from devsmtlocation where dsl_makecode='" + iMakeCode + "' and dsl_linecode='" + LineCode + "' ");
                         sql.Append("and dsl_status=0 and dsl_remainqty>0 and dsl_invalidtime is null and rownum<3 order by dsl_id asc ");
                         DataTable dt1 = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
-                        for (int j = 0; j < dt.Rows.Count; j++)
+                        for (int j = 0; j < dt1.Rows.Count; j++)
                         {
                             //外层循环的值dt
                             double baseqty = (double)dt.Rows[i]["baseqty"];
-                            double dsl_remainqty = (double)dt.Rows[i]["dsl_remainqty"];
                             //内层循环的值dt1
+                            double dsl_remainqty = (double)dt1.Rows[j]["dsl_remainqty"];
                             string dsl_id = dt1.Rows[j]["dsl_id"].ToString();
                             if (baseqty > 0)
                             {
@@ -1152,21 +1158,21 @@ namespace UAS_MES.PublicMethod
                                 {
                                     sql.Clear();
                                     sql.Append("update devsmtlocation set dsl_remainqty=0,dsl_invalidtime =sysdate, dsl_validtime =(case when dsl_validtime ");
-                                    sql.Append("is null then sysdate else  dsl_validtime),dsl_status=-1 where dsl_id=" + dsl_id);
+                                    sql.Append("is null then sysdate else  dsl_validtime end),dsl_status=-1 where dsl_id=" + dsl_id);
                                     dh.ExecuteSql(sql.ToString(), "update");
                                     baseqty -= dsl_remainqty;
                                 }
                                 else
                                 {
                                     sql.Clear();
-                                    sql.Append("update devsmtlocation set dsl_remainqty=dsl_remainqty-NVL(dsl_baseqty,0),dsl_efftime=(case when");
-                                    sql.Append("dsl_validtime is null then sysdate else dsl_validtime) where dsl_id=" + dsl_id);
+                                    sql.Append("update devsmtlocation set dsl_remainqty=dsl_remainqty-NVL(dsl_baseqty,0),DSL_INVALIDTIME=(case when");
+                                    sql.Append("dsl_validtime is null then sysdate else dsl_validtime end) where dsl_id=" + dsl_id);
                                     dh.ExecuteSql(sql.ToString(), "update");
                                     baseqty = 0;
                                 }
                             }
                             else
-                                dh.ExecuteSql("update devsmtlocation set dsl_efftime=sysdate where dsl_id=" + dsl_id, "update");
+                                dh.ExecuteSql("update devsmtlocation set DSL_INVALIDTIME=sysdate where dsl_id=" + dsl_id, "update");
                         }
                     }
                     sql.Clear();
@@ -1364,7 +1370,7 @@ namespace UAS_MES.PublicMethod
                                     }
                                     else if (remain >= baseqty)
                                     {
-                                        dh.ExecuteSql("update makesourcestock set mss_remain = mss_remain-baseqty where mss_id =" + mss_id, "select");
+                                        dh.ExecuteSql("update makesourcestock set mss_remain = mss_remain-mss_baseqty where mss_id =" + mss_id, "select");
                                         baseqty = 0;
                                     }
                                 }
@@ -1419,9 +1425,7 @@ namespace UAS_MES.PublicMethod
                 sqls.Clear();
             }
             else
-            {
                 CheckNextStepIfQC(iSnCode, iMakeCode, nextstepcode.ToString(), cr_code, iUserName, out oErrorMessage);
-            }
             // 将数据插入craftmaterial表
             SetCollectionFinish(iSnCode, iMakeCode, iUserName, iSourceCode, out oErrorMessage);
             return true;

UAS-MES/UAS-MES.csproj

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