提交代码
This commit is contained in:
parent
2ceb5aedbb
commit
96eb7fa070
|
|
@ -202,21 +202,50 @@
|
|||
{
|
||||
var hotItems = from x in BLL.Funs.DB.HJGL_CH_HotProessTrustItem where x.JOT_ID == JOT_ID select x;
|
||||
var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailByJotId(JOT_ID);
|
||||
var batch = (from x in Funs.DB.HJGL_BO_Batch
|
||||
join y in Funs.DB.HJGL_BO_BatchDetail
|
||||
on x.BatchId equals y.BatchId
|
||||
where y.JOT_ID == this.JOT_ID
|
||||
select x).FirstOrDefault();
|
||||
if ((batchDetail != null || hotItems.Count() > 0) && this.CurrUser.UserId != BLL.Const.GlyId)
|
||||
{
|
||||
this.TextIsReadOnly(true);
|
||||
if (batchDetail != null)
|
||||
{
|
||||
var batch = BLL.HJGL_BO_BatchService.GetBatchById(batchDetail.BatchId);
|
||||
//var batch = BLL.HJGL_BO_BatchService.GetBatchById(batchDetail.BatchId);
|
||||
if (batch.BatchIsClosed == true)
|
||||
{
|
||||
btnCopy.Enabled = false; // 不能引用
|
||||
}
|
||||
}
|
||||
//if (this.CurrUser.UserId != BLL.Const.GlyId) //焊接或热处理委托后非管理员不能修改焊口信息数据
|
||||
//{
|
||||
// this.TextIsReadOnly(true);
|
||||
//}
|
||||
if (hotItems.Count() > 0 || batch.BatchIsClosed == true) //存在热处理委托或者批关闭则不能修改焊口号
|
||||
{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
ddlJST_ID.Enabled = true;
|
||||
ddlJointAttribute.Enabled = true;
|
||||
ddlWME_ID.Enabled = true;
|
||||
txtDial.Readonly = false;
|
||||
txtSch.Readonly = false;
|
||||
txtSize.Readonly = false;
|
||||
ddlWLO_CODE.Enabled = true;
|
||||
ddlComponent1.Enabled = true;
|
||||
ddlComponent2.Enabled = true;
|
||||
txtLastTemp.Readonly = false;
|
||||
txtCellTemp.Readonly = false;
|
||||
txtPrepareTemp.Readonly = false;
|
||||
ddlWeldSilk.Enabled = true;
|
||||
ddlWeldMat.Enabled = true;
|
||||
txtElectricity.Readonly = false;
|
||||
txtVoltage.Readonly = false;
|
||||
txtPressureTestPackageNo.Readonly = false;
|
||||
txtJointDesc.Readonly = false;
|
||||
drpJOT_QualifiedLevel.Enabled = true;
|
||||
txtHardQuaStandard.Readonly = false;
|
||||
txtWeldL.Readonly = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (hotItems.Count() > 0)
|
||||
|
|
|
|||
|
|
@ -232,8 +232,10 @@ namespace FineUIPro.Web.HJGL.WeldingReport
|
|||
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_jot").ToString());
|
||||
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_bw1jot").ToString());
|
||||
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_hotjot").ToString());
|
||||
sb.AppendFormat("<td></td>");
|
||||
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("maybe_bw1jot").ToString());
|
||||
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_Trusthotjot").ToString());
|
||||
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_Inputhotjot").ToString());
|
||||
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_OKhotjot").ToString());
|
||||
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_NotOKhotjot").ToString());
|
||||
sb.Append("</tr>");
|
||||
sb.Append("</table>");
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<FineUIPro DebugMode="false" Theme="Cupertino"/>
|
||||
<appSettings>
|
||||
<!--连接字符串-->
|
||||
<add key="ConnectionString" value="Server=.\SQL2019;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
|
||||
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
|
||||
<!--系统名称-->
|
||||
<add key="SystemName" value="诺必达焊接管理系统"/>
|
||||
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
|
||||
|
|
|
|||
|
|
@ -47,6 +47,9 @@
|
|||
<f:RadioItem Text="在建" Value="0" Selected="true" />
|
||||
<f:RadioItem Text="完工" Value="1" />
|
||||
</f:RadioButtonList>
|
||||
<f:DropDownList ID="drpProjectId" Label="施工号" runat="server" ShowRedStar="true" Required="true"
|
||||
EnableEdit="true" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
|
||||
</f:DropDownList>
|
||||
<f:DropDownList ID="drpCreateMan" Label="创建人" runat="server" ShowRedStar="true" Required="true"
|
||||
EnableEdit="true" LabelWidth="60px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
|
||||
</f:DropDownList>
|
||||
|
|
|
|||
|
|
@ -21,6 +21,12 @@ namespace FineUIPro.Web.common.BaseInfo
|
|||
{
|
||||
btnDelete.OnClientClick = Grid1.GetNoSelectionAlertReference("请至少选择一项！");
|
||||
btnDelete.ConfirmText = String.Format("你确定要删除选中的 <b><script>{0}</script></b> 行数据吗？", Grid1.GetSelectedCountReference());
|
||||
|
||||
this.drpProjectId.DataTextField = "ProjectCode";
|
||||
this.drpProjectId.DataValueField = "ProjectId";
|
||||
this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
|
||||
this.drpProjectId.DataBind();
|
||||
Funs.FineUIPleaseSelect(this.drpProjectId);
|
||||
///创建人
|
||||
this.drpCreateMan.DataTextField = "UserName";
|
||||
this.drpCreateMan.DataValueField = "UserId";
|
||||
|
|
@ -65,6 +71,11 @@ namespace FineUIPro.Web.common.BaseInfo
|
|||
}
|
||||
|
||||
parms.Add(new SqlParameter("@ProjectSoft", this.rblProjectSoft.SelectedValue));
|
||||
if (this.drpProjectId.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
strSql += " and ProjectId=@ProjectId";
|
||||
parms.Add(new SqlParameter("@ProjectId", this.drpProjectId.SelectedValue));
|
||||
}
|
||||
if (this.drpCreateMan.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
strSql += " and CreateManId=@CreateManId";
|
||||
|
|
|
|||
|
|
@ -7,12 +7,10 @@
|
|||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.common.BaseInfo
|
||||
{
|
||||
namespace FineUIPro.Web.common.BaseInfo {
|
||||
|
||||
|
||||
public partial class Project
|
||||
{
|
||||
public partial class Project {
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
|
|
@ -113,6 +111,15 @@ namespace FineUIPro.Web.common.BaseInfo
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.RadioButtonList rbIsClosed;
|
||||
|
||||
/// <summary>
|
||||
/// drpProjectId 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpProjectId;
|
||||
|
||||
/// <summary>
|
||||
/// drpCreateMan 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
Loading…
Reference in New Issue