修改物料路线权限

FactorySystemApi/Controllers/MaterialTeamworkController.cs

@@ -236,6 +236,7 @@ namespace FactorySystemApi.Controllers
             return ExceptionHelper.TryReturnException(() => {
                 if (Request.Properties["token"] is ApiAuthInfo user)
                 {
+
                     inParam.TryGetValue("TFS_ViewMaterial", out object viewObj);
                     inParam.TryGetValue("TFS_Material", out object materialObj);
                     inParam.TryGetValue("TFS_MaterialInfo", out object infoObj);
@@ -267,7 +268,7 @@ namespace FactorySystemApi.Controllers
                     }
                     else if((task = tasks.FindLast(t => t.FType == 1)) != null)
                     {
-                        List<TUser> users = MaterialTaskBll.GetTaskUsers(0, viewType, task.FFactoryID);
+                        List<TUser> users = MaterialTaskBll.GetTaskUsers(2, viewType, task.FFactoryID);
 
                         if (users != null && users.Count > 0)
                         {
@@ -285,7 +286,7 @@ namespace FactorySystemApi.Controllers
                     }
                     else if ((task = tasks.FindLast(t => t.FType == 0)) != null)
                     {
-                        List<TUser> users = MaterialTaskBll.GetTaskUsers(0, viewType, task.FFactoryID);
+                        List<TUser> users = MaterialTaskBll.GetTaskUsers(1, viewType, task.FFactoryID);
 
                         if (users != null && users.Count > 0)
                         {
@@ -435,7 +436,7 @@ namespace FactorySystemApi.Controllers
                     result.Add("ViewId", vmId);
                 }
 
-                List<TUser> users = MaterialTaskBll.GetTaskUsers(0, view.FMRP1ProductType, factory.FID);
+                List<TUser> users = MaterialTaskBll.GetTaskUsers(1, view.FMRP1ProductType, factory.FID);
 
                 if (users == null || users.Count > 0)
                 {

FactorySystemBll/MaterialTaskBll.cs

@@ -30,9 +30,10 @@ namespace FactorySystemBll
                 .WhereIF(mtq.FDateRange != null && mtq.FDateRange[0] != "", (a, b) => a.FAddDate >= DateTime.Parse(mtq.FDateRange[0]))
                 .WhereIF(mtq.FDateRange != null && mtq.FDateRange[1] != "", (a, b) => a.FAddDate <= DateTime.Parse(mtq.FDateRange[1]))
                 // 责任人
-                //.WhereIF(mtq.FUserID != null, (a, b) => (',' + a.FUserID + ',').Contains(',' + mtq.FUserID + ',') || a.FAddUser.Equals(mtq.FUserID))
+                .WhereIF(mtq.FUserID != null, (a, b) => (',' + a.FUserID + ',').Contains(',' + mtq.FUserID + ','))
                 //// 协同
-                //.WhereIF(mtq.FMaterialTeamID > 0, (a, b) => a.FMaterialTeamID == mtq.FMaterialTeamID).OrderBy((a, b) => a.FID, OrderByType.Desc)
+                //.WhereIF(mtq.FMaterialTeamID > 0, (a, b) => a.FMaterialTeamID == mtq.FMaterialTeamID)
+                .OrderBy((a, b) => a.FID, OrderByType.Desc)
                 .Select<MaterialTaskRow>("a.*,b.FMaterialName,b.FMaterialCode,b.FTestCode,b.FMaterialType, c.FName as FAddUserName").OrderBy((a) => a.FID, OrderByType.Desc)
                 .ToPageList(mtq.FPageIndex, mtq.FPageSize, ref totalNumber);
         }

FactorySystemBll/MaterialTeamworkBll.cs

@@ -209,7 +209,33 @@ namespace FactorySystemBll
 
                 for (int i = 0; i < viewList.Count; i++)
                 {
-                    //判断是否等于中间品
+                    // 设置成成品视图
+                    if (viewList[i]["FMRP1ProductType"].ToString() == "10")
+                    {
+                        if (viewList[i].ContainsKey("FViewType"))
+                        {
+                            viewList[i]["FViewType"] = (int)Constant.ViewType.成品视图;
+                        }
+                        else
+                        {
+                            viewList[i].Add("FViewType", (int)Constant.ViewType.成品视图);
+                        }
+                    }
+
+                    // 设置成半成品视图
+                    if (viewList[i]["FMRP1ProductType"].ToString() == "20")
+                    {
+                        if (viewList[i].ContainsKey("FViewType"))
+                        {
+                            viewList[i]["FViewType"] = (int)Constant.ViewType.半成品视图;
+                        }
+                        else
+                        {
+                            viewList[i].Add("FViewType", (int)Constant.ViewType.半成品视图);
+                        }
+                    }
+
+                    //设置成中间品视图或香基视图，判断是否等于中间品
                     if (viewList[i]["FMRP1ProductType"].ToString() == "30")
                     {
                         TFS_MaterialType materialType = materialTypeBll.GetMaterialTypeByID(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault();
@@ -236,10 +262,26 @@ namespace FactorySystemBll
                             }
                         }
                     }
+
+                    // 设置成原料视图
+                    if (viewList[i]["FMRP1ProductType"].ToString() == "20")
+                    {
+                        if (viewList[i].ContainsKey("FViewType"))
+                        {
+                            viewList[i]["FViewType"] = (int)Constant.ViewType.原料视图;
+                        }
+                        else
+                        {
+                            viewList[i].Add("FViewType", (int)Constant.ViewType.原料视图);
+                        }
+                    }
+
+                    viewList[i].Remove("FTypeID2");
+
+                    // 更新视图
+                    result += db.Updateable(viewList[i]).AS("TFS_ViewMaterial").WhereColumns("FMaterialID").Where(sqlWhere).ExecuteCommand();
                 }
 
-                // 更新视图
-                result += db.Updateable(viewList).AS("TFS_ViewMaterial").WhereColumns("FMaterialID").Where(sqlWhere).ExecuteCommand();
                 result += UnionModifyData(viewList, "TFS_ViewMaterial", teamId, teamworkType, db, "FMaterialID");
             }
 
@@ -298,7 +340,7 @@ namespace FactorySystemBll
 
                     result += db.Updateable(infoList[i]).AS("TFS_MaterialInfo").WhereColumns("FDataID", "FType").ExecuteCommand();
                 }
-                //result += db.Updateable(infoList).AS("TFS_MaterialInfo").WhereColumns("FDataID", "FType").ExecuteCommand();
+
                 result += UnionModifyData(infoList, "TFS_MaterialInfo", teamId, teamworkType, db, "FDataID");
             }