工单切换按照工装篮，解绑过站逻辑修改

UAS_MES_XMW/FunctionCode/Make/Make_BoxLotBind.Designer.cs

@@ -418,7 +418,7 @@
             this.Load += new System.EventHandler(this.Make_CollectNetCode_Load);
             this.SizeChanged += new System.EventHandler(this.Make_CollectNetCode_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_XMW/FunctionCode/Make/Make_BoxLotBindSingle.Designer.cs

@@ -418,7 +418,7 @@
             this.Load += new System.EventHandler(this.Make_CollectNetCode_Load);
             this.SizeChanged += new System.EventHandler(this.Make_CollectNetCode_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_XMW/FunctionCode/Make/Make_BoxLotBindSingle.cs

@@ -96,7 +96,7 @@ namespace UAS_MES_NEW.Make
                     OperateResult.AppendText(">>箱号" + boxcode.Text + "下一工序" + boxnextstepcode + ",序列号下一工序" + nextstepcode + ",不允许绑定\n", Color.Red);
                     return;
                 }
-                dh.ExecuteSql("update makeserial set ms_boxcode='" + boxcode.Text + "',ms_lotno='" + lotno + "' where ms_id='" + ms_id + "'", "");
+                dh.ExecuteSql("update makeserial set ms_boxcode='" + boxcode.Text + "',ms_lotno='" + lotno + "' where ms_id='" + ms_id + "'", "update");
                 OperateResult.AppendText(">>SN" + sncode.Text + "绑定箱号" + boxcode.Text + "成功\n", Color.Red);
                 dt = (DataTable)dh.ExecuteSql("select ms_sncode,ms_boxcode,ms_lotno,ms_nextstepcode from makeserial where ms_boxcode='" + boxcode.Text + "'", "select");
                 BaseUtil.FillDgvWithDataTable(LabelDataGridView, dt);

UAS_MES_XMW/FunctionCode/Make/Make_BoxLotRelease.Designer.cs

@@ -290,7 +290,7 @@
             this.Activated += new System.EventHandler(this.Make_CollectNetCode_Activated);
             this.Load += new System.EventHandler(this.Make_CollectNetCode_Load);
             this.SizeChanged += new System.EventHandler(this.Make_CollectNetCode_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_XMW/FunctionCode/Make/Make_BoxStepPass.Designer.cs

@@ -345,7 +345,7 @@
             this.Load += new System.EventHandler(this.Make_CollectNetCode_Load);
             this.SizeChanged += new System.EventHandler(this.Make_CollectNetCode_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_XMW/FunctionCode/Make/Make_FeedingCollection.Designer.cs

@@ -770,7 +770,7 @@
             this.SizeChanged += new System.EventHandler(this.Make_FeedingCollection_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_XMW/FunctionCode/Make/Make_MakeDown.Designer.cs

@@ -404,7 +404,7 @@
             this.Load += new System.EventHandler(this.Make_MakeDown_Load);
             this.SizeChanged += new System.EventHandler(this.Make_MakeDown_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_XMW/FunctionCode/Make/Make_TestCollection_Param.cs

@@ -571,7 +571,7 @@ namespace UAS_MES_NEW.Make
                     {
                         dh.UpdateByCondition("steppassed", "sp_result='不良品',sp_ifng=-1,sp_ymd=to_char(sysdate,'yyyymmdd'),sp_hm=to_char(sysdate,'hh24miss')", "sp_id=(select max(sp_id) from steppassed where sp_sncode='" + ms_sncode.Text + "')");
                         dh.UpdateByCondition("makecraftdetail", "mcd_okqty=mcd_okqty-1", "mcd_macode='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
-                        dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_boxcode='',ms_lotno='',ms_badtimes=nvl(ms_badtimes,0)+1", "ms_id='" + oMSID + "'");
+                        dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_status=3,ms_boxcode='',ms_lotno='',ms_badtimes=nvl(ms_badtimes,0)+1", "ms_id='" + oMSID + "'");
                         LogicHandler.InsertMakeProcess(ms_sncode.Text, ma_code.Text, User.UserSourceCode, "良品采集成不良", "测试不良", User.UserCode);
                         LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "测试不良", "良品采集成不良", ms_sncode.Text, ob_checkno.Text);
                     }

UAS_MES_XMW/FunctionCode/Special/Special_ChangeMakeCode.Designer.cs

@@ -307,7 +307,7 @@
             this.Tag = "Special!CancelCollection";
             this.Text = "取消采集";
             this.Load += new System.EventHandler(this.Special_CancelCollection_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }