重新转号删除语句加工单条件

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

@@ -184,6 +184,7 @@
             this.printButton.TabIndex = 192;
             this.printButton.Text = "打印";
             this.printButton.UseVisualStyleBackColor = false;
+            this.printButton.Click += new System.EventHandler(this.printButton_Click);
             // 
             // pr_code
             // 

UAS-MES/FunctionCode/Make/Make_CustomLabelPrint.cs

@@ -45,6 +45,8 @@ namespace UAS_MES.Make
         System.DateTime[] indate;
 
         StringBuilder sb = new StringBuilder();
+
+        bool canPrint = false;
         public Make_CustomLabelPrint()
         {
             InitializeComponent();
@@ -164,6 +166,7 @@ namespace UAS_MES.Make
                     if (currentIndex == paramsInfo.Rows.Count)
                     {
                         OperateResult.AppendText("<<输入完成，正在打印\n", Color.Black,inputText);
+                        canPrint = true;
                         //打印
                         LogManager.DoLog(sb.ToString());
                         //保存本次赋值进行打印
@@ -183,6 +186,7 @@ namespace UAS_MES.Make
                     }
                     else
                     {
+                        canPrint = false;
                         currentIndex++;
                         OperateResult.AppendText("<<请输入自定义模板的" + paramsInfo.Rows[currentIndex - 1]["lp_name"].ToString() + "\n", Color.Green,inputText);
                     }
@@ -252,5 +256,10 @@ namespace UAS_MES.Make
         {
             //pr_code_KeyDown(sender, new KeyEventArgs(Keys.Enter));
         }
+
+        private void printButton_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -414,7 +414,7 @@ namespace UAS_MES.Make
                             //记录本次修改，存入makesnrelation表中
                             updateSql = "update makeserial set ms_sncode='" + SN + "'," + s1.Remove(s1.Length - 1, 1).ToString() + " where ms_beforesn='" + TSN + "' and ms_id='" + oMsid + "'";
                             //删除最近一条转换记录
-                            dh.ExecuteSql("delete from makesnrelation where BEFORESN='" + TSN + "'", "delete");
+                            dh.ExecuteSql("delete from makesnrelation where BEFORESN='" + TSN + "' and makecode='" + oMakecode + "'", "delete");
                         }
                         //未勾选修改转换结果
                         else

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -199,7 +199,7 @@ namespace UAS_MES.Make
                                         //记录本次修改，存入makesnrelation表中
                                         updateSql = "update makeserial set ms_sncode='" + sncode.Text + "' where ms_beforesn='" + bsncode + "' and ms_id='" + oMsId + "'";
                                         //删除最近一条转换记录
-                                        dh.ExecuteSql("delete from makesnrelation where BEFORESN='"+bsncode+"'", "delete");
+                                        dh.ExecuteSql("delete from makesnrelation where BEFORESN='"+bsncode+"' and makecode='"+oMakeCode+"'", "delete");
                                     }
                                     //未勾选修改转换结果
                                     else