lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改材料报验流程

This commit is contained in:
高飞 2023-02-23 09:37:24 +08:00
parent d3818a0ba8
commit 2e19b42a4b
7 changed files with 49 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SGGL/BLL/CQMS/Material/CQMS_InspectionService.cs
View File

@ -98,17 +98,10 @@ namespace BLL
if (state == Const.Inspection_Compile || state == Const.Inspection_ReCompile)
{
ListItem[] lis = new ListItem[1];
lis[0] = new ListItem("总包专业工程师审核", Const.Inspection_Audit1);
lis[0] = new ListItem("总包专业工程师审批", Const.Inspection_Audit1);
return lis;
}
else if (state == Const.Inspection_Audit1)
{
ListItem[] lis = new ListItem[2];
lis[0] = new ListItem("监理工程师审批", Const.Inspection_Audit2);
lis[1] = new ListItem("重新编制", Const.Inspection_ReCompile);
return lis;
}
else if (state == Const.Inspection_Audit2)
{
ListItem[] lis = new ListItem[2];
lis[0] = new ListItem("审批完成", Const.Inspection_Complete);

6
SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx
View File

@ -16,7 +16,7 @@
<f:FormRow>
<Items>
<f:TextBox ID="txtContractNo" runat="server" Label="合同编号"
Required="true" MaxLength="70" ShowRedStar="true" LabelWidth="100px">
MaxLength="70" LabelWidth="100px">
</f:TextBox>
<f:DropDownList ID="drpUnit" runat="server" ShowRedStar="true" Label="供货单位" LabelWidth="100px" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
@ -24,7 +24,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpMainItem" runat="server" ShowRedStar="true" Label="主项" LabelWidth="100px" LabelAlign="Right" EnableEdit="true">
<f:DropDownList ID="drpMainItem" runat="server" Label="主项" LabelWidth="100px" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:TextBox ID="txtEquipmentName" runat="server" Label="设备名称"
Required="true" MaxLength="70" ShowRedStar="true" LabelWidth="100px">
@ -46,7 +46,7 @@
<f:TextBox ID="txtPressClass" runat="server" Label="压力等级"
MaxLength="70" LabelWidth="100px">
</f:TextBox>
<f:DatePicker ID="txtArrivalDate" ShowRedStar="true" Required="true" runat="server" Label="到货日期" LabelAlign="Right"
<f:DatePicker ID="txtArrivalDate" runat="server" Label="到货日期" LabelAlign="Right"
EnableEdit="true">
</f:DatePicker>
</Items>

17
SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs
View File

@ -70,11 +70,11 @@ namespace FineUIPro.Web.CQMS.Material
Alert.ShowInTop("请选择供货单位！", MessageBoxIcon.Warning);
return;
}
if (this.drpMainItem.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择主项！", MessageBoxIcon.Warning);
return;
}
//if (this.drpMainItem.SelectedValue == BLL.Const._Null)
//{
// Alert.ShowInTop("请选择主项！", MessageBoxIcon.Warning);
// return;
//}
SaveData();
}
else
@ -90,14 +90,17 @@ namespace FineUIPro.Web.CQMS.Material
Equipment.ProjectId = this.CurrUser.LoginProjectId;
Equipment.ContractNo = this.txtContractNo.Text.Trim();
Equipment.UnitId = this.drpUnit.SelectedValue;
Equipment.MainItemId = this.drpMainItem.SelectedValue;
if (this.drpMainItem.SelectedValue != BLL.Const._Null)
{
Equipment.MainItemId = this.drpMainItem.SelectedValue;
}
Equipment.EquipmentName = this.txtEquipmentName.Text.Trim();
Equipment.SpecificationAndModel = this.txtSpecificationAndModel.Text.Trim();
Equipment.EquipmentCode = this.txtEquipmentCode.Text.Trim();
Equipment.PressClass = this.txtPressClass.Text.Trim();
Equipment.Unit = this.txtUnit.Text.Trim();
Equipment.Num = Funs.GetNewDecimalOrZero(this.txtNum.Text.Trim());
Equipment.ArrivalDate = Funs.GetNewDateTimeOrNow(this.txtArrivalDate.Text.Trim());
Equipment.ArrivalDate = Funs.GetNewDateTime(this.txtArrivalDate.Text.Trim());
Equipment.CompileMan = this.CurrUser.PersonId;
Equipment.CompileDate = DateTime.Now;
if (!string.IsNullOrEmpty(EquipmentId))

58
SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs
View File

@ -171,11 +171,11 @@ namespace FineUIPro.Web.CQMS.Material
&& x.EquipmentName == pds.Rows[i][3].ToString() && x.EquipmentCode == pds.Rows[i][5].ToString() && x.ArrivalDate == Funs.GetNewDateTime(pds.Rows[i][9].ToString()));
if (oldViewInfo == null)
{
string row0 = pds.Rows[i][0].ToString();
if (string.IsNullOrEmpty(row0))
{
result += (i + 2).ToString() + "," + "合同编号" + "," + "此项为必填项！" + "|";
}
//string row0 = pds.Rows[i][0].ToString();
//if (string.IsNullOrEmpty(row0))
//{
// result += (i + 2).ToString() + "," + "合同编号" + "," + "此项为必填项！" + "|";
//}
string row1 = pds.Rows[i][1].ToString();
if (string.IsNullOrEmpty(row1))
@ -192,12 +192,14 @@ namespace FineUIPro.Web.CQMS.Material
}
string row2 = pds.Rows[i][2].ToString();
if (string.IsNullOrEmpty(row2))
{
result += (i + 2).ToString() + "," + "主项名称" + "," + "此项为必填项！" + "|";
}
else
{
//if (string.IsNullOrEmpty(row2))
//{
// result += (i + 2).ToString() + "," + "主项名称" + "," + "此项为必填项！" + "|";
//}
//else
//{
if (!string.IsNullOrEmpty(row2))
{
var mainItem = mainItems.FirstOrDefault(x => x.MainItemName == row2);
if (mainItem == null)
{
@ -240,22 +242,22 @@ namespace FineUIPro.Web.CQMS.Material
result += (i + 2).ToString() + "," + "数量" + "," + "此项为必填项！" + "|";
}
string row9 = pds.Rows[i][9].ToString();
if (!string.IsNullOrEmpty(row9))
{
try
{
DateTime d = Convert.ToDateTime(row9.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "到货日期" + "," + "[" + row9 + "]格式错误！" + "|";
}
}
else
{
result += (i + 2).ToString() + "," + "到货日期" + "," + "此项为必填项！" + "|";
}
//string row9 = pds.Rows[i][9].ToString();
//if (!string.IsNullOrEmpty(row9))
//{
// try
// {
// DateTime d = Convert.ToDateTime(row9.Trim());
// }
// catch (Exception)
// {
// result += (i + 2).ToString() + "," + "到货日期" + "," + "[" + row9 + "]格式错误！" + "|";
// }
//}
//else
//{
// result += (i + 2).ToString() + "," + "到货日期" + "," + "此项为必填项！" + "|";
//}
}
}
if (!string.IsNullOrEmpty(result))
@ -416,7 +418,7 @@ namespace FineUIPro.Web.CQMS.Material
equipment.PressClass = pds.Rows[i][6].ToString().Trim();
equipment.Unit = pds.Rows[i][7].ToString().Trim();
equipment.Num = Funs.GetNewDecimalOrZero(pds.Rows[i][8].ToString().Trim());
equipment.ArrivalDate = Funs.GetNewDateTimeOrNow(pds.Rows[i][9].ToString().Trim());
equipment.ArrivalDate = Funs.GetNewDateTime(pds.Rows[i][9].ToString().Trim());
equipment.CompileMan = this.CurrUser.PersonId;
equipment.CompileDate = DateTime.Now;
BLL.CQMS_EquipmentService.AddEquipment(equipment);

2
SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs
View File

@ -320,7 +320,7 @@ namespace FineUIPro.Web.CQMS.Material
}
else if (state.ToString() == BLL.Const.Inspection_Audit1)
{
return "总包专业工程师审核";
return "总包专业工程师审批";
}
else if (state.ToString() == BLL.Const.Inspection_Audit2)
{

14
SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
View File

@ -218,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Material
}
else if (state.ToString() == BLL.Const.Inspection_Audit1)
{
return "总包专业工程师审核";
return "总包专业工程师审批";
}
else if (state.ToString() == BLL.Const.Inspection_Audit2)
{
@ -256,20 +256,12 @@ namespace FineUIPro.Web.CQMS.Material
string State = BLL.CQMS_InspectionService.GetInspectionByInspectionId(this.InspectionId).State;
if (this.RadioButtonList1.SelectedValue.Equals("true"))
{
if (State == Const.Inspection_Audit2)
if (State == Const.Inspection_Audit1)
{
this.drpHandleMan.Enabled = false;
}
this.drpHandleType.SelectedIndex = 0;
if (State == Const.Inspection_Audit1)
{
this.drpHandleMan.SelectedIndex = 2;
}
else
{
this.drpHandleMan.SelectedIndex = 0;
}
this.drpHandleMan.SelectedIndex = 0;
}
else
{

2
SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Material
}
else if (state.ToString() == BLL.Const.Inspection_Audit1)
{
return "总包专业工程师审核";
return "总包专业工程师审批";
}
else if (state.ToString() == BLL.Const.Inspection_Audit2)
{