拆解处理界面：对于存在更换bom版本以及途程编号的情况，工序bom取最新bom

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -34,6 +34,8 @@ namespace UAS_MES.Make
 
         //Bom版本
         string ms_bomversion;
+        string ms_craftcode_;
+        string ms_prodcode_;
 
         int rowindex;
 
@@ -250,12 +252,14 @@ namespace UAS_MES.Make
                         {
                             dt1 = new DataTable();
                             sql.Clear();
-                            sql.Append("select nvl(ms_bomversion,ma_bomversion) ms_bomversion from makeserial left join make on ma_code=ms_makecode ");
+                            sql.Append("select nvl(ms_bomversion,ma_bomversion) ms_bomversion,ms_craftcode,ms_prodcode from makeserial left join make on ma_code=ms_makecode ");
                             sql.Append("left join product on ms_prodcode=pr_code where ms_makecode='" + LabelDataGridView.Rows[i].Cells["cm_makecode"].Value + "' order by ms_id desc");
                             dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt1.Rows.Count > 0)
                             {
-                                ms_bomversion = dt1.Rows[0][0].ToString();
+                                ms_bomversion = dt1.Rows[0]["ms_bomversion"].ToString();
+                                ms_craftcode_ = dt1.Rows[0]["ms_craftcode"].ToString();
+                                ms_prodcode_ = dt1.Rows[0]["ms_prodcode"].ToString();
                             }
                             dtbar = new DataTable();
                             sql.Clear();
@@ -263,7 +267,7 @@ namespace UAS_MES.Make
                             sql.Append("sp_barcoderule, min(sp_checksalecode)sp_checksalecode,sp_tracekind,wm_concat(sp_soncode) sp_soncode,max(sp_ifuseregex)sp_ifuseregex,max(sp_ifforsn)");
                             sql.Append("sp_ifforsn,max(sp_length)sp_length,max(sp_type)sp_type,replace(wm_concat(sp_prefix),',','|')sp_prefix,max(sp_regex)");
                             sql.Append("sp_regex,max(pr_detail)pr_detail from stepproduct left join product on pr_code=sp_fsoncode where ");
-                            sql.Append("sp_bomversion='" + ms_bomversion + "' and  sp_craftcode='" + LabelDataGridView.Rows[i].Cells["cm_craftcode"].Value + "'and sp_mothercode ='" + LabelDataGridView.Rows[i].Cells["cm_maprodcode"].Value + "'");
+                            sql.Append("sp_bomversion='" + ms_bomversion + "' and  sp_craftcode='" + ms_craftcode_ + "'and sp_mothercode ='" + ms_prodcode_ + "'");
                             sql.Append(" group by sp_fsoncode,sp_tracekind  order by SP_DETNO asc");
                             dtbar = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             DataRow[] dtrows = dtbar.Select("sp_soncode like '" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "'");