获取返工抽检批

UAS-MES/PublicMethod/LogicHandler.cs

@@ -324,7 +324,8 @@ namespace UAS_MES.PublicMethod
                 return GetBatch(iCheckNo, iOQCStep, out oErrorMessage);
             else if (iSnCode != "")
             {
-                SQL = "select ms_checkno from makeserial where ms_id=(select max(ms_id) from makeserial where  ms_sncode='" + iSnCode + "' or ms_psn='" + iSnCode + "')";
+                //如果返工批次为空则获取当前的批次
+                SQL = "select nvl(MS_REWORKCHECKNO,ms_checkno)ms_checkno from makeserial where ms_id=(select max(ms_id) from makeserial where  ms_sncode='" + iSnCode + "' or ms_psn='" + iSnCode + "')";
                 dt = (DataTable)dh.ExecuteSql(SQL, "select");
                 if (dt.Rows.Count == 0)
                 {