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

Compare commits

base: gaofei:2553121f976493db2cf840aebb1885ebedd28788
Branches Tags
gaofei:master
..
compare: gaofei:0ff0fc55d1a0fa705c88dee68dc9b07656b6ee5d
Branches Tags
gaofei:master

No commits in common. "2553121f976493db2cf840aebb1885ebedd28788" and "0ff0fc55d1a0fa705c88dee68dc9b07656b6ee5d" have entirely different histories.
2553121f97 ... 0ff0fc55d1

5 changed files with 34 additions and 48 deletions
Show Stats Expand all files Collapse all files

3
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs
View File

@ -525,8 +525,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
db.SubmitChanges(); db.SubmitChanges();
BLL.HJGL_BO_BatchDetailService.DeleteBatchDetail(rowID); //删除批明细 BLL.HJGL_BO_BatchDetailService.DeleteBatchDetail(rowID); //删除批明细
BLL.HJGL_PW_JointInfoService.DeleteJointInfo(rowID); BLL.HJGL_PW_JointInfoService.DeleteJointInfo(rowID);
var jot = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(rowID); BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除焊口信息");
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除焊口[" + jot.JOT_JointNo + "]");
} }
else else
{ {

4
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
View File

@ -765,7 +765,7 @@
newJointInfo.JOT_ID = SQLHelper.GetNewID(typeof(Model.HJGL_PW_JointInfo)); newJointInfo.JOT_ID = SQLHelper.GetNewID(typeof(Model.HJGL_PW_JointInfo));
this.JOT_ID = newJointInfo.JOT_ID; this.JOT_ID = newJointInfo.JOT_ID;
BLL.HJGL_PW_JointInfoService.AddJointInfo(newJointInfo); BLL.HJGL_PW_JointInfoService.AddJointInfo(newJointInfo);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "添加[" + this.txtISONO.Text + "]管线下，焊口[" + newJointInfo.JOT_JointNo + "]！"); BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "添加焊口信息！");
} }
catch catch
{ {
@ -818,7 +818,7 @@
{ {
BLL.HJGL_PW_JointInfoService.UpdateJointNoAddG(this.JOT_ID, this.ddlJointAttribute.SelectedValue, Const.Add); BLL.HJGL_PW_JointInfoService.UpdateJointNoAddG(this.JOT_ID, this.ddlJointAttribute.SelectedValue, Const.Add);
} }
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "修改[" + this.txtISONO.Text + "]管线下，焊口[" + newJointInfo.JOT_JointNo + "]！"); BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "修改焊口信息！");
} }
// 更新排序字段 // 更新排序字段
string strSort = @"UPDATE dbo.HJGL_PW_JointInfo SET string strSort = @"UPDATE dbo.HJGL_PW_JointInfo SET

1
HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx
View File

@ -31,7 +31,6 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" ToolbarAlign="Right" runat="server"> <f:Toolbar ID="Toolbar3" Position="Top" ToolbarAlign="Right" runat="server">
<Items> <Items>
<f:Label ID="lblProjectId" runat="server" Hidden="true"></f:Label>
<f:TextBox ID="txtWeldCode" runat="server" Label="焊工号" EmptyText="请输入焊工号" <f:TextBox ID="txtWeldCode" runat="server" Label="焊工号" EmptyText="请输入焊工号"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged"></f:TextBox> AutoPostBack="true" OnTextChanged="TextBox_TextChanged"></f:TextBox>
<f:TextBox ID="txtWeldName" runat="server" Label="姓名" EmptyText="请输入焊工姓名" <f:TextBox ID="txtWeldName" runat="server" Label="姓名" EmptyText="请输入焊工姓名"

31
HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs
View File

@ -14,17 +14,17 @@ namespace FineUIPro.Web.common.ProjectSet
/// <summary> /// <summary>
/// 项目id /// 项目id
/// </summary> /// </summary>
//public string ProjectId public string ProjectId
//{ {
// get get
// { {
// return (string)ViewState["ProjectId"]; return (string)ViewState["ProjectId"];
// } }
// set set
// { {
// ViewState["ProjectId"] = value; ViewState["ProjectId"] = value;
// } }
//} }
#endregion #endregion
#region 加载 #region 加载
@ -37,8 +37,7 @@ namespace FineUIPro.Web.common.ProjectSet
{ {
if (!IsPostBack) if (!IsPostBack)
{ {
this.lblProjectId.Text = Request.Params["projectId"]; this.ProjectId = Request.Params["projectId"];
//this.ProjectId = Request.Params["projectId"];
BindGrid(); BindGrid();
//InitTreeMenu();//加载树 //InitTreeMenu();//加载树
} }
@ -77,7 +76,7 @@ namespace FineUIPro.Web.common.ProjectSet
WHERE WED_ID NOT IN(SELECT WED_ID FROM Project_Welder WHERE ProjectId =@ProjectId) WHERE WED_ID NOT IN(SELECT WED_ID FROM Project_Welder WHERE ProjectId =@ProjectId)
AND IsOAM=1"; AND IsOAM=1";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.lblProjectId.Text.Trim())); listStr.Add(new SqlParameter("@ProjectId", ProjectId));
if (!string.IsNullOrEmpty(txtWeldCode.Text)) if (!string.IsNullOrEmpty(txtWeldCode.Text))
{ {
@ -92,7 +91,7 @@ namespace FineUIPro.Web.common.ProjectSet
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
//tb = GetFilteredTable(Grid1.FilteredData, tb); tb = GetFilteredTable(Grid1.FilteredData, tb);
Grid1.DataSource = tb; Grid1.DataSource = tb;
Grid1.DataBind(); Grid1.DataBind();
} }
@ -141,7 +140,7 @@ namespace FineUIPro.Web.common.ProjectSet
{ {
Model.Project_Welder newProjectWelder = new Model.Project_Welder(); Model.Project_Welder newProjectWelder = new Model.Project_Welder();
newProjectWelder.WED_ID = Grid1.DataKeys[i][0].ToString(); newProjectWelder.WED_ID = Grid1.DataKeys[i][0].ToString();
newProjectWelder.ProjectId = this.lblProjectId.Text.Trim(); //this.ProjectId; newProjectWelder.ProjectId = this.ProjectId;
newProjectWelder.IsSelected = true; newProjectWelder.IsSelected = true;
newProjectWelder.IsApprove = true; newProjectWelder.IsApprove = true;
newProjectWelder.ProjectWelderId = SQLHelper.GetNewID(typeof(Model.Project_Welder)); newProjectWelder.ProjectWelderId = SQLHelper.GetNewID(typeof(Model.Project_Welder));

19
HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.designer.cs generated
View File

@ -2,17 +2,15 @@
// <自动生成> // <自动生成>
// 此代码由工具生成。 // 此代码由工具生成。
// //
// 对此文件的更改可能导致不正确的行为，如果 // 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，则所做更改将丢失。 // 重新生成代码，这些更改将会丢失。
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.common.ProjectSet namespace FineUIPro.Web.common.ProjectSet {
{
public partial class SelectWelder public partial class SelectWelder {
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -68,15 +66,6 @@ namespace FineUIPro.Web.common.ProjectSet
/// </remarks> /// </remarks>
protected global::FineUIPro.Toolbar Toolbar3; protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// lblProjectId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblProjectId;
/// <summary> /// <summary>
/// txtWeldCode 控件。 /// txtWeldCode 控件。
/// </summary> /// </summary>