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

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

@@ -420,9 +420,11 @@
             this.ms_sncode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_sncode.AutoSize = true;
+            this.ms_sncode.CutLength = null;
             this.ms_sncode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_sncode.Location = new System.Drawing.Point(119, 55);
             this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_sncode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Size = new System.Drawing.Size(0, 27);
             this.ms_sncode.TabIndex = 126;
@@ -768,9 +770,11 @@
             this.ms_makecode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_makecode.AutoSize = true;
+            this.ms_makecode.CutLength = null;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_makecode.Location = new System.Drawing.Point(368, 55);
             this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ms_makecode.Name = "ms_makecode";
             this.ms_makecode.Size = new System.Drawing.Size(0, 27);
             this.ms_makecode.TabIndex = 85;
@@ -780,9 +784,11 @@
             this.ms_prodcode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_prodcode.AutoSize = true;
+            this.ms_prodcode.CutLength = null;
             this.ms_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_prodcode.Location = new System.Drawing.Point(662, 55);
             this.ms_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ms_prodcode.Name = "ms_prodcode";
             this.ms_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ms_prodcode.TabIndex = 83;
@@ -792,9 +798,11 @@
             this.pr_detail.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.pr_detail.AutoSize = true;
+            this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_detail.Location = new System.Drawing.Point(968, 55);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 82;
@@ -806,7 +814,7 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = null;
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1041, 697);
+            this.Clean.Location = new System.Drawing.Point(1043, 697);
             this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
@@ -1009,14 +1017,14 @@
             this.Text = "维修作业";
             this.Load += new System.EventHandler(this.维修作业_Load);
             this.SizeChanged += new System.EventHandler(this.Make_Repair_SizeChanged);
-            this.panel2.ResumeLayout(false);
+            this.panel2.ResumeLayout(true);
             this.panel2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.LocationSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComponentSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.mbp_partdgv)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.mbl_locdgv)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.RefreshTreeView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -14,25 +14,7 @@ namespace UAS_MES.Make
 {
     public partial class Make_Repair : Form
     {
-
-        string caller = "Make!Repair";
-        //记录维修结果的代码值
-        string Repair_Result;
-        //记录不良状态码
-        string badcode;
-        //记录不良组别
-        string groupcode;
-        //判断是否获取了下拉框的值 
-        string mb_id1;
-        //记录插入操作日志表的sql
-        string cm_makecode;
-        //执行插入日志的SQL
-        string insert_makeprocess = "insert into makeprocess(mp_id,mp_makecode,mp_maid, mp_mscode,mp_sncode,mp_stepcode,mp_stepname,mp_craftcode,mp_craftname,mp_kind,mp_result,mp_indate,mp_inman,mp_wccode,mp_linecode,mp_sourcecode) select MakeProcess_seq.nextval, ma_code,ma_id,ms_code,ms_sncode,mcd_stepcode,mcd_stepname,ma_craftcode,'','维修作业','#',sysdate,'" + User.UserName + "',ma_wccode,ma_linecode,'' from make left join makecraftdetail on mcd_macode=ma_code left join makeserial on ms_makecode=ma_code where ms_sncode=:ms_sncode and ma_code=:ma_code";
-        //是否获取过下拉框数据
-        bool GetSelectData = false;
-
         string mb_id = "";
-
         string mbr_id = "";
         /// <summary>
         /// 存放父节点信息

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

@@ -446,9 +446,11 @@
             // mcd_remainqty
             // 
             this.mcd_remainqty.AutoSize = true;
+            this.mcd_remainqty.CutLength = null;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mcd_remainqty.Location = new System.Drawing.Point(145, 16);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
             this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_remainqty.TabIndex = 57;
@@ -457,9 +459,11 @@
             // pr_detail
             // 
             this.pr_detail.AutoSize = true;
+            this.pr_detail.CutLength = "qweqwe";
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_detail.Location = new System.Drawing.Point(506, 123);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 56;
@@ -467,9 +471,11 @@
             // ma_qty
             // 
             this.ma_qty.AutoSize = true;
+            this.ma_qty.CutLength = null;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ma_qty.Location = new System.Drawing.Point(505, 60);
             this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_qty.MaximumSize = new System.Drawing.Size(200, 0);
             this.ma_qty.Name = "ma_qty";
             this.ma_qty.Size = new System.Drawing.Size(0, 27);
             this.ma_qty.TabIndex = 55;
@@ -477,9 +483,11 @@
             // mcd_inqty
             // 
             this.mcd_inqty.AutoSize = true;
+            this.mcd_inqty.CutLength = null;
             this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mcd_inqty.Location = new System.Drawing.Point(331, 16);
             this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_inqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.mcd_inqty.Name = "mcd_inqty";
             this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_inqty.TabIndex = 54;
@@ -488,9 +496,11 @@
             // ma_prodcode
             // 
             this.ma_prodcode.AutoSize = true;
+            this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ma_prodcode.Location = new System.Drawing.Point(126, 123);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ma_prodcode.TabIndex = 53;
@@ -647,10 +657,12 @@
             // ob_batchqty
             // 
             this.ob_batchqty.AutoSize = true;
+            this.ob_batchqty.CutLength = null;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ob_batchqty.ForeColor = System.Drawing.Color.Black;
             this.ob_batchqty.Location = new System.Drawing.Point(145, 65);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_batchqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Size = new System.Drawing.Size(0, 27);
             this.ob_batchqty.TabIndex = 75;
@@ -671,10 +683,12 @@
             // ob_nowcheckqty
             // 
             this.ob_nowcheckqty.AutoSize = true;
+            this.ob_nowcheckqty.CutLength = null;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ob_nowcheckqty.ForeColor = System.Drawing.Color.Black;
             this.ob_nowcheckqty.Location = new System.Drawing.Point(331, 65);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_nowcheckqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 27);
             this.ob_nowcheckqty.TabIndex = 73;

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -16,23 +16,14 @@ namespace UAS_MES.Make
     {
         DataHelper dh = null;
         DataTable dt = null;
-        //是否获取过参数，获取过参数则设置为true,在序号值变化的时候设置为false
-        //当前工序的编号
-        string ms_nextstepcode;
         //当前工序的名称
-        string ms_stepname;
-        //下一工序编号
-        //string ms_nextstepcode;
-        //工序编号
-        string ma_craftcode;
-        //制造单号
-        string ms_macode;
 
         string ErrorMessage = "";
         //用于保存是否之前输入的ms_sncode
         string LastSncode;
 
         string oMakeCode = "";
+
         string oMSID = "";
 
         LogStringBuilder sql = new LogStringBuilder();

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -100,7 +100,7 @@ namespace UAS_MES.OQC
                     //用户勾选的数据才进行操作
                     if (CheckTypeDGV.Rows[i].Cells["Choose"].FormattedValue.ToString() == "True")
                     {
-                        if (!(int.Parse(CheckTypeDGV.Rows[i].Cells["oi_sampleqty"].Value.ToString()) > int.Parse(ob_batchqty.Text == "" ? "0" : ob_batchqty.Text)))
+                        if (!(int.Parse(CheckTypeDGV.Rows[i].Cells["oi_sampleqty"].Value.ToString()) > int.Parse(ob_nowcheckqty.Text == "" ? "0" : ob_nowcheckqty.Text)))
                         {
                             oi_id.Add(CheckTypeDGV.Rows[i].Cells["oi_id"].Value.ToString());
                             ci_kind.Add(CheckTypeDGV.Rows[i].Cells["ci_kind"].Value.ToString());
@@ -119,7 +119,7 @@ namespace UAS_MES.OQC
                 {
                     sql.Clear();
                     sql.Append("insert into OQCItems(oi_id,oi_checkno, oi_projectcode,oi_batchqty ,oi_checkkind,oi_sampleqty,oi_itemcode) select ");
-                    sql.Append("OQCItems_seq.nextval,'" + ob_checkno.Text + "','" + ob_projectcode.Text + "','" + ob_batchqty.Text + "',:ci_kind,");
+                    sql.Append("OQCItems_seq.nextval,'" + ob_checkno.Text + "','" + ob_projectcode.Text + "','" + ob_nowcheckqty.Text + "',:ci_kind,");
                     sql.Append(":oi_sampleqty,ci_code from QUA_PROJECT left join QUA_PROJECTDETAIL on pd_prid=pr_id ");
                     sql.Append("LEFT JOIN QUA_CHECKITEM ON PD_CIID=CI_ID  where pr_code='" + ob_projectcode.Text + "' and ci_kind=:ci_kind1");
                     dh.BatchInsert(sql.GetString(), new string[] { "ci_kind", "oi_sampleqty", "ci_kind1" }, ci_kind.ToArray(), oi_sampleqty.ToArray(), ci_kind.ToArray());
@@ -201,7 +201,7 @@ namespace UAS_MES.OQC
                 {
                     for (int i = 0; i < dt.Rows.Count; i++)
                     {
-                        int batchqty = int.Parse(ob_batchqty.Text == "" ? "0" : ob_batchqty.Text);
+                        int batchqty = int.Parse(ob_nowcheckqty.Text == "" ? "0" : ob_nowcheckqty.Text);
                         int minqty = int.Parse(dt.Rows[i]["ad_minqty"].ToString());
                         int maxqty = int.Parse(dt.Rows[i]["ad_maxqty"].ToString());
                         if (batchqty > minqty && batchqty <= maxqty)

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.designer.cs

@@ -61,7 +61,7 @@
             this.ci_kind = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.oi_sampleqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_nowcheckqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
@@ -493,23 +493,23 @@
             this.ob_prodcode.TabIndex = 164;
             this.ob_prodcode.Tag = "NoAuto";
             // 
-            // ob_batchqty
-            // 
-            this.ob_batchqty.AllPower = null;
-            this.ob_batchqty.BackColor = System.Drawing.Color.White;
-            this.ob_batchqty.Enabled = false;
-            this.ob_batchqty.ID = null;
-            this.ob_batchqty.Location = new System.Drawing.Point(811, 110);
-            this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4);
-            this.ob_batchqty.Name = "ob_batchqty";
-            this.ob_batchqty.Power = null;
-            this.ob_batchqty.ReadOnly = true;
-            this.ob_batchqty.Size = new System.Drawing.Size(180, 25);
-            this.ob_batchqty.Str = null;
-            this.ob_batchqty.Str1 = null;
-            this.ob_batchqty.Str2 = null;
-            this.ob_batchqty.TabIndex = 160;
-            this.ob_batchqty.Tag = "NoAuto";
+            // ob_nowcheckqty
+            // 
+            this.ob_nowcheckqty.AllPower = null;
+            this.ob_nowcheckqty.BackColor = System.Drawing.Color.White;
+            this.ob_nowcheckqty.Enabled = false;
+            this.ob_nowcheckqty.ID = null;
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(811, 110);
+            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_nowcheckqty.Name = "ob_nowcheckqty";
+            this.ob_nowcheckqty.Power = null;
+            this.ob_nowcheckqty.ReadOnly = true;
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(180, 25);
+            this.ob_nowcheckqty.Str = null;
+            this.ob_nowcheckqty.Str1 = null;
+            this.ob_nowcheckqty.Str2 = null;
+            this.ob_nowcheckqty.TabIndex = 160;
+            this.ob_nowcheckqty.Tag = "ob_nowcheckqty";
             // 
             // obd_outboxcode
             // 
@@ -590,7 +590,7 @@
             this.Controls.Add(this.CheckTypeDGV);
             this.Controls.Add(this.ob_prodcode);
             this.Controls.Add(this.ob_prodcode_label);
-            this.Controls.Add(this.ob_batchqty);
+            this.Controls.Add(this.ob_nowcheckqty);
             this.Controls.Add(this.ob_batchqty_label);
             this.Controls.Add(this.obd_outboxcode);
             this.Controls.Add(this.obd_outboxcode_label);
@@ -626,7 +626,7 @@
         private System.Windows.Forms.Label label2;
         private CustomControl.TextBoxWithIcon.EnterTextBox obd_outboxcode;
         private System.Windows.Forms.Label obd_outboxcode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_batchqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_nowcheckqty;
         private System.Windows.Forms.Label ob_batchqty_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_prodcode;
         private System.Windows.Forms.Label ob_prodcode_label;

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.resx

@@ -526,4 +526,19 @@
   <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ci_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ci_kind.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -256,6 +256,7 @@ namespace UAS_MES.OQC
                         }
                         if (bc_name.Count > 0)
                         {
+                            dh.UpdateByCondition("makeserial", "ms_badtimes=ms_badtimes+1", "ms_sncode='"+sncode.Text+"'");
                             dh.ExecuteSql("delete from OQCNGReason where or_sncode='" + sncode.Text + "' and or_checkno='" + ob_checkno.Text + "'", "delete");
                             sql.Clear();
                             sql.Append("insert into OQCNGReason(or_id, or_checkno, or_makecode, or_sncode, or_reasoncode, oi_description, oi_remark)");

UAS-MES/PublicMethod/LogicHandler.cs

@@ -730,7 +730,7 @@ namespace UAS_MES.PublicMethod
                     break;
                 case "OQCPLANMAINTAIN":
                     sql.Clear();
-                    sql.Append("select ob_prodcode,ob_id,ob_checkno,ob_projectcode,ob_batchqty,ob_source,ob_remark,");
+                    sql.Append("select ob_prodcode,ob_id,ob_checkno,ob_projectcode,ob_nowcheckqty,ob_source,ob_remark,");
                     sql.Append("ob_status,pr_id,pr_detail,pr_kind,pr_manutype,pr_qualmethod,nvl(ob_aqlcode,pr_aql)ob_aqlcode from OQCBatch left join product on ");
                     sql.Append("pr_code=ob_prodcode where ob_checkno='" + iCheckNo + "'");
                     Form = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
@@ -1013,7 +1013,7 @@ namespace UAS_MES.PublicMethod
             sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSnCode + "'");
             dh.BatchInsert(sql.ToString(), new string[] { "bc_code", "bg_code", "bc_remark" }, iBadCode, iBadGroupCode, iBadRemark);
             //更新序列号已经采集的工序 ms_paststep 已采集数据，更新下一工序
-            dh.UpdateByCondition("makeserial", "ms_paststep = ms_paststep ||'," + StepCode + "',ms_status=3", "ms_sncode='" + iSnCode + "'");
+            dh.UpdateByCondition("makeserial", "ms_paststep = ms_paststep ||'," + StepCode + "',ms_status=3,ms_badtimes=ms_badtimes+1", "ms_sncode='" + iSnCode + "'");
             //如果存在送检批号则进行删除
             if (dh.CheckExist("oqcbatchdetail", "obd_sncode='"+iSnCode+"'"))
             {