简化查询核对

UAS_MES_WEIP/FunctionCode/Make/Make_EquiConnect.cs

@@ -257,15 +257,17 @@ namespace UAS_MES_NEW.Make
 
                 foreach (string str in snList)
                 {
-                    dt = (DataTable)dh.ExecuteSql($@"SELECT ms_makecode,ms_prodcode,cd_stepcode,cd_stepname,cd_stepno FROM makeserial,craft,craftdetail
-                        WHERE ms_sncode = '{str}' AND ms_prodcode = cr_prodcode AND cr_id = cd_crid AND cd_stepno = 1 ORDER BY cd_stepno", "select");
+                    /*dt = (DataTable)dh.ExecuteSql($@"SELECT ms_makecode,ms_prodcode,cd_stepcode,cd_stepname,cd_stepno FROM makeserial,craft,craftdetail
+                        WHERE ms_sncode = '{str}' AND ms_prodcode = cr_prodcode AND cr_id = cd_crid AND cd_stepno = 1 ORDER BY cd_stepno", "select");*/
+
+                    dt = (DataTable)dh.ExecuteSql($"SELECT ms_makecode,ms_prodcode,ms_stepcode,ms_stepname from makeserial where ms_sncode = '{str}'", "select");
                     if (dt.Rows.Count == 0)
                     {
                         ShowMsg(0, $"拼板号:{SNVal.Text} 中序列号:{str} 无归属记录,请过投入站后再采集Xray信息");
                         return;
                     }
 
-                    dt = (DataTable)dh.ExecuteSql($@"SELECT mp_linecode FROM makeprocess WHERE mp_sncode = '{str}' AND mp_stepcode = '{dt.Rows[0]["cd_stepcode"]}'", "select");
+                    dt = (DataTable)dh.ExecuteSql($@"SELECT mp_linecode FROM makeprocess WHERE mp_sncode = '{str}' AND mp_stepcode = '{dt.Rows[0]["ms_stepcode"]}'", "select");
                     if (dt.Rows.Count == 0)
                     {
                         ShowMsg(0, $"拼板号:{SNVal.Text} 中序列号:{str} 无投入过站记录,请过投入站后再采集Xray信息");
@@ -288,15 +290,17 @@ namespace UAS_MES_NEW.Make
             }
             else
             {
-                dt = (DataTable)dh.ExecuteSql($@"SELECT ms_makecode,ms_prodcode,cd_stepcode,cd_stepname,cd_stepno FROM makeserial,craft,craftdetail
-                WHERE ms_sncode = '{SNVal.Text}' AND ms_prodcode = cr_prodcode AND cr_id = cd_crid AND cd_stepno = 1 ORDER BY cd_stepno", "select");
+                /*dt = (DataTable)dh.ExecuteSql($@"SELECT ms_makecode,ms_prodcode,cd_stepcode,cd_stepname,cd_stepno FROM makeserial,craft,craftdetail
+                WHERE ms_sncode = '{SNVal.Text}' AND ms_prodcode = cr_prodcode AND cr_id = cd_crid AND cd_stepno = 1 ORDER BY cd_stepno", "select");*/
+
+                dt = (DataTable)dh.ExecuteSql($"SELECT ms_makecode,ms_prodcode,ms_stepcode,ms_stepname from makeserial where ms_sncode = '{SNVal.Text}'", "select");
                 if (dt.Rows.Count == 0)
                 {
                     ShowMsg(0, $"序列号:{SNVal.Text} 无归属记录,请过投入站后再采集Xray信息");
                     return;
                 }
 
-                dt = (DataTable)dh.ExecuteSql($@"SELECT mp_linecode FROM makeprocess WHERE mp_sncode = '{SNVal.Text}' AND mp_stepcode = '{dt.Rows[0]["cd_stepcode"]}'", "select");
+                dt = (DataTable)dh.ExecuteSql($@"SELECT mp_linecode FROM makeprocess WHERE mp_sncode = '{SNVal.Text}' AND mp_stepcode = '{dt.Rows[0]["ms_stepcode"]}'", "select");
                 if (dt.Rows.Count == 0)
                 {
                     ShowMsg(0, $"序列号:{SNVal.Text} 无投入过站记录,请过投入站后再采集Xray信息");