拆解处理工序BOM取值修改

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -33,7 +33,7 @@ namespace UAS_MES.Make
         int count;
 
         //Bom版本
-        string ma_bomversion;
+        string ms_bomversion;
 
         int rowindex;
 
@@ -250,12 +250,12 @@ namespace UAS_MES.Make
                         {
                             dt1 = new DataTable();
                             sql.Clear();
-                            sql.Append("select ma_bomversion from makeserial left join make on ma_code=ms_makecode ");
+                            sql.Append("select ms_bomversion 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)
                             {
-                                ma_bomversion = dt1.Rows[0][0].ToString();
+                                ms_bomversion = dt1.Rows[0][0].ToString();
                             }
                             dtbar = new DataTable();
                             sql.Clear();
@@ -263,7 +263,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='" + ma_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='" + LabelDataGridView.Rows[i].Cells["cm_craftcode"].Value + "'and sp_mothercode ='" + LabelDataGridView.Rows[i].Cells["cm_maprodcode"].Value + "'");
                             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 + "'");
@@ -321,7 +321,7 @@ namespace UAS_MES.Make
                                 //当前备料信息不再工序BOM中，为BOM之外的批管控物料备料
                                 if (!dh.CheckExist("makesourcestock", " (MSS_FPRODCODE = '" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value.ToString() + "' or MSS_PRODCODE = '" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value.ToString() + "') and mss_barcode = '" + LabelDataGridView.Rows[i].Cells["New_BarCode"].Value.ToString() + "'"))
                                 {
-                                    OperateResult.AppendText(">>物料" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value.ToString() + "不在当前工序BOM" + ma_bomversion + "中\n", Color.Black);
+                                    OperateResult.AppendText(">>物料" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value.ToString() + "不在当前工序BOM" + ms_bomversion + "中\n", Color.Black);
                                     OperateResult.AppendText(">>物料" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value.ToString() + "岗位备料无条码" + LabelDataGridView.Rows[i].Cells["New_BarCode"].Value.ToString() + "\n", Color.Red);
                                     continue;
                                 }