commit by yzf

master
Yang 3 years ago
parent bb6dfe5a40
commit 942f38826f

@ -187,7 +187,6 @@ namespace FactorySystemBll
int result = 0; int result = 0;
SqlSugarClient db = AppSettingsHelper.GetSqlSugar(); SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
MaterialBll materialBll = new MaterialBll();
MaterialTypeBll materialTypeBll = new MaterialTypeBll(); MaterialTypeBll materialTypeBll = new MaterialTypeBll();
if (viewList != null && viewList.Count > 0) if (viewList != null && viewList.Count > 0)
{ {
@ -210,13 +209,11 @@ namespace FactorySystemBll
for (int i = 0; i < viewList.Count; i++) for (int i = 0; i < viewList.Count; i++)
{ {
TFS_Material material = materialBll.GetMaterial(int.Parse(viewList[i]["FMaterialID"].ToString())).LastOrDefault();
//判断是否等于中间品 //判断是否等于中间品
if (material.FType == "30") if (viewList[i]["FMRP1Type"].ToString() == "30")
{ {
TFS_MaterialType materialType = materialTypeBll.GetMaterialTypeByID(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault(); TFS_MaterialType materialType = materialTypeBll.GetMaterialTypeByID(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault();
TFS_Material material2 = materialBll.GetMaterial(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault(); if (materialType.FName.Contains("香基"))
if (material2.FName.Contains("香基"))
{ {
if (viewList[i].ContainsKey("FViewType")) if (viewList[i].ContainsKey("FViewType"))
{ {

@ -498,7 +498,6 @@ namespace FactorySystemBll
{ {
int result = 0; int result = 0;
SqlSugarClient db = AppSettingsHelper.GetSqlSugar(); SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
MaterialBll materialBll = new MaterialBll();
MaterialTypeBll materialTypeBll = new MaterialTypeBll(); MaterialTypeBll materialTypeBll = new MaterialTypeBll();
if (viewList != null && viewList.Count > 0) if (viewList != null && viewList.Count > 0)
{ {
@ -511,13 +510,11 @@ namespace FactorySystemBll
for (int i = 0; i < viewList.Count; i++) for (int i = 0; i < viewList.Count; i++)
{ {
TFS_Material material = materialBll.GetMaterial(int.Parse(viewList[i]["FMaterialID"].ToString())).LastOrDefault();
//判断是否等于中间品 //判断是否等于中间品
if (material.FType == "30") if (viewList[i]["FMRP1Type"].ToString() == "30")
{ {
TFS_MaterialType materialType = materialTypeBll.GetMaterialTypeByID(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault(); TFS_MaterialType materialType = materialTypeBll.GetMaterialTypeByID(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault();
TFS_Material material2 = materialBll.GetMaterial(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault(); if (materialType.FName.Contains("香基"))
if (material2.FName.Contains("香基"))
{ {
if (viewList[i].ContainsKey("FViewType")) if (viewList[i].ContainsKey("FViewType"))
{ {
@ -702,13 +699,11 @@ namespace FactorySystemBll
} }
for (int i = 0; i < viewList.Count; i++) for (int i = 0; i < viewList.Count; i++)
{ {
TFS_Material material = materialBll.GetMaterial(int.Parse(viewList[i]["FMaterialID"].ToString())).LastOrDefault();
//判断是否等于中间品 //判断是否等于中间品
if (material.FType == "30") if (viewList[i]["FMRP1Type"].ToString() == "30")
{ {
TFS_MaterialType materialType = materialTypeBll.GetMaterialTypeByID(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault(); TFS_MaterialType materialType = materialTypeBll.GetMaterialTypeByID(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault();
TFS_Material material2 = materialBll.GetMaterial(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault(); if (materialType.FName.Contains("香基"))
if (material2.FName.Contains("香基"))
{ {
if (viewList[i].ContainsKey("FViewType")) if (viewList[i].ContainsKey("FViewType"))
{ {

Loading…
Cancel
Save