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

修改材料报验流程

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs
+30 -28
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);