更新流水号BUG调整

UAS-出货标签管理(泽天)/UAS_出货标签管理.cs

@@ -405,7 +405,7 @@ namespace UAS_LabelMachine
             }
             catch (Exception)
             {
-                dh.UpdateByCondition("RULEMAXNUM", "rmn_maxnumber='" + (MaxNum + 1) + "'", "rmn_nrcode='" + (NrCode == "" ? "Default" : NrCode) + "' and rmn_prefix='" + Prefix + "' and rmn_type='" + ReSetType + "'");
+                dh.UpdateByCondition("RULEMAXNUM", "rmn_maxnumber='" + (MaxNum + 1) + "'", "rmn_nrcode='" + (NrCode == "" ? "Default" : NrCode) + "' and rmn_prefix='" + Prefix + "' and NVL(rmn_type,' ')='" + ReSetType + "'");
                 CollectInputData();
                 return;
             }
@@ -503,7 +503,7 @@ namespace UAS_LabelMachine
                         pibid += PIBID[i];
                 }
                 if (!SingleLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
-                    SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
+                    SingleReport.Load(@"C:/打印标签/联讯发LP.frx");
                 for (int j = 0; j < SingleReport.Parameters.Count; j++)
                 {
                     SingleReport.SetParameterValue(SingleReport.Parameters[j].Name, "");
@@ -710,7 +710,7 @@ namespace UAS_LabelMachine
                     if (pibid != "")
                     {
                         if (!SingleLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
-                            SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
+                            SingleReport.Load(@"C:/打印标签/联讯发LP.frx");
                         for (int j = 0; j < SingleReport.Parameters.Count; j++)
                         {
                             SingleReport.SetParameterValue(SingleReport.Parameters[j].Name, "");
@@ -897,6 +897,9 @@ namespace UAS_LabelMachine
                             break;
                         }
                     }
+                }
+                else {
+
                 }
                 try
                 {
@@ -1309,7 +1312,7 @@ namespace UAS_LabelMachine
                 if (ComBoxClickChangeLabelDoc)
                 {
                     if (!SingleLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
-                        SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
+                        SingleReport.Load(@"C:/打印标签/联讯发LP.frx");
                 }
             }
             catch (Exception) { }
@@ -1713,7 +1716,7 @@ namespace UAS_LabelMachine
                         else
                         {
                             MaxNum = int.Parse(maxnum);
-                            dh.UpdateByCondition("RULEMAXNUM", "rmn_maxnumber='" + (MaxNum + Count) + "'", "rmn_nrcode='" + (NrCode == "" ? "Default" : NrCode) + "' and rmn_prefix='" + Prefix + "' and rmn_type='" + ReSetType + "'");
+                            dh.UpdateByCondition("RULEMAXNUM", "rmn_maxnumber='" + (MaxNum + Count) + "'", "rmn_nrcode='" + (NrCode == "" ? "Default" : NrCode) + "' and rmn_prefix='" + Prefix + "' and NVL(rmn_type,' ')='" + ReSetType + "'");
                         }
                         SerialNumLength = int.Parse(Nr.Rows[m]["nrd_length"].ToString());
                         Radix = int.Parse(Nr.Rows[m]["nrd_radix"].ToString());
@@ -2114,6 +2117,7 @@ namespace UAS_LabelMachine
         private void AddNewOutBox_Click(object sender, EventArgs e)
         {
             OutBoxNum.Text = "新增";
+            SelectRowIndex = -1;
         }
 
         private void GetPDdata_Click(object sender, EventArgs e)