11
This commit is contained in:
@@ -81,7 +81,7 @@
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" HeaderText="焊接方法" Locked="true">
|
||||
</f:RenderField>
|
||||
|
||||
<f:RenderField Width="160px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
|
||||
<f:RenderField Width="160px" ColumnID="MaterialId" DataField="MaterialId" SortField="MaterialId"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" HeaderText="焊接材质">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="TestDate" DataField="TestDate" SortField="TestDate"
|
||||
@@ -120,7 +120,7 @@
|
||||
</f:Window>
|
||||
<f:Window ID="Window2" Title="导入错误日志" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="top" EnableResize="true" runat="server" OnClose="Window2_Close" IsModal="true"
|
||||
Width="700" Height="420px">
|
||||
Width="900" Height="520px">
|
||||
</f:Window>
|
||||
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
|
||||
@@ -134,14 +134,12 @@ namespace FineUIPro.Web.WelderManage
|
||||
this.lblCode.Text = welder.WelderCode;
|
||||
this.lblName.Text = welder.WelderName;
|
||||
}
|
||||
string strSql = @"SELECT A.*,b.WeldingMethodCode,C.MaterialCode,
|
||||
string strSql = @"SELECT A.*,b.WeldingMethodCode,
|
||||
(case when A.IsPass=1 then '是' else '否' end ) As PassName ,
|
||||
convert(varchar,A.CreatedDate,23) as TestDate
|
||||
FROM Welder_TestInfo AS A
|
||||
inner join Base_WeldingMethod as B
|
||||
on A.WeldMethodId=B.WeldingMethodId
|
||||
inner join Base_Material as C on
|
||||
A.MaterialId=C.MaterialId
|
||||
WHERE A.WelderId=@WelderId";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
listStr.Add(new SqlParameter("@WelderId", this.tvControlItem.SelectedNodeID));
|
||||
@@ -384,12 +382,12 @@ namespace FineUIPro.Web.WelderManage
|
||||
|
||||
var welderId = Funs.DB.Welder_Welder.FirstOrDefault(t => t.WelderCode == welderCode)?.WelderId;
|
||||
var methodId = Funs.DB.Base_WeldingMethod.FirstOrDefault(t => t.WeldingMethodCode == weldMethod)?.WeldingMethodId;
|
||||
var materId = Funs.DB.Base_Material.FirstOrDefault(t => t.MaterialCode == weldMeatrail)?.MaterialId;
|
||||
//var materId = Funs.DB.Base_Material.FirstOrDefault(t => t.MaterialCode == weldMeatrail)?.MaterialId;
|
||||
model.Id = SQLHelper.GetNewID(typeof(Model.Welder_TestInfo));
|
||||
model.WeldMethodId = methodId;
|
||||
model.MaterialId = materId;
|
||||
model.MaterialId = weldMeatrail;
|
||||
model.IsPass = isPass == "是" ? true : false;
|
||||
model.ProjectId = this.CurrUser.LoginProjectId;
|
||||
model.ProjectId = "0";
|
||||
model.WelderId = welderId;
|
||||
model.CreatedDate = DateTime.Parse(testDate);
|
||||
model.Remark = remark;
|
||||
@@ -563,16 +561,7 @@ namespace FineUIPro.Web.WelderManage
|
||||
model.isSuccess = false;
|
||||
listData.Add(model);
|
||||
}
|
||||
if (string.IsNullOrEmpty(weldMeatrail))
|
||||
{
|
||||
var model = new Model.ViewModels.ImportErrorViewModel();
|
||||
model.rowId = i;
|
||||
model.createdTime = DateTime.Now;
|
||||
model.columnName = "焊接材质";
|
||||
model.errMsg = "焊接材质不能为空";
|
||||
model.isSuccess = false;
|
||||
listData.Add(model);
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(isPass))
|
||||
{
|
||||
var model = new Model.ViewModels.ImportErrorViewModel();
|
||||
@@ -637,17 +626,25 @@ namespace FineUIPro.Web.WelderManage
|
||||
model.isSuccess = false;
|
||||
listData.Add(model);
|
||||
}
|
||||
var isAnyMeaterail = Funs.DB.Base_Material.Any(t => t.MaterialCode == weldMeatrail);
|
||||
if (!isAnyMeaterail)
|
||||
|
||||
string type = "FeⅠ,FeⅡ,FeⅢ,FeⅣ,其他";
|
||||
var isAnyMeaterail = weldMeatrail.Split(',');
|
||||
foreach (var item in isAnyMeaterail)
|
||||
{
|
||||
var model = new Model.ViewModels.ImportErrorViewModel();
|
||||
model.rowId = i;
|
||||
model.createdTime = DateTime.Now;
|
||||
model.columnName = "焊接材质";
|
||||
model.errMsg = "焊接材质不存在";
|
||||
model.isSuccess = false;
|
||||
listData.Add(model);
|
||||
if (!type.Contains(item))
|
||||
{
|
||||
var model = new Model.ViewModels.ImportErrorViewModel();
|
||||
model.rowId = i;
|
||||
model.createdTime = DateTime.Now;
|
||||
model.columnName = "焊接材质";
|
||||
model.errMsg = "材质应为FeⅠ,FeⅡ,FeⅢ,FeⅣ,其他,多个用','隔开";
|
||||
model.isSuccess = false;
|
||||
listData.Add(model);
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
return listData;
|
||||
}
|
||||
|
||||
@@ -28,9 +28,8 @@
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DropDownList ID="drpMaterial" Required="true" ShowRedStar="true" Label="焊接材质" EmptyText="请选择" runat="server">
|
||||
|
||||
</f:DropDownList>
|
||||
<f:DropDownList ID="drpMaterialType" Label="焊接材质" EnableMultiSelect="true" EnableCheckBoxSelect="true"
|
||||
runat="server" LabelAlign="right"></f:DropDownList>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace FineUIPro.Web.WelderManage
|
||||
return;
|
||||
}
|
||||
drpIsPass.SelectedValue = result.IsPass.ToString();
|
||||
drpMaterial.SelectedValue=result.MaterialId.ToString();
|
||||
drpMaterialType.SelectedValueArray=result.MaterialId.Split(',');
|
||||
drpWeldMethod.SelectedValue = result.WeldMethodId.ToString();
|
||||
txtCheckDate.Text = result.CreatedDate.Value.ToString("yyyy-MM-dd");
|
||||
txtRemark.Text = result.Remark.ToString();
|
||||
@@ -57,12 +57,11 @@ namespace FineUIPro.Web.WelderManage
|
||||
drpWeldMethod.DataBind();
|
||||
drpWeldMethod.Items.Insert(0, new ListItem("请选择", ""));
|
||||
|
||||
var materList = Funs.DB.Base_Material.OrderBy(t=>t.MaterialCode).ToList();
|
||||
drpMaterial.DataSource= materList;
|
||||
drpMaterial.DataTextField = "MaterialCode";
|
||||
drpMaterial.DataValueField = "MaterialId";
|
||||
drpMaterial.DataBind();
|
||||
drpMaterial.Items.Insert(0, new ListItem("请选择", ""));
|
||||
this.drpMaterialType.DataTextField = "Text";
|
||||
this.drpMaterialType.DataValueField = "Value";
|
||||
this.drpMaterialType.DataSource = BLL.DropListService.MaterialTypeList();
|
||||
this.drpMaterialType.DataBind();
|
||||
Funs.FineUIPleaseSelect(this.drpMaterialType);
|
||||
}
|
||||
protected void btnSave_Click(object sender, EventArgs e)
|
||||
{
|
||||
@@ -88,16 +87,21 @@ namespace FineUIPro.Web.WelderManage
|
||||
|
||||
var input = new Model.Welder_TestInfo();
|
||||
input.CreatedDate = System.Convert.ToDateTime(txtCheckDate.Text);
|
||||
input.ProjectId = this.CurrUser.LoginProjectId;
|
||||
input.ProjectId = "0";
|
||||
input.WeldMethodId = drpWeldMethod.SelectedValue;
|
||||
input.WelderId = this.welderId;
|
||||
input.MaterialId = drpMaterial.SelectedValue;
|
||||
|
||||
if (drpMaterialType.SelectedValue != Const._Null)
|
||||
{
|
||||
input.MaterialId = string.Join(",", drpMaterialType.SelectedValueArray);
|
||||
}
|
||||
|
||||
input.Remark = txtRemark.Text.Trim();
|
||||
input.IsPass = drpIsPass.SelectedValue == "是" ? true : false;
|
||||
|
||||
if (string.IsNullOrEmpty(this.Id))
|
||||
{
|
||||
BLL.WelderTestService.Add(input);
|
||||
input.WelderId = this.welderId;
|
||||
BLL.WelderTestService.Add(input);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.WelderManage
|
||||
protected global::FineUIPro.DropDownList drpWeldMethod;
|
||||
|
||||
/// <summary>
|
||||
/// drpMaterial 控件。
|
||||
/// drpMaterialType 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpMaterial;
|
||||
protected global::FineUIPro.DropDownList drpMaterialType;
|
||||
|
||||
/// <summary>
|
||||
/// txtCheckDate 控件。
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
<f:RenderField ColumnID="rowId" MinWidth="80" DataField="rowId" HeaderText="行号" />
|
||||
<f:RenderField ColumnID="columnName" MinWidth="80" DataField="columnName" HeaderText="列名称" />
|
||||
<f:TemplateField MinWidth="200" HeaderText="错误原因">
|
||||
<f:TemplateField MinWidth="400" HeaderText="错误原因">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="lablRemark" runat="server" Text='<%#Eval("errMsg") %>' ForeColor="Red"></asp:Label>
|
||||
</ItemTemplate>
|
||||
|
||||
Reference in New Issue
Block a user