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-22 12:34:27 +08:00
parent 2589ff97b4
commit edb8ad2753
9 changed files with 95 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Material/MaterialIn.aspx.cs
+28 -15
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Material
oleDBConn.Close();
oleDBConn.Dispose();
hdCheckResult.Text = "1";
AddDatasetToSQL(ds.Tables[0], 11);
AddDatasetToSQL(ds.Tables[0], 12);
}
catch (Exception exc)
{
@@ -172,22 +172,22 @@ namespace FineUIPro.Web.CQMS.Material
if (oldViewInfo == null)
{
string row0 = pds.Rows[i][0].ToString();
if (string.IsNullOrEmpty(row0))
{
result += (i + 2).ToString() + "," + "合同编号" + "," + "此项为必填项！" + "|";
}
//if (string.IsNullOrEmpty(row0))
//{
// result += (i + 2).ToString() + "," + "合同编号" + "," + "此项为必填项！" + "|";
//}
string row1 = pds.Rows[i][1].ToString();
if (string.IsNullOrEmpty(row1))
{
result += (i + 2).ToString() + "," + "供货单位名称" + "," + "此项为必填项！" + "|";
result += (i + 2).ToString() + "," + "采购单位" + "," + "此项为必填项！" + "|";
}
else
{
var unit = units.FirstOrDefault(x => x.UnitName == row1);
if (unit == null)
{
result += (i + 2).ToString() + "," + "供货单位名称" + "," + "[" + row1 + "]不存在！" + "|";
result += (i + 2).ToString() + "," + "采购单位" + "," + "[" + row1 + "]不存在！" + "|";
}
}
@@ -198,11 +198,14 @@ namespace FineUIPro.Web.CQMS.Material
//}
//else
//{
if (!string.IsNullOrEmpty(row2))
{
var mainItem = mainItems.FirstOrDefault(x => x.MainItemName == row2);
if (mainItem == null)
{
result += (i + 2).ToString() + "," + "主项名称" + "," + "[" + row2 + "]不存在！" + "|";
}
}
//}
string row3 = pds.Rows[i][3].ToString();
@@ -211,11 +214,11 @@ namespace FineUIPro.Web.CQMS.Material
result += (i + 2).ToString() + "," + "材料名称" + "," + "此项为必填项！" + "|";
}
string row4 = pds.Rows[i][4].ToString();
if (string.IsNullOrEmpty(row4))
{
result += (i + 2).ToString() + "," + "规格型号" + "," + "此项为必填项！" + "|";
}
//string row4 = pds.Rows[i][4].ToString();
//if (string.IsNullOrEmpty(row4))
//{
// result += (i + 2).ToString() + "," + "规格型号" + "," + "此项为必填项！" + "|";
//}
string row9 = pds.Rows[i][9].ToString();
if (!string.IsNullOrEmpty(row9))
@@ -250,6 +253,12 @@ namespace FineUIPro.Web.CQMS.Material
//{
// result += (i + 2).ToString() + "," + "到货日期" + "," + "此项为必填项！" + "|";
//}
string row11 = pds.Rows[i][11].ToString();
if (string.IsNullOrEmpty(row11))
{
result += (i + 2).ToString() + "," + "生产厂家" + "," + "此项为必填项！" + "|";
}
}
}
if (!string.IsNullOrEmpty(result))
@@ -357,7 +366,7 @@ namespace FineUIPro.Web.CQMS.Material
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 11);
AddDatasetToSQL2(ds.Tables[0], 12);
}
catch (Exception ex)
{
@@ -403,7 +412,10 @@ namespace FineUIPro.Web.CQMS.Material
materialCheck.ProjectId = this.CurrUser.LoginProjectId;
materialCheck.ContractNo = pds.Rows[i][0].ToString().Trim();
materialCheck.UnitId = units.First(e => e.UnitName == pds.Rows[i][1].ToString().Trim()).UnitId;
materialCheck.MainItemId = mainItems.First(e => e.MainItemName == pds.Rows[i][2].ToString().Trim()).MainItemId;
if (!string.IsNullOrEmpty(pds.Rows[i][2].ToString().Trim()))
{
materialCheck.MainItemId = mainItems.First(e => e.MainItemName == pds.Rows[i][2].ToString().Trim()).MainItemId;
}
materialCheck.MaterialName = pds.Rows[i][3].ToString().Trim();
materialCheck.SpecificationAndModel = pds.Rows[i][4].ToString().Trim();
materialCheck.MaterialCode = pds.Rows[i][5].ToString().Trim();
@@ -411,7 +423,8 @@ namespace FineUIPro.Web.CQMS.Material
materialCheck.PressClass = pds.Rows[i][7].ToString().Trim();
materialCheck.Unit = pds.Rows[i][8].ToString().Trim();
materialCheck.Num = Funs.GetNewDecimalOrZero(pds.Rows[i][9].ToString().Trim());
materialCheck.ArrivalDate = Funs.GetNewDateTimeOrNow(pds.Rows[i][10].ToString().Trim());
materialCheck.ArrivalDate = Funs.GetNewDateTime(pds.Rows[i][10].ToString().Trim());
materialCheck.Factory = pds.Rows[i][11].ToString().Trim();
materialCheck.CompileMan = this.CurrUser.PersonId;
materialCheck.CompileDate = DateTime.Now;
BLL.CQMS_MaterialService.AddMaterial(materialCheck);