关联查询字段

UAS_MES_XZC/FunctionCode/Query/Query_ExeProgress.cs

@@ -56,7 +56,7 @@ namespace UAS_MES_NEW.Query
 
         private void Query_ExeProgress_SizeChanged(object sender, EventArgs e)
         {
-           // asc.controlAutoSize(this);
+            // asc.controlAutoSize(this);
         }
 
         private void sn_code_KeyDown(object sender, KeyEventArgs e)
@@ -67,12 +67,12 @@ namespace UAS_MES_NEW.Query
                 if (ms_id.Rows.Count > 0)
                 {
                     //说明有过转号
-                    ms_id = (DataTable)dh.ExecuteSql("select ms_id,ms_makecode,ms_checkno,ms_outboxcode from makeserial where ms_sncode='" + ms_id.Rows[0]["beforesn"].ToString() + "' or ms_sncode='" + ms_id.Rows[0]["sn"].ToString() + "' order by ms_id", "select");
+                    ms_id = (DataTable)dh.ExecuteSql("select ms_id,ms_makecode,ms_checkno,ms_outboxcode from makeserial where ms_sncode='" + ms_id.Rows[0]["beforesn"].ToString() + "' or ms_mccode='" + sn_code.Text + "' or ms_sncode='" + ms_id.Rows[0]["sn"].ToString() + "' order by ms_id", "select");
                 }
                 else
                 {
                     //没有过转号
-                    ms_id = (DataTable)dh.ExecuteSql("select ms_id,ms_makecode,ms_checkno,ms_outboxcode from makeserial where ms_sncode='" + sn_code.Text + "' order by ms_id", "select");
+                    ms_id = (DataTable)dh.ExecuteSql("select ms_id,ms_makecode,ms_checkno,ms_outboxcode from makeserial where ms_sncode='" + sn_code.Text + "' or ms_mccode='" + sn_code.Text + "' order by ms_id", "select");
                 }
                 if (ms_id.Rows.Count == 0)
                 {
@@ -84,7 +84,7 @@ namespace UAS_MES_NEW.Query
                 //设置界面工单号
                 ma_code.Text = ms_id.Rows[ms_id.Rows.Count - 1]["ms_makecode"].ToString();
                 ms_checkno.Text = ms_id.Rows[ms_id.Rows.Count - 1]["ms_checkno"].ToString();
-                pallet.Text = dh.getFieldDataByCondition("mes_package_view", "v_outboxcode", "v_barcode = '"+sn_code.Text+"' and v_type = 3").ToString();
+                pallet.Text = dh.getFieldDataByCondition("mes_package_view", "v_outboxcode", "v_barcode = '" + sn_code.Text + "' and v_type = 3").ToString();
                 ms_outboxcode.Text = ms_id.Rows[ms_id.Rows.Count - 1]["ms_outboxcode"].ToString();
                 int idCount = ms_id.Rows.Count;
                 for (int i = 0; i < idCount; i++)
@@ -219,16 +219,16 @@ namespace UAS_MES_NEW.Query
                                 }
                                 else
                                 {
-                                        //通过加绿色
-                                        if (PastStep.Contains(dt.Rows[i]["CD_STEPCODE"].ToString())&&passed)
-                                        {
-                                            PaintColor.Add(Brushes.Green);
-                                        }
-                                        //不通过加白色
-                                        else
-                                        {
-                                            PaintColor.Add(Brushes.White);
-                                        }                                   
+                                    //通过加绿色
+                                    if (PastStep.Contains(dt.Rows[i]["CD_STEPCODE"].ToString()) && passed)
+                                    {
+                                        PaintColor.Add(Brushes.Green);
+                                    }
+                                    //不通过加白色
+                                    else
+                                    {
+                                        PaintColor.Add(Brushes.White);
+                                    }
                                 }
                             }
                             ////序列号下一步不为空
@@ -439,7 +439,7 @@ namespace UAS_MES_NEW.Query
         {
             if (e.KeyCode == Keys.Enter)
             {
-                dt = (DataTable)dh.ExecuteSql("select cm_sncode from craftmaterial where cm_barcode = '"+barcode.Text+ "' and cm_status =0 order by cm_id desc", "select");
+                dt = (DataTable)dh.ExecuteSql("select cm_sncode from craftmaterial where cm_barcode = '" + barcode.Text + "' and cm_status =0 order by cm_id desc", "select");
                 if (dt.Rows.Count == 0)
                 {
                     MessageBox.Show("未找到此零部件对应成品SN号");
@@ -453,7 +453,7 @@ namespace UAS_MES_NEW.Query
                     sn_code.Text = dt.Rows[0]["cm_sncode"].ToString();
                     sn_code_KeyDown(this, new KeyEventArgs(Keys.Enter));
                 }
-                
+
             }
         }
     }