修改抽样数据采集取工单号信息

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -114,7 +114,7 @@ namespace UAS_MES.OQC
                 //判断当前的检验状态
                 if (ob_status.Text == "待检验" || ob_status.Text == "检验中")
                 {
-                    dt = (DataTable)dh.ExecuteSql("select obd_sncode,ob_source,ob_makecode from OQCBatchDetail left join OQCBatch  on ob_id=obd_obid where obd_sncode='" + sncode.Text + "' and ob_checkno='" + ob_checkno.Text + "'", "select");
+                    dt = (DataTable)dh.ExecuteSql("select obd_sncode,ob_source,obd_makecode from OQCBatchDetail left join OQCBatch  on ob_id=obd_obid where obd_sncode='" + sncode.Text + "' and ob_checkno='" + ob_checkno.Text + "'", "select");
                     if (dt.Rows.Count > 0)
                     {
                         if (dt.Rows[0]["ob_source"].ToString() != "工序")
@@ -126,7 +126,7 @@ namespace UAS_MES.OQC
                             string ErrorMessage = "";
                             string oMakeCode = "";
                             string oMsID = "";
-                            if (LogicHandler.CheckStepSNAndMacode(dt.Rows[0]["ob_makecode"].ToString(), User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
+                            if (LogicHandler.CheckStepSNAndMacode(dt.Rows[0]["obd_makecode"].ToString(), User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
                             {
                                 return true;
                             }

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1380,7 +1380,7 @@ namespace UAS_MES.PublicMethod
                         }
                         else
                         {
-                            dh.UpdateByCondition("makeserial", "ms_nextmacode='"+iMakeCode+"'", "ms_id=(select max(ms_id) from makeserial where ms_sncode='"+iSN+"')");
+                            dh.UpdateByCondition("makeserial", "ms_nextmacode='" + iMakeCode + "'", "ms_id=(select max(ms_id) from makeserial where ms_sncode='" + iSN + "')");
                             return true;
                         }
                     }
@@ -1406,9 +1406,9 @@ namespace UAS_MES.PublicMethod
                         {
                             return true;
                         }
-                        else ErrMessage = "长度不匹配";
+                        else ErrMessage = iSN + "长度不匹配";
                     }
-                    else ErrMessage = "前缀不匹配";
+                    else ErrMessage = iSN + "前缀不匹配";
                     break;
                 default:
                     break;