2022-10-10 焊接材料编码库导入修改及其相关联界面修改。小程序包装信息接口添加。合同劳务人员下拉框

This commit is contained in:
2022-10-10 09:56:40 +08:00
parent c1a7f0aa14
commit 00aeaac1e2
18 changed files with 260 additions and 32 deletions
@@ -128,7 +128,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
return;
}
DataRow[] dv = ds.Tables[0].Select("采购码 <>'' and 元件类型 <>''");
DataRow[] dv = ds.Tables[0].Select("元件编码 <>'' and 类型 <>''");
//导入数据库
if (dv.Length > 0)
{
@@ -137,20 +137,20 @@ namespace FineUIPro.Web.HJGL.BaseInfo
HJGL_MaterialCodeLib item = new HJGL_MaterialCodeLib();
#region
if (dv[i]["采购码"] != null && !string.IsNullOrEmpty(dv[i]["采购码"].ToString()))
if (dv[i]["元件编码"] != null && !string.IsNullOrEmpty(dv[i]["元件编码"].ToString()))
{
item.MaterialCode = dv[i]["采购码"].ToString();
item.MaterialCode = dv[i]["元件编码"].ToString();
}
else
{
errorInfos += (i + 2) + "Line, [采购码] 不能为空</br>";
errorInfos += (i + 2) + "Line, [元件编码] 不能为空</br>";
}
item.MaterialDef = dv[i]["材料描述"].ToString();
item.MaterialSpec = dv[i]["规格"].ToString();
item.MaterialMade = dv[i]["材质"].ToString();
// item.MaterialMade = dv[i]["材质"].ToString();
item.MaterialUnit = dv[i]["单位"].ToString();
item.MaterialName = dv[i]["元件类型"].ToString();
item.PipeGrade = dv[i]["管道等级"].ToString();
item.MaterialName = dv[i]["类型"].ToString();
//item.PipeGrade = dv[i]["管道等级"].ToString();
//item.ProjectId = CurrUser.LoginProjectId;
//= SQLHelper.GetNewID(typeof(Model.Editor_CostReport));
if (!codeLib.Select(x => x.MaterialCode).Contains(item.MaterialCode))