diff --git a/SGGL/BLL/CQMS/Material/CQMS_InspectionService.cs b/SGGL/BLL/CQMS/Material/CQMS_InspectionService.cs
index 231fc465..0a7351b1 100644
--- a/SGGL/BLL/CQMS/Material/CQMS_InspectionService.cs
+++ b/SGGL/BLL/CQMS/Material/CQMS_InspectionService.cs
@@ -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);
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx
index 402e2bf9..0847d20d 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx
@@ -16,7 +16,7 @@
+ MaxLength="70" LabelWidth="100px">
@@ -24,7 +24,7 @@
-
+
@@ -46,7 +46,7 @@
-
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs
index 23dafb55..3fc0a188 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs
@@ -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))
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs
index 89e5fe30..074457ae 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs
@@ -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);
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs
index 2b079e56..704c59f7 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs
@@ -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)
{
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
index 376752ee..de72a83b 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
@@ -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
{
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs
index 91a2113d..8272adb5 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs
@@ -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)
{