焊接修改

This commit is contained in:
2025-09-24 17:31:28 +08:00
parent cb92dcb730
commit 0f70405339
64 changed files with 2492 additions and 2040 deletions
@@ -32,21 +32,21 @@ namespace FineUIPro.Web.HJGL.PreDesign
drpTypeInt.DataTextField = "Key";
drpTypeInt.DataValueField = "Value";
drpTypeInt.DataSource = HJGL_PackagingmanageService.TypeIntMap;
drpTypeInt.DataSource = HJGLPackagingmanageService.TypeIntMap;
drpTypeInt.DataBind();
btnClose.OnClientClick = ActiveWindow.GetHideReference();
if (!string.IsNullOrEmpty(PackagingManageId))
{
var model = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
var model = HJGLPackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
drpTypeInt.Enabled = false;
txtPackagingCode.Text = model.PackagingCode;
dropPipelineComponentCode.Values = model.PipelineComponentId?.Split(',');
txtStackingPosition.Text = model.StackingPosition;
drpTrainNumber.SelectedValue = model.TrainNumberId;
drpTypeInt.SelectedValue = model.TypeInt.ToString();
if (model.State== HJGL_PackagingmanageService.state_0)
if (model.State== HJGLPackagingmanageService.state_0)
{
btnSave.Hidden = false;
}
@@ -55,7 +55,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
drpTypeInt.Enabled = true;
btnSave.Hidden = false;
txtPackagingCode.Text = HJGL_PackagingmanageService.GetNewPackagingCode(this.CurrUser.LoginProjectId);
txtPackagingCode.Text = HJGLPackagingmanageService.GetNewPackagingCode(this.CurrUser.LoginProjectId);
}
drpTypeInt_SelectedIndexChanged(null, null);
}
@@ -99,17 +99,17 @@ namespace FineUIPro.Web.HJGL.PreDesign
table.TypeInt = int.Parse(drpTypeInt.SelectedValue);
table.CompileMan = this.CurrUser.PersonId;
table.CompileDate = DateTime.Now;
if (drpTypeInt.SelectedValue == ((int)HJGL_PackagingmanageService.TypeInt.).ToString())
if (drpTypeInt.SelectedValue == ((int)HJGLPackagingmanageService.TypeInt.).ToString())
{
table.PipelineComponentId = string.Join(",", dropPipelineComponentCode.Values);
}
BLL.HJGL_PackagingmanageService.AddHJGL_PackagingManage(table);
BLL.HJGLPackagingmanageService.AddHJGL_PackagingManage(table);
PackagingManageId= table.PackagingManageId;
}
else
{
Model.HJGL_PackagingManage table = BLL.HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
Model.HJGL_PackagingManage table = BLL.HJGLPackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
if (table != null)
{
table.PackagingCode = txtPackagingCode.Text;
@@ -120,7 +120,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
//table.ContactPhone =txtContactPhone.Text;
table.TrainNumberId = drpTrainNumber.SelectedValue;
table.TypeInt = int.Parse(drpTypeInt.SelectedValue);
if (drpTypeInt.SelectedValue ==((int)HJGL_PackagingmanageService.TypeInt.).ToString())
if (drpTypeInt.SelectedValue ==((int)HJGLPackagingmanageService.TypeInt.).ToString())
{
table.PipelineComponentId = string.Join(",", dropPipelineComponentCode.Values);
@@ -147,7 +147,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
}
BLL.HJGL_PackagingmanageService.UpdateHJGL_PackagingManage(table);
BLL.HJGLPackagingmanageService.UpdateHJGL_PackagingManage(table);
}
SaveDetail();
}
@@ -188,7 +188,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
protected void btnSelect_Click(object sender, EventArgs e)
{
Save();
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PackagingManageSelect.aspx?PackagingManageId={0}", PackagingManageId, "选择- ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PackagingManageSelect.aspx?PackagingManageId={0}&TypeInt={1}", PackagingManageId, drpTypeInt.SelectedValue, "选择- ")));
}
protected void btnSelectStock_Click(object sender, EventArgs e)
@@ -201,31 +201,22 @@ namespace FineUIPro.Web.HJGL.PreDesign
protected void drpTypeInt_SelectedIndexChanged(object sender, EventArgs e)
{
if (drpTypeInt.SelectedValue == ((int)HJGL_PackagingmanageService.TypeInt.).ToString())
if (drpTypeInt.SelectedValue == ((int)HJGLPackagingmanageService.TypeInt.).ToString())
{
dropPipelineComponentCode.Hidden=false;
Grid2.Hidden=true;
BindGrid();
}
else if (drpTypeInt.SelectedValue == ((int)HJGL_PackagingmanageService.TypeInt.).ToString())
else
{
dropPipelineComponentCode.Hidden = true;
Grid2.Hidden = false;
btnSelect.Hidden = false;
btnSelectStock.Hidden = true;
BindGrid2(this.PackagingManageId);
//btnSelectStock.Hidden = true;
BindGrid2(this.PackagingManageId);
}
else if (drpTypeInt.SelectedValue == ((int)HJGL_PackagingmanageService.TypeInt.).ToString())
{
dropPipelineComponentCode.Hidden = true;
Grid2.Hidden = false;
btnSelect.Hidden = true;
btnSelectStock.Hidden = false;
BindGrid2(this.PackagingManageId);
}
}
protected void Grid2_RowCommand(object sender, GridCommandEventArgs e)
{