Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi

FactorySystemApi/Controllers/MaterialController.cs

@@ -420,7 +420,11 @@ namespace FactorySystemApi.Controllers
 
                     apiResult.Data = BaseBll.UpdateDataModel(inParam, "TFS_Material");
 
-                    List<TFS_Material> result = MaterialBll.GetMaterial(tempId);
+                    TFS_FTeamwork fS_FTeamwork = BaseBll.GetTempModel<TFS_FTeamwork>("FID=" + tempId);
+                    //fS_FTeamwork.FMaterialHalfIDs
+                    //fMaterialFormulaIDs
+                    List<TFS_Material> result = MaterialBll.GetMaterial(fS_FTeamwork.FMaterialFormulaIDs);
+                  
 
                     if (result.Where(m => m.FSuccedaneumID == 0).Count() == 0)
                     {

FactorySystemBll/MaterialBll.cs

@@ -99,11 +99,11 @@ namespace FactorySystemBll
             return result;
         }
 
-        public List<TFS_Material> GetMaterial(int tempId) 
+        public List<TFS_Material> GetMaterial(string fMaterialFormulaIDs) 
         {
             return AppSettingsHelper.GetSqlSugar()
                 .Queryable<TFS_Material, TFS_ViewMaterial>((a, b) => new JoinQueryInfos(JoinType.Left, a.FID == b.FMaterialID))
-                .Where((a, b) => b.FTeamID == tempId).Select<TFS_Material>((a, b) => a).ToList();
+                .Where((a, b) => fMaterialFormulaIDs.Contains(a.FID.ToString())).Select<TFS_Material>((a, b) => a).ToList();
         }
         /// <summary>
         /// 更具试验号获取物料

FactorySystemBll/TaskBll.cs

@@ -37,7 +37,7 @@ namespace FactorySystemBll
                 .WhereIF(tq.FUserID != null, a => (',' + a.FUserID + ',').Contains(',' + tq.FUserID + ','))
                 // 协同
                 .WhereIF(tq.FTeamID > 0, a => a.FTeamID == tq.FTeamID).OrderBy((a, b, c) => a.FID, OrderByType.Desc)
-                .Select<TaskRow>("a.*,b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,2)as int)as FViewType,(case when b.FBomJson IS NULL then 0 when cast(b.FBomJson as nvarchar) = '' then 0 else 1 end) as FHasBomJson")
+                .Select<TaskRow>("a.*,b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,2)as int)as FViewType,(case when b.FBomJson IS NULL then 0 when cast(b.FBomJson as nvarchar) = '' then 0 else 1 end) as FHasBomJson,b.FBomJson")
                 .ToPageList(tq.FPageIndex, tq.FPageSize, ref totalNumber);
         }
 

FactorySystemModel/ResponseModel/TaskRow.cs

@@ -53,5 +53,7 @@ namespace FactorySystemModel.ResponseModel
         /// Desc:是否有FHasBomJson
         /// </summary>      
         public int FHasBomJson { get; set; }
+
+        public string FBomJson { get; set; }
     }
 }