拆解物料逻辑修改

UAS_MES_JC/FunctionCode/Make/Make_Decompose_Ex.cs

@@ -383,7 +383,7 @@ namespace UAS_MES_NEW.Make
                             {
                                 //判断生产信息
                                 sql.Clear();
-                                sql.Append("select ms_id,ms_sncode,cm_barcode from craftmaterial left join makeserial on cm_barcode = ms_sncode and cm_soncode = ms_prodcode where cm_id = '" + LabelDataGridView.Rows[i].Cells["cm_id"].Value + "' and cm_materialtype ='1' and ms_id>'0' and ms_nextmacode = '" + LabelDataGridView.Rows[i].Cells["cm_makecode"].Value.ToString() + "'");
+                                sql.Append("select ms_id,ms_sncode,cm_barcode from craftmaterial left join makeserial on cm_barcode = ms_sncode and cm_soncode = ms_prodcode where cm_id = '" + LabelDataGridView.Rows[i].Cells["cm_id"].Value + "' and cm_materialtype ='1' and ms_id>'0' ");
                                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                 //制造件
                                 if (dt.Rows.Count > 0)