解绑SN替换

UAS_MES_JWS/FunctionCode/Make/Make_ChangeCode.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_NEW.Warehouse
+namespace UAS_MES_NEW.Make
 {
     partial class Make_ChangeCode
     {
@@ -65,7 +65,6 @@
             this.Confirm.TabIndex = 1;
             this.Confirm.Text = "确认";
             this.Confirm.UseVisualStyleBackColor = false;
-            this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
             // 
             // SNCode
             // 

UAS_MES_JWS/FunctionCode/Make/Make_ChangeCode.cs

@@ -11,7 +11,7 @@ using UAS_MES_NEW.DataOperate;
 using UAS_MES_NEW.Entity;
 using UAS_MES_NEW.PublicMethod;
 
-namespace UAS_MES_NEW.Warehouse
+namespace UAS_MES_NEW.Make
 {
     public partial class Make_ChangeCode : CustomControl.BaseForm.BaseForm
     {
@@ -41,13 +41,6 @@ namespace UAS_MES_NEW.Warehouse
             this.sncode = sncode;
         }
 
-        private void Confirm_Click(object sender, EventArgs e)
-        {
-            generate = false;
-          
-            MessageBox.Show("添加出货单成功");
-            generate = true;
-        }
 
         private void Warehouse_NewPiInOut_Load(object sender, EventArgs e)
         {

UAS_MES_JWS/FunctionCode/Make/Make_TestCollection.cs

@@ -863,26 +863,35 @@ namespace UAS_MES_NEW.Make
         {
 
         }
-
+        Make_ChangeCode form;
         private void ReleaseSN_Click(object sender, EventArgs e)
         {
             Save_Click(sender, e);
             DataTable dt = (DataTable)dh.ExecuteSql("select ms_sncode,ms_makecode  from makeserial where ms_id='" + oMSID + "'", "select");
             if (dt.Rows.Count > 0)
             {
-         
                 string ms_sncode = dt.Rows[0]["ms_sncode"].ToString();
+                form = new Make_ChangeCode(ms_sncode);
+                form.Controls["Confirm"].Click += Make_TestCollection_Click;
+                form.StartPosition = FormStartPosition.CenterScreen;
+                form.ShowDialog();
+                string changesncode = form.Controls["note"].Text;
                 string ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
                 dh.ExecuteSql("delete from sninfo where si_sn='" + ms_sncode + "'", "delete");
                 dh.ExecuteSql("delete from makesnrelation where sn='" + ms_sncode + "' and makecode='" + ms_makecode + "'", "delete");
-                dh.ExecuteSql("update makeserial set  ms_nextstepcode='B_CHANGE',ms_status=1,ms_sncode=ms_firstsn,ms_imei1='',ms_mac='',ms_bt='',ms_netcode='',ms_imei2='',ms_beforesn='' where ms_sncode='" + ms_sncode + "' and ms_makecode='" + ma_code.Text + "'", "update");
+                dh.ExecuteSql("update makeserial set  ms_sncode='" + changesncode + "',ms_beforesn=ms_sncode where ms_sncode='" + ms_sncode + "' and ms_makecode='" + ma_code.Text + "'", "update");
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "解绑", "解绑成功", ms_sncode, ob_checkno.Text);
-                OperateResult.AppendText(">>" + ms_sncode + "解绑成功\n", Color.Green);
+                OperateResult.AppendText(">>" + ms_sncode + "替换" + changesncode + "成功\n", Color.Green);
             }
             else
             {
                 OperateResult.AppendText(">>" + ms_sncode.Text + "没有需要解绑的内容\n", Color.Red);
             }
         }
+
+        private void Make_TestCollection_Click(object sender, EventArgs e)
+        {
+            form.Close();
+        }
     }
 }

UAS_MES_JWS/FunctionCode/Packing/Packing_PackageCollection.cs

@@ -346,8 +346,9 @@ namespace UAS_MES_NEW.Packing
                                 if (AutoGenBoxCode.Checked && (pa_status.Text == "1" || pa_status.Text == "" || pa_status.Text == "0"))
                                 {
                                     pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", ms_makecode, pr_code.Text, User.UserCode);
-                                    if (dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "'")) {
-                                        OperateResult.AppendText(">>箱号"+ pa_outboxcode.Text + "已生成，不允许重复使用\n", Color.Red, sn_code);
+                                    if (dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "'"))
+                                    {
+                                        OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "已生成，不允许重复使用\n", Color.Red, sn_code);
                                         pa_outboxcode.Text = "";
                                         return;
                                     }
@@ -898,7 +899,7 @@ namespace UAS_MES_NEW.Packing
                                     dh.ExecuteSql("update package set pa_checkno='',pa_prodcode='',pa_packtype='',pa_salecode='',pa_packageqty=0,pa_totalqty=0,pa_currentqty=0,pa_status=0 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                                 pa_status.Text = "0";
                                 //删除箱的明细
-                                dh.ExecuteSql("delete from labelprintlog where lpl_value='"+pa_outboxcode.Text+"'","delete");
+                                dh.ExecuteSql("delete from labelprintlog where lpl_value='" + pa_outboxcode.Text + "'", "delete");
                                 dh.ExecuteSql("delete from packagedetail where pd_outboxcode='" + pa_outboxcode.Text + "'", "delete");
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "卡通箱拆解", "成功", pa_outboxcode.Text, ob_checkno.Text);
                                 OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "成功拆解!\n", Color.Green);