Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/PublicMethod/LogicHandler.cs

@@ -4,6 +4,7 @@ using System.Data;
 using System.Text;
 using System.Windows;
 using UAS_MES.DataOperate;
+using UAS_MES.Entity;
 
 namespace UAS_MES.PublicMethod
 {
@@ -25,13 +26,13 @@ namespace UAS_MES.PublicMethod
         /// <param name="iFileName"></param>
         /// <param name="iLineCode"></param>
         /// <param name="iCombine"></param>
-        public static void AutoPassJudge(string iSN, string iMakeCode, string iSource, string iFileName, string iLineCode, string iCombine)
+        public static void AutoPassJudge(string iSN, string iMakeCode, string iSource, string iFileName, string iLineCode, string iCombine, string iStatus)
         {
             //插入不良判断记录
             sql.Clear();
             sql.Append("insert into AUTOSCAN_REJUDGE(asr_id,asr_indate,asr_filename,asr_combinecode,asr_sourcecode,");
-            sql.Append("asr_linecode,asr_makecode,asr_sncode) values(AUTOSCAN_REJUDGE_seq.nextval,sysdate,");
-            sql.Append("'" + iFileName + "','" + iCombine + "','" + iSource + "','" + iLineCode + "','" + iMakeCode + "','" + iSN + "')");
+            sql.Append("asr_linecode,asr_makecode,asr_rejdate,asr_sncode,asr_rejusername,asr_status) values(AUTOSCAN_REJUDGE_seq.nextval,sysdate,");
+            sql.Append("'" + iFileName + "','" + iCombine + "','" + iSource + "','" + iLineCode + "','" + iMakeCode + "',sysdate,'" + iSN + "','" + User.UserName + "','" + iStatus + "')");
             dh.ExecuteSql(sql.ToString(), "insert");
         }
 
@@ -870,7 +871,7 @@ namespace UAS_MES.PublicMethod
             GetStepCodeAndNameAndTypAndLineCodeBySource(iSourceCode, ref StepCode, ref StepName, ref ScanType, ref LineCode);
             if (ScanType == "REJUDGE")
             {
-                AutoPassJudge(iSnCode, iMakeCode, iSourceCode, "", LineCode, "");
+                AutoPassJudge(iSnCode, iMakeCode, iSourceCode, "", LineCode, "", "-1");
             }
             sql.Clear();
             sql.Append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");