拆解处理更新

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -39,6 +39,7 @@ namespace UAS_MES.Make
 
         //记录当前输入框的值
         string sncode_1;
+        string sncode_2;
         string[] bccode;
         string[] bgcode;
         string[] id;
@@ -78,14 +79,7 @@ namespace UAS_MES.Make
                     if (dt.Rows[0]["ms_status"].ToString() != "0" && dt.Rows[0]["ms_status"].ToString() != "1")
                     {
                         BaseUtil.SetFormValue(this.Controls, dt);
-                        if (dt.Rows[0]["ms_firstsn"].ToString() == "")
-                        {
-                            LoadData(ms_makecode.Text, sender, e);
-                        }
-                        else
-                        {
-                            LoadData(dt.Rows[0]["ms_firstsn"].ToString(), sender, e);
-                        }
+                        LoadData(ms_sncode.Text, dt.Rows[0]["ms_firstsn"].ToString(), sender, e);
                         GetItem();
                     }
                     else
@@ -121,12 +115,13 @@ namespace UAS_MES.Make
         }
 
         //加载此序列号上料记录
-        private void LoadData(string sncode, object sender, KeyEventArgs e)
+        private void LoadData(string sncode,string firstsn, object sender, KeyEventArgs e)
         {
             sncode_1 = sncode;
+            sncode_2 = firstsn;
             sql.Clear();
             sql.Append("select cm_sncode,cm_maprodcode,cm_maid,cm_id,cm_soncode,cm_barcode,pr_detail,cm_materialtype from craftmaterial left join product on pr_code=cm_soncode where");
-            sql.Append(" cm_sncode='" + sncode_1 + "' and cm_maprodcode='" + ms_prodcode.Text + "' and  nvl(cm_status,0)='0'");
+            sql.Append(" (cm_sncode='" + sncode_1 + "'or cm_sncode = '"+ firstsn + "' ) and cm_maprodcode='" + ms_prodcode.Text + "' and  nvl(cm_status,0)='0'");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)
             {
@@ -235,7 +230,7 @@ namespace UAS_MES.Make
                                     if (!LogicHandler.CheckSNBeforeLoad(ms_makecode.Text, LabelDataGridView.Rows[i].Cells["New_BarCode"].Value.ToString(), sp_soncode, sp_barcoderule, sp_prefix, length, out ErrorMessage))
                                     {
                                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                                        LoadData(sncode_1, sender, new KeyEventArgs(Keys.Enter));
+                                        LoadData(sncode_1, sncode_2, sender, new KeyEventArgs(Keys.Enter));
                                         continue;
                                     }
                                 }
@@ -355,7 +350,7 @@ namespace UAS_MES.Make
             {
                 count++;
                 deccount.Text = count + "";
-                LoadData(sncode_1, sender, new KeyEventArgs(Keys.Enter));
+                LoadData(sncode_1, sncode_2, sender, new KeyEventArgs(Keys.Enter));
             }
             else
             {