Merge repos.ubtob.net:usoft/mes-client

UAS_MES_YTDZ/FunctionCode/Make/Make_FirstInspect.cs

@@ -322,8 +322,11 @@ namespace UAS_MES_NEW.Make
                         }
                     }
                 }
-                string sr_id = dh.getFieldDataByCondition("spotcheckrecord", "sr_id", $"sr_makecode = '{workOrder}' and sr_linecode = '{line}' and sr_type='首件检验'").ToString();
+                //string sr_id = dh.getFieldDataByCondition("spotcheckrecord", "sr_id", $"sr_makecode = '{workOrder}' and sr_linecode = '{line}' and sr_type='首件检验'").ToString();
 
+                dt = (DataTable)dh.ExecuteSql($@"SELECT * FROM( SELECT * FROM spotche