Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -90,7 +90,7 @@ namespace UAS_MES.OQC
                             break;
                         default:
                             break;
-                    }
+                    }             
                 }
                 else
                 {
@@ -103,6 +103,7 @@ namespace UAS_MES.OQC
                     WithdrawRejection.Enabled = false;
                     OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                 }
+              
             }
             else
             {

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -146,6 +146,7 @@ namespace UAS_MES.OQC
                     sql.Append(":oi_sampleqty,ci_code from QUA_PROJECT left join QUA_PROJECTDETAIL on pd_prid=pr_id ");
                     sql.Append("LEFT JOIN QUA_CHECKITEM ON PD_CIID=CI_ID  where pr_code='" + ob_projectcode.Text + "' and ci_kind=:ci_kind1");
                     dh.BatchInsert(sql.GetString(), new string[] { "ci_kind", "oi_sampleqty", "ci_kind1" }, ci_kind.ToArray(), oi_sampleqty.ToArray(), ci_kind.ToArray());
+                    LogicHandler.DoCommandLog(User.UserCode, "", User.UserLineCode, User.UserSourceCode, "OQC抽样计划采集保存抽样计划", "成功", ms_sncode.Text, ob_checkno.Text);
                 }
                 GetBatch.PerformClick();
                 OperateResult.AppendText(">>保存成功\n", Color.Green);

UAS-MES/PublicMethod/LogicHandler.cs

@@ -460,7 +460,7 @@ namespace UAS_MES.PublicMethod
             sql.Append("insert into commandlog(cl_id,cl_man,cl_date,cl_linecode,cl_sourcecode,cl_makecode,cl_operate,");
             sql.Append("cl_result,cl_sncode,cl_code) values(commandlog_seq.nextval,:iUserCode,sysdate,:iLineCode ,");
             sql.Append(":iSourceCode ,:iMakeCode,:iOperate,:iResult,:iSncode,:iCheckno )");
-            dh.ExecuteSql(sql.ToString(), "insert", iUserCode, iMakeCode, iLineCode, iSourceCode, iOperate, iResult, iSncode, iCheckno);
+            dh.ExecuteSql(sql.ToString(), "insert", iUserCode, iLineCode, iSourceCode, iMakeCode, iOperate, iResult, iSncode, iCheckno);
         }
 
         /// <summary>