|
diff --git a/Web/forms/summary/fmSalaryCalc.ascx.cs b/Web/forms/summary/fmSalaryCalc.ascx.cs
index 881bd52..eb15641 100644
--- a/Web/forms/summary/fmSalaryCalc.ascx.cs
+++ b/Web/forms/summary/fmSalaryCalc.ascx.cs
@@ -1560,7 +1560,6 @@ public partial class forms_summary_fmSalaryCalc : Wellan.Web.UI.WUserControlBase
bool result = true;
aYYMM = CheckDate(lbYYMM.Text + "01", "", ref result, cvMessage);
- dsSACD.ConnectionString = ConnectionString;
dsSACD.SelectParameters["BPPYN"].DefaultValue = ddlRSPYN.SelectedValue;
dsSACD.SelectParameters["SAYMM"].DefaultValue = aYYMM.ToString(System.Globalization.CultureInfo.InvariantCulture);
GridView1.DataBind();
diff --git a/Web/forms/worker/fmBpsn.ascx b/Web/forms/worker/fmBpsn.ascx
index 9663456..9c507d4 100644
--- a/Web/forms/worker/fmBpsn.ascx
+++ b/Web/forms/worker/fmBpsn.ascx
@@ -215,12 +215,25 @@
TextMessageId="" Visible="False">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
= @TODAY))
- LEFT OUTER JOIN BPAA C ON B.RAPYN=C.BPPYN
- LEFT OUTER JOIN BCLS D ON D.BSCLS=B.RABRH AND D.BSPAR='BPSNBRH'
- LEFT OUTER JOIN BPJA E ON E.BPPYN=B.RAPYN AND E.BPJNO=B.RAJNO
- LEFT OUTER JOIN BPJB F ON F.BPPYN=B.RAPYN AND F.BPJNO=B.RAJNO AND F.BPCNO=B.RACNO
- LEFT OUTER JOIN RPIR G ON A.BPENO=G.RPENO AND G.RPREN=(SELECT MAX(RPREN) FROM RPIR WHERE RPENO=A.BPENO)
- LEFT OUTER JOIN RPIB H ON G.RPREN=H.RPREN AND H.RPITM=(SELECT MAX(RPITM) FROM RPIB WHERE RPREN=H.RPREN) ";
- private string where = " WHERE 1=1 ";
- // private string order = " ORDER BY BPENO ";
private bool fileOK = false;
internal BprmDAC bprmDAC;
@@ -163,7 +146,6 @@ public partial class forms_worker_fmBpsn : Wellan.Web.UI.WUserControlBase
dsBPSNForm.DeleteCommand = @"DELETE BPSN WHERE BPENO = @OLD_BPENO AND APPNO = @OLD_APPNO";
dsBPSNForm.ConnectionString = ConnectionString;
- dsBPSNGrid.ConnectionString = ConnectionString;
dsBPSN_BPTYP.ConnectionString = ConnectionString;
dsBPSN_BPGNR.ConnectionString = ConnectionString;
dsBPSN_BPSGR.ConnectionString = ConnectionString;
@@ -298,70 +280,27 @@ public partial class forms_worker_fmBpsn : Wellan.Web.UI.WUserControlBase
_BPEDY_TYPE = ddlBPEDY.SelectedValue;
_BPDPT_TYPE = ddlBPDPT.SelectedValue;
- StringBuilder sql = new StringBuilder();
- sql.Append(select);
- sql.Append(from);
- sql.Append(where);
- dsBPSNGrid.SelectParameters.Clear();
- dsBPSNGrid.SelectParameters.Add("TODAY", String.Format(WGuard1.InvariantCulture, "{0:yyyy-MM-dd}", DateTime.UtcNow.AddHours(8).Date));
- if (canSearch)
- {
- AddSearch(sql, dsBPSNGrid, "BPENO", _BPENO, "", true);
- AddSearch(sql, dsBPSNGrid, "BPNME", _BPNME, "", true);
- AddSearch(sql, dsBPSNGrid, "BPENM", _BPENM, "", true);
- AddSearch(sql, dsBPSNGrid, "BPIDN", _BPIDN, "", true);
- switch (_BPEDY_TYPE)
- {
- case "1":
- sql.Append(" AND (BPEDY IS NULL OR BPEDY >= @TODAY) ");
- break;
- case "2":
- sql.Append(" AND (BPEDY < @TODAY)");
- break;
- }
- switch (_BPDPT_TYPE)
- {
- case "1":
- sql.Append(String.Format(" AND BPDPT IN {0} ", PublicVariable.InnerDepartment));
- break;
- case "2":
- sql.Append(String.Format(" AND BPDPT NOT IN {0} ", PublicVariable.InnerDepartment));
- break;
- }
- AddSearch(sql, dsBPSNGrid, "BPSDY", _BPSDY1, _BPSDY2, true);
- AddSearch(sql, dsBPSNGrid, "BPEDY", _BPEDY1, _BPEDY2, true);
-
- if (!BpsnDAC.IsManager(UserId))
- {
- sql.Append(" AND BPENO NOT IN ('00001','00002','00003') ");
- }
- }
- else
- {
- AddSearch(sql, dsBPSNGrid, "BPENO", UserId, "", true);
- }
- // sql.Append(order);
- dsBPSNGrid.SelectCommand = sql.ToString();
+ dsBPSNGrid.SelectParameters["BPENO"].DefaultValue = _BPENO;
+ dsBPSNGrid.SelectParameters["BPNME"].DefaultValue = _BPNME;
+ dsBPSNGrid.SelectParameters["BPENM"].DefaultValue = _BPENM;
+ dsBPSNGrid.SelectParameters["BPIDN"].DefaultValue = _BPIDN;
+ dsBPSNGrid.SelectParameters["BPEDY_TYPE"].DefaultValue = _BPEDY_TYPE;
+ dsBPSNGrid.SelectParameters["BPDPT_TYPE"].DefaultValue = _BPDPT_TYPE;
+ dsBPSNGrid.SelectParameters["BPSDY1"].DefaultValue = _BPSDY1;
+ dsBPSNGrid.SelectParameters["BPSDY2"].DefaultValue = _BPSDY2;
+ dsBPSNGrid.SelectParameters["BPEDY1"].DefaultValue = _BPEDY1;
+ dsBPSNGrid.SelectParameters["BPEDY2"].DefaultValue = _BPEDY2;
+ dsBPSNGrid.SelectParameters["canSearch"].DefaultValue = canSearch.ToString();
+ dsBPSNGrid.SelectParameters["userId"].DefaultValue = UserId;
if (!string.IsNullOrEmpty(GetStringParam("BPENO")) || !string.IsNullOrEmpty(WDAC.GetStringValue(ViewState["RPENO"])))
{
string bpeno = "";
if (!string.IsNullOrEmpty(GetStringParam("BPENO"))) bpeno = GetStringParam("BPENO");
if (!string.IsNullOrEmpty(WDAC.GetStringValue(ViewState["RPENO"]))) bpeno = WDAC.GetStringValue(ViewState["RPENO"]);
- var cmdIndex = Query.NewCommand();
- cmdIndex.CommandText = string.Format("SELECT ROWID - 1 FROM ( {0} ) T WHERE BPENO = @TARGET", dsBPSNGrid.SelectCommand);
- Query.AddParam(cmdIndex, "TODAY", DateTime.UtcNow.AddHours(8).Date);
- Query.AddParam(cmdIndex, "BPENO1", _BPENO);
- Query.AddParam(cmdIndex, "BPNME1", _BPNME);
- Query.AddParam(cmdIndex, "BPENM1", _BPENM);
- Query.AddParam(cmdIndex, "BPIDN1", _BPIDN);
- Query.AddParam(cmdIndex, "BPSDY1", _BPSDY1);
- Query.AddParam(cmdIndex, "BPSDY2", _BPSDY2);
- Query.AddParam(cmdIndex, "BPEDY1", _BPEDY1);
- Query.AddParam(cmdIndex, "BPEDY2", _BPEDY2);
- Query.AddParam(cmdIndex, "TARGET", bpeno);
- var o = Query.ExecuteScalar(cmdIndex);
- int idx = (o is Int32 || o is Int64) ? WDAC.GetInt32Value(o) : -1;
+
+ int idx = new BpsnDAC(Query).SelectBPENOIndex(
+ bpeno, _BPENO, _BPNME, _BPENM, _BPIDN, _BPEDY_TYPE, _BPDPT_TYPE, _BPSDY1, _BPSDY2, _BPEDY1, _BPEDY2, canSearch, UserId);
if (idx >= 0)
{
@@ -455,9 +394,9 @@ public partial class forms_worker_fmBpsn : Wellan.Web.UI.WUserControlBase
GridView1.DataBind();
}
- protected void dsBPSNGrid_Selected(object sender, SqlDataSourceStatusEventArgs e)
+ protected void dsBPSNGrid_Selected(object sender, ObjectDataSourceStatusEventArgs e)
{
- if (e.AffectedRows == 0)
+ if (e.ReturnValue is Int32 && WDAC.GetInt32Value(e.ReturnValue) == 0)
{
if (MultiView1.ActiveViewIndex == 0)
{
diff --git a/Web/forms/worker/fmRpar.ascx b/Web/forms/worker/fmRpar.ascx
index 31bf2f9..2c5305f 100644
--- a/Web/forms/worker/fmRpar.ascx
+++ b/Web/forms/worker/fmRpar.ascx
@@ -6,12 +6,19 @@
CssClass="pageTitle">
-
+
+
+
+
+
+
+
+
+
+
0 ? RPRDT1.ToString("yyyy-MM-dd") : "";
+ dsRPARGrid.SelectParameters["RPRDT2"].DefaultValue = RPRDT2.Ticks > 0 ? RPRDT2.ToString("yyyy-MM-dd") : "";
+ dsRPARGrid.SelectParameters["rparType"].DefaultValue = rparType;
dsRPARForm.SelectCommand = select + from + " WHERE RPREN=@RPREN ";
}
@@ -625,9 +618,9 @@ public partial class forms_worker_fmRpar : Wellan.Web.UI.WUserControlBase
RPARGrid.DataBind();
}
- protected void dsRPARGrid_Selected(object sender, SqlDataSourceStatusEventArgs e)
+ protected void dsRPARGrid_Selected(object sender, ObjectDataSourceStatusEventArgs e)
{
- if (e.AffectedRows == 0)
+ if (e.ReturnValue is Int32 && WDAC.GetInt32Value(e.ReturnValue) == 0)
{
switch (MultiView1.ActiveViewIndex)
{
diff --git a/Web/forms/worker/fmRparWorker.ascx b/Web/forms/worker/fmRparWorker.ascx
index aedf98e..81b6c9b 100644
--- a/Web/forms/worker/fmRparWorker.ascx
+++ b/Web/forms/worker/fmRparWorker.ascx
@@ -5,9 +5,16 @@
TagPrefix="uc1" %>
-
+
+
+
+
+
+
+
+
+
-
+
0 ? RPRDT1.ToString("yyyy-MM-dd") : "";
+ dsRPARGrid.SelectParameters["RPRDT2"].DefaultValue = RPRDT2.Ticks > 0 ? RPRDT2.ToString("yyyy-MM-dd") : "";
+ dsRPARGrid.SelectParameters["rparType"].DefaultValue = rparType;
dsRPARForm.SelectCommand = select + from + " WHERE RPREN=@RPREN ";
@@ -959,9 +951,9 @@ public partial class forms_customer_fmRpar : Wellan.Web.UI.WUserControlBase
gvRPAD.DataBind();
}
- protected void dsRPARGrid_Selected(object sender, SqlDataSourceStatusEventArgs e)
+ protected void dsRPARGrid_Selected(object sender, ObjectDataSourceStatusEventArgs e)
{
- if (e.AffectedRows == 0)
+ if (e.ReturnValue is Int32 && WDAC.GetInt32Value(e.ReturnValue) == 0)
{
switch (MultiView1.ActiveViewIndex)
{
diff --git a/Web/forms/worker/fmRsaj.ascx b/Web/forms/worker/fmRsaj.ascx
index 5d428a9..0d0e95c 100644
--- a/Web/forms/worker/fmRsaj.ascx
+++ b/Web/forms/worker/fmRsaj.ascx
@@ -6,10 +6,14 @@
TextMessageId="FMRSAJ.NAME">
-
+
+
+
+
+
+
|