commit by yzf

FactorySystemApi/Controllers/MaterialController.cs

@@ -171,6 +171,30 @@ namespace FactorySystemApi.Controllers
             }, apiResult, Request, inParam);
         }
 
+        /// <summary>
+        /// 查询物料
+        /// </summary>
+        [HttpPost]
+        public ApiResult GetMaterialById(Dictionary<string, object> inParam)
+        {
+            ApiResult apiResult = new ApiResult();
+            return ExceptionHelper.TryReturnException(() =>
+            {
+                if (inParam == null || inParam.Count < 0)
+                {
+                    apiResult.Error("未接收到参数");
+                }
+                else if (inParam.ContainsKey("ID"))
+                {
+                    apiResult.Data = MaterialBll.GetMaterialById(int.Parse(inParam["ID"].ToString()));
+                }
+                else
+                {
+                    apiResult.Error("缺少查询参数");
+                }
+            }, apiResult, Request, inParam);
+        }
+
         /// <summary>
         /// 物料查询接口（对方查询）
         /// </summary>
@@ -255,6 +279,8 @@ namespace FactorySystemApi.Controllers
         }
 
 
+        
+
 
         /// <summary>
         /// 导出SAP视图

FactorySystemApi/Controllers/ViewController.cs

@@ -129,7 +129,16 @@ namespace FactorySystemApi.Controllers
             return ExceptionHelper.TryReturnException(() => {
                 if (!string.IsNullOrWhiteSpace(inParam["tempId"].ToString()))
                 {
-                    apiResult.Data = _viewBll.EexcSql(int.Parse(inParam["tempId"].ToString()));
+                    
+                    var data = _viewBll.EexcSql(int.Parse(inParam["tempId"].ToString()));
+                    if (data != null) 
+                    {
+                        apiResult.Data = data;
+                    }
+                    else
+                    {
+                        apiResult.Error("未找到物料");
+                    }
                 }
                 else 
                 {

FactorySystemBll/HalfMaterialTeamworkBll.cs

@@ -408,8 +408,8 @@ namespace FactorySystemBll
 
                     int oldId = mItem.FID, oldParent = mItem.FParentID;
                     Expression<Func<TFS_Material, bool>> expression;
-                    if (string.IsNullOrEmpty(mItem.FCode)) expression = s => s.FPlmCode == mItem.FPlmCode && s.FVersionCode == mItem.FVersionCode;
+                    if (string.IsNullOrEmpty(mItem.FCode)) expression = s => s.FPlmCode == mItem.FPlmCode && s.FVersionCode == mItem.FVersionCode&&s.FID==mItem.FID;
-                    else expression = s => s.FCode == mItem.FCode && s.FVersionCode == mItem.FVersionCode;
+                    else expression = s => s.FCode == mItem.FCode && s.FVersionCode == mItem.FVersionCode && s.FID == mItem.FID;
 
                     TFS_Material mData = db.Queryable<TFS_Material>().Where(expression).First();
                     if (mData == null)//没物料新增物料

FactorySystemBll/MaterialBll.cs

@@ -106,6 +106,12 @@ namespace FactorySystemBll
                 .Where((a, b) => b.FTeamID == tempId).Select<TFS_Material>((a, b) => a).ToList();
         }
 
+        public TFS_Material GetMaterialById(int id) 
+        {
+            return BaseBll.GetTempModel<TFS_Material>("FID=" + id);
+        }
+
+
         /// <summary>
         /// 物料子数据比对
         /// </summary>

FactorySystemBll/TeamworkBll.cs

@@ -79,7 +79,7 @@ namespace FactorySystemBll
                 }
             }
             string searchKey = "a.FID,a.FSaleCode,a.FTestCode,a.FViewType,a.FMdmCode,a.FFormulaID,a.FWeightUnit,a.FBomState,a.FProgress," +
-                "a.FDeleted,a.FAddUser,a.FAddDate,a.FEditDate,b.FName FAddUserName,a.FFormulaName,a.FFormulaTestCode,a.FMaterialHalfIDs";
+                "a.FDeleted,a.FAddUser,a.FAddDate,a.FEditDate,b.FName FAddUserName,a.FFormulaName,a.FFormulaTestCode,a.FMaterialHalfIDs,a.FCreateFactoryID";
             SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
             var temp = db.Queryable<TFS_FTeamwork, TUser>((a, b) => new JoinQueryInfos(JoinType.Left, a.FAddUser == b.FID)).Select(searchKey);
             List<TFS_FTeamwork> resultList = db.Queryable(temp).Where(string.Join(" and ", paramName), paramVal)

FactorySystemBll/ViewBll.cs

@@ -81,7 +81,7 @@ namespace FactorySystemBll
                  new JoinQueryInfos(JoinType.Inner, a.FMaterialID == b.FID))
                .Where((a, b) => a.FTeamID == teamId)
                .WhereIF(currUser != null, (a, b) => a.FFactoryID == currUser.FFactoryID)
-               .WhereIF(viewType > 0, (a, b) => a.FViewType == 2)
+               .WhereIF(viewType > 0, (a, b) => a.FViewType == 1)
                .Select<object>("distinct a.*,b.FTypeID1,b.FTypeID2,b.FK3Code,b.FK3Name,b.FK3ShortCode,b.FTestCode,b.FRelationCode,b.FRelationName,b.FSAPCode,b.FSAPDescription,b.FMaterialGroup,b.FMaterialType,b.FCustomerCode,b.FStoreHouse," +
                 "b.FBomEntry,b.FLineHouse,b.FProductDesc,b.FWorkCenter,b.FCraftExplain,b.FIidentifier,b.FGuaranteePeriod,b.FBStorageConditions,b.FSafetyStock,b.FTriggerRatio,b.FMinAmount,b.FMaxAmount,b.FYield,b.FFixedLoss,b.FTheoryYield," +
                 "b.FQualityTest1,b.FQualityTest2").ToDictionaryList();
@@ -919,8 +919,17 @@ namespace FactorySystemBll
         public object EexcSql(int tempId = 0)
         {
             string sql = "";
+            SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
+
             if (tempId > 0)
             {
+                sql = string.Format("SELECT FMaterialFormulaIDs FROM TFS_FTeamwork WHERE FID='{0}'", tempId);
+                var result= db.Ado.SqlQuery<string>(sql);
+
+                if (string.IsNullOrWhiteSpace(result[0])) 
+                {
+                    return null;
+                }
                 sql = string.Format(@"SELECT
 	                                        DISTINCT
 	                                        a.*,
@@ -929,14 +938,13 @@ namespace FactorySystemBll
 	                                        TFS_Material AS a
 	                                        LEFT JOIN TUser AS c ON a.FEditUser= c.FID 
                                         WHERE
-	                                        a.FID IN(SELECT FMaterialFormulaIDs FROM TFS_FTeamwork WHERE FID='{0}');", tempId);
+	                                        a.FID IN({0});", result[0]);
 
             }
             else
             {
                 sql = string.Format(@"SELECT DISTINCT b.*,c.FName AS 'FUserName' FROM TFS_ViewMaterial AS a LEFT JOIN TFS_Material AS b ON a.FMaterialID=b.FID LEFT JOIN TUser AS c ON b.FEditUser=c.FID ");
             }
-            SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
 
             return db.Ado.SqlQuery<object>(sql);