diff --git a/FactorySystemBll/ViewBll.cs b/FactorySystemBll/ViewBll.cs index 84d6067..e9f1ab7 100644 --- a/FactorySystemBll/ViewBll.cs +++ b/FactorySystemBll/ViewBll.cs @@ -812,6 +812,8 @@ namespace FactorySystemBll } + + result += db.Updateable(viewList).AS("TFS_ViewMaterial").WhereColumns("FMaterialID").Where(sqlWhere).ExecuteCommand(); result += HalfMaterialUnionModifyData(viewList, "TFS_ViewMaterial", teamId, db, "FMaterialID"); @@ -833,6 +835,46 @@ namespace FactorySystemBll materialList[i].Add("FK3ShortCode", k3Code.ToString().Split('.').Last()); } } + + if (materialList[i].ContainsKey("FName")) + { + materialList[i]["FName"] = viewList[i]["FBaseMaterialDesc"]; + } + else + { + materialList[i].Add("FName", viewList[i]["FBaseMaterialDesc"]); + } + + if (materialList[i].ContainsKey("FDesc")) + { + materialList[i]["FDesc"] = viewList[i]["FBaseMaterialDesc"]; + } + else + { + materialList[i].Add("FDesc", viewList[i]["FBaseMaterialDesc"]); + } + + + if (materialList[i].ContainsKey("FType")) + { + materialList[i]["FType"] = viewList[i]["FMRP1ProductType"]; + } + else + { + materialList[i].Add("FType", viewList[i]["FMRP1ProductType"]); + } + + if (materialList[i].ContainsKey("FCode")) + { + materialList[i]["FCode"] = viewList[i]["FBaseMaterialCode"]; + } + else + { + materialList[i].Add("FCode", viewList[i]["FBaseMaterialCode"]); + } + + + result += db.Updateable(materialList[i]).AS("TFS_Material").WhereColumns("FID").ExecuteCommand(); }