修改条件可能不唯一的BUG

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -37,7 +37,7 @@ namespace UAS_MES.OQC
         {
             if (CheckStep())
             {
-                DataTable temp = dh.getFieldsDataByCondition("makeserial", new string[] { "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkcheckno" }, "upper(ms_sncode)='" + ms_sncode.Text.ToUpper() + "'");
+                DataTable temp = dh.getFieldsDatasByCondition("makeserial", new string[] { "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkcheckno" }, "upper(ms_sncode)='" + ms_sncode.Text.ToUpper() + "' order by ms_id desc");
                 if (temp.Rows.Count > 0)
                 {
                     if (temp.Rows[0]["ms_ifrework"].ToString() != "0")
@@ -308,47 +308,6 @@ namespace UAS_MES.OQC
             }
         }
 
-        ////记录操作日志
-        //private void DoLog(string Kind, string Result, string Type)
-        //{
-        //    LogicHandler.InsertMessageLog(User.UserName, Kind, Result, "OQCBATCH|ob_id=" + ob_id.Text + "", ob_checkno.Text);
-        //    if (ob_source.Text == "工序")
-        //    {
-        //        //如果是撤销操作则更新回上一工序
-        //        if (Type == "撤销")
-        //        {
-        //            List<string> sql = new List<string>();
-        //            //该序列号的批次数量
-        //            string batchqty = dh.getFieldDataByCondition("oqcbatch", "ob_nowcheckqty", "ob_checkno='" + ob_checkno.Text + "'").ToString();
-        //            //撤销时如果没有下一工序表示工单已经完工了,此时撤销需要将完工数减掉一个批次
-        //            if (dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_sncode='" + ms_sncode.Text + "'").ToString() == "")
-        //            {
-        //                sql.Add("update make set ma_madeqty=ma_madeqty-" + batchqty + " where ma_code='" + ob_makecode.Text + "'");
-        //            }
-        //            //获取上一步执行的工序
-        //            string PastCode = dh.getFieldDataByCondition("makeserial", "SUBSTR(ms_paststep,0,INSTR(ms_paststep,',', -1, 1)-1) ms_paststep", "ms_checkno='" + ob_checkno.Text + "' and ms_status<>3").ToString();
-        //            string[] LastStepCode = PastCode.Split(',');
-        //            sql.Add("update makeserial set ms_paststep=(select distinct SUBSTR(ms_paststep,0,INSTR(ms_paststep,',', -1, 1)-1)  from makeserial where ms_checkno='" + ob_checkno.Text + "' and ms_status<>3 and rownum=1) where ms_checkno='" + ob_checkno.Text + "' and ms_status<>3 ");
-        //            sql.Add("update makeserial set ms_stepcode='" + LastStepCode[LastStepCode.Length - 1] + "',ms_nextstepcode='" + User.CurrentStepCode + "',ms_status=1 where ms_checkno='" + ob_checkno.Text + "'");
-        //            sql.Add("update makecraftdetail set mcd_inqty=mcd_inqty-" + batchqty + ",mcd_outqty = mcd_outqty - " + batchqty + ",mcd_okqty = mcd_okqty -" + batchqty + " where mcd_macode='" + ob_makecode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
-        //            dh.ExecuteSQLTran(sql.ToArray());
-        //        }
-        //        else if (Type == "通过")
-        //        {
-        //            //更新下一工序
-        //            LogicHandler.UpdateOQCMessage(ms_sncode.Text, ob_checkno.Text, ob_makecode.Text, Kind, User.UserSourceCode, User.UserName, Result, out ErrorMessage);
-        //            sql.Clear();
-        //            sql.Append("insert into MakeProcess(mp_id,mp_makecode,mp_maid, mp_mscode,mp_sncode,mp_stepcode,mp_stepname,");
-        //            sql.Append("mp_craftcode,mp_craftname,mp_kind,mp_result,mp_indate,mp_inman,mp_wccode,mp_linecode,mp_sourcecode,mp_snstatus,mp_sncheckno,mp_snoutboxcode)");
-        //            sql.Append("select MakeProcess_seq.nextval, ma_code,ma_id,ms_code,ms_sncode,st_code,st_name,");
-        //            sql.Append("ma_craftcode,ma_craftname,'" + Kind + "','" + Result + "',sysdate,'" + User.UserCode + "',ma_wccode,'" + User.UserLineCode + "','" + User.UserSourceCode + "',");
-        //            sql.Append("ms_status,ms_checkno,ms_outboxcode from make left join makeserial on ms_makecode=ma_code left join step on st_code=ms_stepcode ");
-        //            sql.Append("where  ms_checkno='" + ob_checkno.Text + "' and st_code='" + User.CurrentStepCode + "'");
-        //            dh.ExecuteSql(sql.GetString(), "insert");
-        //        }
-        //    }
-        //}
-
         private void 抽检批维护_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -70,7 +70,7 @@ namespace UAS_MES.OQC
         {
             if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
             {
-                DataTable temp = dh.getFieldsDataByCondition("makeserial", new string[] { "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkcheckno" }, "upper(ms_sncode)='" + ms_sncode.Text.ToUpper() + "'");
+                DataTable temp = dh.getFieldsDatasByCondition("makeserial", new string[] { "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkcheckno" }, "upper(ms_sncode)='" + ms_sncode.Text.ToUpper() + "' order by ms_id desc");
                 if (temp.Rows.Count > 0)
                 {
                     if (temp.Rows[0]["ms_ifrework"].ToString() != "0")

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -49,7 +49,7 @@ namespace UAS_MES.OQC
         {
             if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
             {
-                DataTable temp = dh.getFieldsDataByCondition("makeserial", new string[] { "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkcheckno", "ms_reworkstatus" }, "upper(ms_sncode)='" + sncode.Text.ToUpper() + "'");
+                DataTable temp = dh.getFieldsDatasByCondition("makeserial", new string[] { "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkcheckno", "ms_reworkstatus" }, "upper(ms_sncode)='" + sncode.Text.ToUpper() + "' order by ms_id desc");
                 if (temp.Rows.Count > 0)
                 {
                     if (temp.Rows[0]["ms_reworkstatus"].ToString() == "3")