commit by yzf

FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs

@@ -188,14 +188,8 @@ namespace FactorySystemApi.Controllers
             {
                 //对接获取
                 //inParam.Add("FMdmCode", GetMdmCode(inParam));
-                var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
-                inParam.Add("FMdmCode", ts.TotalSeconds.ToString("F0"));
-                if (!inParam.ContainsKey("FMdmCode") || string.IsNullOrEmpty(inParam["FMdmCode"].ToString().Trim()))
-                {
-                    apiResult.Error("获取MDM失败");
-                }
-                else
-                {
+                //var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+                //inParam.Add("FMdmCode", ts.TotalSeconds.ToString("F0"));
                 try
                 {
                     inParam.TryGetValue("FState", out object state);
@@ -329,8 +323,6 @@ namespace FactorySystemApi.Controllers
                     MaterialTeamworkBll.UpdateFormula(inParam["FTestCode"].ToString(), inParam["FNewTestCode"].ToString(), 0, 0, string.Join(",", ids));
                     throw;
                 }
-            
-                }
             }, apiResult, Request, inParam);
         }
 
@@ -1152,7 +1144,7 @@ namespace FactorySystemApi.Controllers
                 }
                 else
                 {
-                    dataList = MaterialTeamworkBll.GetTeamworkViewData(selectSql.Trim(','), whereSql, joinSql);
+                    dataList = MaterialTeamworkBll.GetHalfMaterialTeamworkViewData(selectSql.Trim(','), whereSql, joinSql);
                     dataList.Columns.Remove("FMaterialID");
                     if (intType == (int)Constant.TeamViewType.生产版本视图)
                     {

FactorySystemBll/HalfMaterialTeamworkBll.cs

@@ -323,6 +323,18 @@ namespace FactorySystemBll
             {2} where {1}", selectSql, whereSql, string.IsNullOrEmpty(joinSql) ? "" : joinSql);
             return db.Ado.GetDataTable(strSql);
         }
+        /// <summary>
+        /// 获取协同视图结果信息
+        /// </summary>
+        public DataTable GetHalfMaterialTeamworkViewData(string selectSql, string whereSql, string joinSql = "")
+        {
+            SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
+            string strSql = string.Format(@"select distinct {0},TFS_ViewMaterial.FMaterialID from TFS_HalfMaterialFTeamwork left join TFS_ViewMaterial on 
+            TFS_HalfMaterialFTeamwork.FID=TFS_ViewMaterial.FHalfMaterialTeamID left join TFS_Material on TFS_Material.FID=TFS_ViewMaterial.FMaterialID
+            {2} where {1}", selectSql, whereSql, string.IsNullOrEmpty(joinSql) ? "" : joinSql);
+            return db.Ado.GetDataTable(strSql);
+        }
+
 
         /// <summary>
         /// 获取协同视图结果信息