gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2025-05-22 09:58:46 +08:00
parent fd35988a76
commit debd6973a7
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformancePAUT.aspx.cs
View File

@ -269,7 +269,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
} }
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
tb = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_welderPerformance", parameter); tb = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_welderPerformancePAUT", parameter);
this.Grid1.RecordCount = tb.Rows.Count; this.Grid1.RecordCount = tb.Rows.Count;
tb = GetFilteredTable(Grid1.FilteredData, tb); tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb); var table = this.GetPagedDataTable(Grid1, tb);
@ -348,7 +348,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
} }
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
tb = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_welderPerformance2", parameter); tb = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_welderPerformancePAUT2", parameter);
this.Grid1.RecordCount = tb.Rows.Count; this.Grid1.RecordCount = tb.Rows.Count;
tb = GetFilteredTable(Grid1.FilteredData, tb); tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb); var table = this.GetPagedDataTable(Grid1, tb);

7
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockSelect.aspx.cs
View File

@ -175,7 +175,12 @@ namespace FineUIPro.Web.WeldMat.Stock
string id = Grid1.SelectedRowID.Split(',')[0]; string id = Grid1.SelectedRowID.Split(',')[0];
if (!string.IsNullOrEmpty(id)) if (!string.IsNullOrEmpty(id))
{ {
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockSelectDetail.aspx?WeldId={0}", id, "编辑 - "))); string unitStoreId = string.Empty;
if (this.drpUnitStore.SelectedValue != BLL.Const._Null)
{
unitStoreId = this.drpUnitStore.SelectedValue;
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockSelectDetail.aspx?WeldId={0}&UnitStoreId={1}", id, unitStoreId, "编辑 - ")));
} }
} }
#endregion #endregion

7
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockSelectDetail.aspx.cs
View File

@ -80,7 +80,12 @@ namespace FineUIPro.Web.WeldMat.Stock
strSql += " AND StockIn.WeldId=@WeldId"; strSql += " AND StockIn.WeldId=@WeldId";
listStr.Add(new SqlParameter("@WeldId", this.WeldId)); listStr.Add(new SqlParameter("@WeldId", this.WeldId));
} }
string unitStoreId= Request.Params["UnitStoreId"];
if (!string.IsNullOrEmpty(unitStoreId))
{
strSql += " AND StockIn.UnitStoreId=@UnitStoreId";
listStr.Add(new SqlParameter("@UnitStoreId", unitStoreId));
}
if (drpUnit.SelectedValue != Const._Null && drpUnit.SelectedValue != null) if (drpUnit.SelectedValue != Const._Null && drpUnit.SelectedValue != null)
{ {
strSql += " AND unit.UnitId = @UnitId"; strSql += " AND unit.UnitId = @UnitId";