新增物料路线

FactorySystemApi/Controllers/MaterialTaskController.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Web.Http;
+using FactorySystemApi.Sap_Group;
+using FactorySystemBll;
+using FactorySystemCommon;
+using FactorySystemModel.BusinessModel;
+using FactorySystemModel.EnumModel;
+using FactorySystemModel.RequestModel;
+using FactorySystemModel.ResponseModel;
+using FactorySystemModel.SqlSugarModel;
+
+namespace FactorySystemApi.Controllers
+{
+    /// <summary>
+    /// 任务
+    /// </summary>
+    [UserLoginFilter]
+    public class MaterialTaskController : ApiController
+    {
+        private readonly MaterialTaskBll _taskBll = new MaterialTaskBll();
+
+        /// <summary>
+        /// 根据当前用户获取任务列表
+        /// </summary>
+        [HttpPost]
+        public ApiResult GetPageList(MaterialTaskQuery mtq)
+        {
+            ApiResult apiResult = new ApiResult();
+            return ExceptionHelper.TryReturnException(() =>
+            {
+                if (mtq.FIsUser && Request.Properties["token"] is ApiAuthInfo user)
+                {
+                    mtq.FUserID = user.FID.ToString();
+                }
+                apiResult.Data = new
+                {
+                    List = _taskBll.GetList(mtq, out var totalNumber),
+                    Total = totalNumber
+                };
+            }, apiResult, Request);
+        }
+    }
+}

FactorySystemApi/Controllers/MaterialTeamworkController.cs

@@ -0,0 +1,231 @@
+using FactorySystemBll;
+using FactorySystemCommon;
+using FactorySystemModel.BusinessModel;
+using FactorySystemModel.EnumModel;
+using FactorySystemModel.ResponseModel;
+using FactorySystemModel.SqlSugarModel;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Web.Http;
+using System.Data;
+using System.IO;
+using Newtonsoft.Json.Linq;
+using FactorySystemApi.Plm_Formula;
+using System.Linq;
+using SqlSugar;
+using FactorySystemModel.RequestModel;
+
+namespace FactorySystemApi.Controllers
+{
+    /// <summary>
+    /// 协同接口
+    /// </summary>
+    [UserLoginFilter]
+    public class MaterialTeamworkController : ApiController
+    {
+        /// <summary>
+        /// 数据处理层
+        /// </summary>
+        public readonly BaseBll BaseBll = new BaseBll();
+        /// <summary>
+        /// 数据处理层-物料处理
+        /// </summary>
+        public readonly MaterialBll MaterialBll = new MaterialBll();
+        /// <summary>
+        /// 数据处理层-视图处理
+        /// </summary>
+        public readonly ViewBll ViewBll = new ViewBll();
+        /// <summary>
+        /// 数据处理层-路线处理
+        /// </summary>
+        private readonly MaterialTeamworkBll _taskBll = new MaterialTeamworkBll();
+        /// <summary>
+        /// 事项操作日志
+        /// </summary>
+        public readonly OperateLogBll OperateLogBll = new OperateLogBll();
+        /// <summary>
+        /// 初始化
+        /// </summary>
+        public MaterialTeamworkController()
+        {
+        }
+
+        /// <summary>
+        /// 新增物料路线
+        /// </summary>
+        [HttpPost]
+        public ApiResult InsertDataModel(Dictionary<string, object> inParam)
+        {
+            ApiResult apiResult = new ApiResult();
+            return ExceptionHelper.TryReturnException(() =>
+            {
+                ApiAuthInfo user = Request.Properties["token"] as ApiAuthInfo;
+                TFS_Factory factory = BaseBll.GetTempModel<TFS_Factory>(int.Parse(inParam["FCreateFactoryID"].ToString()));
+                Dictionary<string, int> result = new Dictionary<string, int>();
+
+                //inParam.Add("FMdmCode", GetMdmCode(inParam));
+                inParam.Remove("FID");
+
+                string materialName = inParam["FMaterialName"].ToString();
+
+                inParam.TryGetValue("FState", out object state);
+                if (null == state)
+                {
+                    inParam["FState"] = state = 1;
+                }
+
+                if (inParam.ContainsKey("FAddUser"))
+                {
+                    inParam["FAddUser"] = user.FID;
+                }
+                else
+                {
+                    inParam.Add("FAddUser", user.FID);
+                }
+
+                if (inParam.ContainsKey("FAddDate"))
+                {
+                    inParam["FAddDate"] = DateTime.Now;
+                }
+                else
+                {
+                    inParam.Add("FEditDate", DateTime.Now);
+                }
+
+                if (inParam.ContainsKey("FEditUser"))
+                {
+                    inParam["FEditUser"] = user.FID;
+                }
+                else
+                {
+                    inParam.Add("FEditUser", user.FID);
+                }
+
+                if (inParam.ContainsKey("FEditDate"))
+                {
+                    inParam["FEditDate"] = DateTime.Now;
+                }
+                else
+                {
+                    inParam.Add("FEditDate", DateTime.Now);
+                }
+
+                if (inParam.ContainsKey("FCreateFactoryID"))
+                {
+                    inParam.Remove("FCreateFactoryID");
+                }
+                inParam.Add("FCreateFactoryID", factory.FID);
+                inParam.Add("FCreateFactoryCode", factory.FCode);
+                inParam.Add("FCreateFactoryType", factory.FType);
+                if (factory.FType != (int)Constant.FactoryType.单工厂)
+                {
+                    TFS_Factory prodFactory = BaseBll.GetTempModel<TFS_Factory>(factory.FFactoryID);
+                    inParam.Add("FProdFactoryID", prodFactory.FID);
+                    inParam.Add("FProdFactoryCode", prodFactory.FCode);
+                }
+                else
+                {
+                    inParam.Add("FProdFactoryID", factory.FID);
+                    inParam.Add("FProdFactoryCode", factory.FCode);
+                }
+
+                inParam.Add("FTeamworkType", 1);
+
+                int teamId = BaseBll.InsertDataModel(inParam, "TFS_FMaterialTeamwork");
+                result.Add("TeamId", teamId);
+
+                if (teamId > 0)
+                {
+                    inParam.Add("FID", teamId);
+
+                    if (state.ToString().Contains("1"))
+                    {
+                        TFS_FMaterialTeamwork teamwork = BaseBll.GetTempModel<TFS_FMaterialTeamwork>(teamId);
+
+                        // 创建物料和物料视图
+                        Dictionary<string, int> materialInfo = CreateMaterial(inParam, factory, teamwork);
+                        foreach(string key in materialInfo.Keys)
+                        {
+                            result.Add(key, materialInfo[key]);
+                        }
+
+                        // 创建物料分类任务
+                        int taskId = BaseBll.CreateMaterialTask(teamId, user.FID, 15, factory.FID);
+                        result.Add("TaskId", taskId);
+                    }
+                }
+
+                apiResult.Data = result;
+            }, apiResult, Request, inParam);
+        }
+
+        /// <summary>
+        /// 查询物料路线
+        /// </summary>
+        [HttpPost]
+        public ApiResult GetPageList(MaterialTeamworkQuery mtq)
+        {
+            ApiResult apiResult = new ApiResult();
+            return ExceptionHelper.TryReturnException(() =>
+            {
+                if (mtq.FIsUser && Request.Properties["token"] is ApiAuthInfo user)
+                {
+                    mtq.FUserID = user.FID;
+                }
+                apiResult.Data = new
+                {
+                    List = _taskBll.GetList(mtq, out var totalNumber),
+                    Total = totalNumber
+                };
+            }, apiResult, Request);
+        }
+
+        private Dictionary<string, int> CreateMaterial(Dictionary<string, object> inParam, TFS_Factory factory, TFS_FMaterialTeamwork teamwork)
+        {
+            Dictionary<string, int> result = new Dictionary<string, int>();
+            // 创建物料（物料表新增数据）
+            TFS_Material material = new TFS_Material();
+            material.FName = inParam["FMaterialName"].ToString(); // 物料名称
+            material.FDesc = inParam["FMaterialName"].ToString(); // 物料描述
+            material.FMaterialGroup = inParam["FMaterialGroup"].ToString(); // 物料组
+            material.FBaseUnit = inParam["FWeightUnit"].ToString(); // 计量单位
+            material.FFactoryID = factory.FFactoryID; // 工厂
+            material.FFactoryCode = factory.FCode; // 工厂标识
+            material.FTestCode = inParam["FTestCode"].ToString(); // 试验号
+
+            int materialId = MaterialBll.InsertMaterial(material);
+
+            result.Add("MaterialId", materialId);
+
+            // 创建物料视图
+            TFS_ViewMaterial viewMaterial = new TFS_ViewMaterial();
+            viewMaterial.FTeamID = teamwork.FID; // 路线ID
+            viewMaterial.FMaterialID = materialId; // 物料ID
+            viewMaterial.FFactoryID = teamwork.FCreateFactoryID; // 工厂ID
+            viewMaterial.FFactoryCode = teamwork.FCreateFactoryCode; // 工厂Code
+            viewMaterial.FAddDate = DateTime.Now; // 创建日期
+            viewMaterial.FTeamType = 1; // 路线类型
+
+            int vmId = ViewBll.InsertMaterialView(viewMaterial);
+            result.Add("ViewId", vmId);
+
+            // 创建委托工厂视图
+            if (!teamwork.FCreateFactoryID.Equals(teamwork.FProdFactoryID))
+            {
+                viewMaterial = new TFS_ViewMaterial();
+                viewMaterial.FTeamID = teamwork.FID; // 路线ID
+                viewMaterial.FMaterialID = materialId; // 物料ID
+                viewMaterial.FFactoryID = teamwork.FProdFactoryID; // 工厂ID
+                viewMaterial.FFactoryCode = teamwork.FProdFactoryCode; // 工厂Code
+                viewMaterial.FAddDate = DateTime.Now; // 创建日期
+                viewMaterial.FTeamType = 1; // 路线类型
+
+                int prodVmId = ViewBll.InsertMaterialView(viewMaterial);
+                result.Add("ProdViewId", prodVmId);
+            }
+
+            return result;
+        }
+    }
+}

FactorySystemApi/Controllers/ViewController.cs

@@ -57,6 +57,33 @@ namespace FactorySystemApi.Controllers
             }, apiResult, Request);
         }
 
+        /// <summary>
+        /// 根据物料路线ID获取物料视图
+        /// </summary>
+        [HttpPost]
+        public ApiResult GetMaterialViewsByTeamId(Dictionary<string, object> inParam)
+        {
+            var apiResult = new ApiResult();
+            return ExceptionHelper.TryReturnException(() =>
+            {
+                if (Request.Properties["token"] is ApiAuthInfo user)
+                {
+                    int teamId = int.Parse(inParam["teamId"].ToString());
+                    int viewType = int.Parse(inParam["viewType"].ToString());
+                    int teamType = int.Parse(inParam["teamType"].ToString());
+
+                    apiResult.Data = new
+                    {
+                        columns = _viewBll.GetColumns(),
+                        rows = _viewBll.GetMaterialViewsByTeamId(teamId, viewType, teamType, user.FID, out List<int> materialId, out string FGuaranteePeriod, out string FStorageConditions, !inParam.ContainsKey("FAllView")),
+                        infos = _viewBll.GetMaterialInfoList(materialId, FGuaranteePeriod, FStorageConditions, user.FID),
+                        types = _viewBll.GetMaterialTypeList()
+                    };
+
+                }
+            }, apiResult, Request);
+        }
+
         /// <summary>
         /// 根据协同ID获取基础表集合
         /// </summary>

FactorySystemApi/FactorySystemApi.csproj

@@ -190,7 +190,9 @@
     <Compile Include="Controllers\BaseController.cs" />
     <Compile Include="Controllers\MaterialTypeController.cs" />
     <Compile Include="Controllers\OperateLogController.cs" />
+    <Compile Include="Controllers\MaterialTaskController.cs" />
     <Compile Include="Controllers\TaskController.cs" />
+    <Compile Include="Controllers\MaterialTeamworkController.cs" />
     <Compile Include="Controllers\TeamworkController.cs" />
     <Compile Include="Controllers\PackageController.cs" />
     <Compile Include="Controllers\MaterialController.cs" />

FactorySystemBll/BaseBll.cs

@@ -376,6 +376,58 @@ namespace FactorySystemBll
             }
         }
 
+
+        public static int CreateMaterialTask(int teamId, int userId, int type, int factoryId)
+        {
+            SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
+            int funcType = (int)Constant.RoleType.物料视图编辑;
+            string tType = "10";
+            int taskId = -1;
+
+            try
+            {
+                List<string> funcVal = db.Queryable<TBasicCode>().Where(s => s.FType == (int)Constant.BasicCode.物料视图编辑 && s.F1 == tType && s.FState == 1).Select(s => s.FValue).ToList();
+                List<TUser> users = db.Queryable<TUser, TRole_Right>((a, b) => new JoinQueryInfos(JoinType.Left, a.FRoleID == b.FRoleID))
+                    .Where((a, b) => a.FState == 1 && a.FDeleted != 1 && b.FType == funcType && funcVal.Contains(b.FFunctionID.ToString()))
+                    .Where(string.Format("a.FFactoryID in({0})", factoryId))
+                    .GroupBy("a.FID,a.FFactoryID,a.FName,a.FUser").Select<TUser>("a.FID,a.FFactoryID,a.FName,a.FUser").ToList();
+
+                if (users.Count > 0) {
+
+                    TFS_FMaterialTask materialTask = new TFS_FMaterialTask();
+                    materialTask.FMaterialTeamID = teamId;
+                    materialTask.FType = type;
+                    materialTask.FFactoryID = factoryId;
+                    materialTask.FCanEdit = 1;
+                    materialTask.FAddUser = userId;
+                    materialTask.FAddDate = DateTime.Now;
+                    materialTask.FState = 1;
+
+                    if (type == 15)
+                    {
+                        materialTask.FName = "物料分类";
+                        materialTask.FDesc = "物料分类选择";
+                    }
+                    else
+                    {
+                        materialTask.FName = "物料视图";
+                        materialTask.FDesc = "物料视图编辑";
+                    }
+
+                    materialTask.FUserID = string.Join(",", users.GroupBy(ss => ss.FID).Select(sss => sss.Key));
+                    materialTask.FUserName = string.Join("、", users.GroupBy(ss => ss.FName).Select(sss => sss.Key));
+
+                    taskId = db.Insertable(materialTask).IgnoreColumns(true).ExecuteReturnIdentity();
+                }                
+            }
+            catch (Exception ex)
+            {
+                taskId = -1;
+            }            
+
+            return taskId;
+        }
+
         /// <summary>
         /// 发送微信消息
         /// </summary>

FactorySystemBll/FactorySystemBll.csproj

@@ -51,6 +51,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="MaterialTaskBll.cs" />
+    <Compile Include="MaterialTeamworkBll.cs" />
     <Compile Include="MaterialTypeBll.cs" />
     <Compile Include="OperateLogBll.cs" />
     <Compile Include="Properties\Settings.Designer.cs">

FactorySystemBll/MaterialBll.cs

@@ -106,7 +106,6 @@ namespace FactorySystemBll
                 .Where((a, b) => b.FTeamID == tempId).Select<TFS_Material>((a, b) => a).ToList();
         }
 
-
         /// <summary>
         /// 物料子数据比对
         /// </summary>
@@ -1329,6 +1328,18 @@ namespace FactorySystemBll
             return db.Ado.ExecuteCommand(sql);
         }
 
+        public List<TFS_Material> GetMaterialByFName(string fname)
+        {
+            SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
+            List<TFS_Material> mainsList = db.Queryable<TFS_Material>().Where(s => s.FDeleted != (int)Constant.DeleteCode.已删除 && s.FName.Equals(fname)).ToList();
+
+            return mainsList;
+        }
 
+        public int InsertMaterial(TFS_Material material)
+        {
+            SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
+            return db.Insertable(material).IgnoreColumns(true).ExecuteReturnIdentity();
+        }
     }
 }

FactorySystemBll/MaterialTaskBll.cs

@@ -0,0 +1,38 @@
+using FactorySystemCommon;
+using FactorySystemModel.RequestModel;
+using FactorySystemModel.ResponseModel;
+using FactorySystemModel.SqlSugarModel;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+
+namespace FactorySystemBll
+{
+    public class MaterialTaskBll
+    {
+        /// <summary>
+        /// 获取任务列表
+        /// </summary>
+        public List<MaterialTaskRow> GetList(MaterialTaskQuery mtq, out int totalNumber)
+        {
+            totalNumber = 0;
+            var db = AppSettingsHelper.GetSqlSugar();
+            return db.Queryable<TFS_FMaterialTask, TFS_FMaterialTeamwork>((a, b) => new JoinQueryInfos(JoinType.Inner, a.FMaterialTeamID == b.FID))
+                // 事项状态
+                .WhereIF(mtq.FState > 0 && mtq.FState != 99, (a, b) => a.FState == mtq.FState)
+                // 物料号
+                .WhereIF(!string.IsNullOrEmpty(mtq.FMaterialCode), (a, b) => b.FMaterialCode.Equals(mtq.FMaterialCode))
+                // 类型
+                .WhereIF(mtq.FTeamworkType > 0, (a, b) => b.FTeamworkType == mtq.FTeamworkType)
+                // 发起时间
+                .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.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")
+                .ToPageList(mtq.FPageIndex, mtq.FPageSize, ref totalNumber);
+        }
+    }
+}

FactorySystemBll/MaterialTeamworkBll.cs

@@ -0,0 +1,38 @@
+using FactorySystemCommon;
+using FactorySystemModel.RequestModel;
+using FactorySystemModel.ResponseModel;
+using FactorySystemModel.SqlSugarModel;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+
+namespace FactorySystemBll
+{
+    public class MaterialTeamworkBll
+    {
+        /// <summary>
+        /// 获取路线列表
+        /// </summary>
+        public List<TFS_FMaterialTeamwork> GetList(MaterialTeamworkQuery mtq, out int totalNumber)
+        {
+            totalNumber = 0;
+            var db = AppSettingsHelper.GetSqlSugar();
+            return db.Queryable<TFS_FMaterialTeamwork>()
+                // 事项状态
+                .WhereIF(mtq.FState > 0 && mtq.FState != 99, a => a.FState == mtq.FState)
+                // 物料号
+                .WhereIF(!string.IsNullOrEmpty(mtq.FMaterialCode), a => a.FMaterialCode.Equals(mtq.FMaterialCode))
+                // 类型
+                .WhereIF(mtq.FTeamworkType > 0, a => a.FTeamworkType == mtq.FTeamworkType)
+                // 发起时间
+                .WhereIF(mtq.FDateRange != null && mtq.FDateRange[0] != "",a => a.FAddDate >= DateTime.Parse(mtq.FDateRange[0]))
+                .WhereIF(mtq.FDateRange != null && mtq.FDateRange[1] != "", a => 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.FMaterialTeamID > 0, (a, b) => a.FMaterialTeamID == mtq.FMaterialTeamID).OrderBy((a, b) => a.FID, OrderByType.Desc)
+                .Select<TFS_FMaterialTeamwork>()
+                .ToPageList(mtq.FPageIndex, mtq.FPageSize, ref totalNumber);
+        }
+    }
+}

FactorySystemBll/ViewBll.cs

@@ -93,6 +93,45 @@ namespace FactorySystemBll
             return viewList;
         }
 
+        /// <summary>
+        /// 根据协同ID获取物料视图
+        /// </summary>
+        public List<Dictionary<string, object>> GetMaterialViewsByTeamId(int teamId, int viewType, int teamType, int currUserId, out List<int> materialId, out string FGuaranteePeriod, out string FStorageConditions, bool byFactory = true)
+        {
+            TUser currUser = null;
+            FGuaranteePeriod = "";
+            FStorageConditions = "";
+            if (byFactory == true) currUser = BaseBll.GetTempModel<TUser>(currUserId, "FFactoryID");
+            var db = AppSettingsHelper.GetSqlSugar();
+
+            List<Dictionary<string, object>> viewList = new List<Dictionary<string, object>>();
+
+            if (viewType == 10)
+            {
+                viewList = db.Queryable<TFS_ViewMaterial, TFS_Material>((a, b) =>
+                    new JoinQueryInfos(JoinType.Inner, a.FMaterialID == b.FID))
+                   .Where((a, b) => a.FTeamID == teamId)
+                   .Where((a, b) => a.FTeamType == teamType)
+                   .WhereIF(currUser != null, (a, b) => a.FFactoryID == currUser.FFactoryID)
+                   .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();
+            }
+            else
+            {
+                viewList = db.Queryable<TFS_ViewMaterial, TFS_Material>((a, b) =>
+                    new JoinQueryInfos(JoinType.Inner, a.FMaterialID == b.FID))
+                   .Where((a, b) => a.FTeamID == teamId)
+                   .Where((a, b) => a.FTeamType == teamType)
+                   .WhereIF(currUser != null, (a, b) => a.FFactoryID == currUser.FFactoryID)
+                   .WhereIF(viewType > 0, (a, b) => a.FViewType == viewType)
+                   .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();
+            }
+            materialId = viewList.GroupBy(s => s["FMaterialID"]).Select(s => int.Parse(s.Key.ToString())).ToList();
+            return viewList;
+        }
 
         /// <summary>
         /// 根据协同ID获取物料视图
@@ -423,5 +462,11 @@ namespace FactorySystemBll
             return db.Ado.SqlQuery<object>(sql);
 
         }
+
+        public int InsertMaterialView(TFS_ViewMaterial view)
+        {
+            SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
+            return db.Insertable(view).IgnoreColumns(true).ExecuteReturnIdentity();
+        }
     }
 }

FactorySystemModel/FactorySystemModel.csproj

@@ -57,13 +57,18 @@
     <Compile Include="EnumModel\Constant.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RequestModel\FormulaQuery.cs" />
+    <Compile Include="RequestModel\MaterialTeamworkQuery.cs" />
+    <Compile Include="RequestModel\MaterialTaskQuery.cs" />
     <Compile Include="RequestModel\TaskQuery.cs" />
     <Compile Include="RequestModel\UploadTempFileRequest.cs" />
     <Compile Include="ResponseModel\ApiResult.cs" />
     <Compile Include="ResponseModel\FormulaRow.cs" />
+    <Compile Include="ResponseModel\MaterialTaskRow.cs" />
+    <Compile Include="ResponseModel\MaterialTeamworkRow.cs" />
     <Compile Include="ResponseModel\TaskRow.cs" />
     <Compile Include="SqlSugarModel\Common.cs" />
     <Compile Include="SqlSugarModel\FPower.cs" />
+    <Compile Include="SqlSugarModel\TFS_FMaterialTask.cs" />
     <Compile Include="SqlSugarModel\TFS_FreezingColumns.cs" />
     <Compile Include="SqlSugarModel\TDataCode.cs" />
     <Compile Include="SqlSugarModel\TBasicCode.cs" />
@@ -74,6 +79,7 @@
     <Compile Include="SqlSugarModel\TFS_FTeamwork.cs" />
     <Compile Include="SqlSugarModel\TFS_MaterialInfo.cs" />
     <Compile Include="SqlSugarModel\TFS_MaterialType.cs" />
+    <Compile Include="SqlSugarModel\TFS_FMaterialTeamwork.cs" />
     <Compile Include="SqlSugarModel\TFS_OperateLog.cs" />
     <Compile Include="SqlSugarModel\TFS_Setting.cs" />
     <Compile Include="SqlSugarModel\TFS_Material.cs" />

FactorySystemModel/RequestModel/MaterialTaskQuery.cs

@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using FactorySystemModel.ResponseModel;
+
+namespace FactorySystemModel.RequestModel
+{
+    public class MaterialTaskQuery : MaterialTaskRow
+    {
+        public MaterialTaskQuery()
+        {
+            FIsUser = true;
+        }
+        /// <summary>
+        /// Desc:发起时间的时间段
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public List<string> FDateRange { get; set; }
+
+        // 路线类型
+        public int FTeamworkType { get; set; }
+
+        public int FPageIndex { get; set; }
+
+        public int FPageSize { get; set; }
+        /// <summary>
+        /// 是否根据全选出数据
+        /// </summary>
+        public bool FIsUser { get; set; }
+    }
+}

FactorySystemModel/RequestModel/MaterialTeamworkQuery.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using FactorySystemModel.ResponseModel;
+
+namespace FactorySystemModel.RequestModel
+{
+    public class MaterialTeamworkQuery : MaterialTeamworkRow
+    {
+        public MaterialTeamworkQuery()
+        {
+            FIsUser = true;
+        }
+
+        // 用户
+        public int FUserID { get; set; }
+
+        /// <summary>
+        /// Desc:发起时间的时间段
+        /// Default:
+        /// Nullable:True
+        /// </summary>
+        public List<string> FDateRange { get; set; }
+
+        public int FPageIndex { get; set; }
+
+        public int FPageSize { get; set; }
+        /// <summary>
+        /// 是否根据全选出数据
+        /// </summary>
+        public bool FIsUser { get; set; }
+    }
+}

FactorySystemModel/ResponseModel/MaterialTaskRow.cs

@@ -0,0 +1,35 @@
+using FactorySystemModel.SqlSugarModel;
+
+namespace FactorySystemModel.ResponseModel
+{
+    public class MaterialTaskRow : TFS_FMaterialTask
+    {
+        /// <summary>
+        /// Desc:物料号
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string FMaterialCode { get; set; }
+
+        /// <summary>
+        /// Desc:物料描述
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string FMaterialName { get; set; }
+
+        /// <summary>
+        /// Desc:试验号
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string FTestCode { get; set; }
+
+        /// <summary>
+        /// Desc:物料类型（产品分类）：TBasicCode.FType=32
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string FMaterialType { get; set; }
+    }
+}

FactorySystemModel/ResponseModel/MaterialTeamworkRow.cs

@@ -0,0 +1,13 @@
+using FactorySystemModel.SqlSugarModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FactorySystemModel.ResponseModel
+{
+    public class MaterialTeamworkRow : TFS_FMaterialTeamwork
+    {
+    }
+}

FactorySystemModel/SqlSugarModel/TFS_FMaterialTask.cs

@@ -0,0 +1,120 @@
+using System;
+using SqlSugar;
+
+namespace FactorySystemModel.SqlSugarModel
+{
+    ///<summary>
+    ///物料新增待办事项
+    ///</summary>
+    [SugarTable("TFS_FMaterialTask")]
+    public partial class TFS_FMaterialTask
+    {
+        public TFS_FMaterialTask() { }
+
+        /// <summary>
+        /// Desc:唯一标识
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int FID { get; set; }
+
+        /// <summary>
+        /// Desc:物料路线ID
+        /// Default:-1
+        /// Nullable:False
+        /// </summary>           
+        public int FMaterialTeamID { get; set; }
+
+        /// <summary>
+        /// Desc:类型：TBasicCode.FType=33
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public int FType { get; set; }
+
+        /// <summary>
+        /// Desc:名称
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string FName { get; set; }
+
+        /// <summary>
+        /// Desc:描述
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string FDesc { get; set; }
+
+        /// <summary>
+        /// Desc:工厂Id
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public int FFactoryID { get; set; }
+
+        /// <summary>
+        /// Desc:负责用户
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string FUserID { get; set; }
+
+        /// <summary>
+        /// Desc:负责用户
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string FUserName { get; set; }
+
+        /// <summary>
+        /// Desc:状态：0未开始，1进行中，2已完成
+        /// Default:-1
+        /// Nullable:False
+        /// </summary>           
+        public int FState { get; set; }
+
+        /// <summary>
+        /// Desc:修改状态：1可修改，0不可修改
+        /// Default:-1
+        /// Nullable:False
+        /// </summary>           
+        public int? FCanEdit { get; set; }
+
+        /// <summary>
+        /// Desc:完成时间
+        /// Default:DateTime.Now
+        /// Nullable:False
+        /// </summary>           
+        public DateTime? FFinishDate { get; set; }
+
+        /// <summary>
+        /// Desc:创建人
+        /// Default:-1
+        /// Nullable:False
+        /// </summary>           
+        public int FAddUser { get; set; }
+
+        /// <summary>
+        /// Desc:创建时间
+        /// Default:DateTime.Now
+        /// Nullable:False
+        /// </summary>           
+        public DateTime FAddDate { get; set; }
+
+        /// <summary>
+        /// Desc:修改人
+        /// Default:-1
+        /// Nullable:False
+        /// </summary>           
+        public int FEditUser { get; set; }
+
+        /// <summary>
+        /// Desc:修改时间
+        /// Default:DateTime.Now
+        /// Nullable:False
+        /// </summary>           
+        public DateTime FEditDate { get; set; }
+    }
+}

FactorySystemModel/SqlSugarModel/TFS_FMaterialTeamwork.cs

@@ -0,0 +1,179 @@
+using System;
+using System.Collections.Generic;
+using SqlSugar;
+
+namespace FactorySystemModel.SqlSugarModel
+{
+    ///<summary>
+    ///物料路线表
+    ///</summary>
+    [SugarTable("TFS_FMaterialTeamwork")]
+    public partial class TFS_FMaterialTeamwork
+    {
+        public TFS_FMaterialTeamwork()
+        {
+            FAddUserName = null;
+            FTaskList = new List<TFS_FMaterialTask>();
+        }
+
+        /// <summary>
+        /// Desc:唯一标识
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int FID { get; set; }
+
+        /// <summary>
+        /// Desc:物料描述
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string FMaterialName { get; set; }
+
+        /// <summary>
+        /// Desc:物料编号
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string FMaterialCode { get; set; }
+
+        /// <summary>
+        /// Desc:试验号
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string FTestCode { get; set; }
+
+        /// <summary>
+        /// Desc:物料类型（产品分类）：TBasicCode.FType=32
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string FMaterialType { get; set; }
+
+        /// <summary>
+        /// Desc:路线类型：1新增，2修改
+        /// Default:0
+        /// Nullable:False
+        /// </summary>           
+        public int FTeamworkType { get; set; }
+
+        /// <summary>
+        /// Desc:状态：1已增，0暂存
+        /// Default:-1
+        /// Nullable:False
+        /// </summary>           
+        public int FState { get; set; }
+
+        /// <summary>
+        /// Desc:进度
+        /// Default:0%
+        /// Nullable:False
+        /// </summary>           
+        public string FProgress { get; set; }
+
+        /// <summary>
+        /// Desc:添加人
+        /// Default:-1
+        /// Nullable:False
+        /// </summary>           
+        public int FAddUser { get; set; }
+
+        /// <summary>
+        /// Desc:添加时间
+        /// Default:DateTime.Now
+        /// Nullable:False
+        /// </summary>           
+        public DateTime FAddDate { get; set; }
+
+        /// <summary>
+        /// Desc:修改人
+        /// Default:-1
+        /// Nullable:False
+        /// </summary>           
+        public int FEditUser { get; set; }
+
+        /// <summary>
+        /// Desc:修改时间
+        /// Default:DateTime.Now
+        /// Nullable:False
+        /// </summary>           
+        public DateTime FEditDate { get; set; }
+
+        /// <summary>
+        /// Desc:删除状态：1删除，0未删除
+        /// Default:0
+        /// Nullable:False
+        /// </summary>           
+        public int FDeleted { get; set; }
+
+        /// <summary>
+        /// 添加人（仅插入的时候不操作此列）
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public string FAddUserName { get; set; }
+
+        /// <summary>
+        /// 当前事项
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public List<TFS_FMaterialTask> FTaskList { get; set; }
+
+        /// <summary>
+        /// Desc:工厂编号
+        /// Default:-1
+        /// Nullable:False
+        /// </summary>           
+        public int FCreateFactoryID { get; set; }
+
+        /// <summary>
+        /// Desc:工厂代码
+        /// Default:-1
+        /// Nullable:False
+        /// </summary>           
+        public string FCreateFactoryCode { get; set; }
+
+        /// <summary>
+        /// Desc:工厂模式
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public int FCreateFactoryType { get; set; }
+
+        /// <summary>
+        /// Desc:是否原料：1是，0否
+        /// Default:0
+        /// Nullable:False
+        /// </summary>           
+        public int FIsRaw { get; set; }
+
+        /// <summary>
+        /// Desc:工厂编号
+        /// Default:-1
+        /// Nullable:False
+        /// </summary>           
+        public int FProdFactoryID { get; set; }
+
+        /// <summary>
+        /// Desc:工厂代码
+        /// Default:-1
+        /// Nullable:False
+        /// </summary>           
+        public string FProdFactoryCode { get; set; }
+
+        /// <summary>
+        /// Desc:物料组：TDataCode.FType=2
+        /// Default:-1
+        /// Nullable:False
+        /// </summary>           
+        public string FMaterialGroup { get; set; }
+
+        /// <summary>
+        /// Desc:计量单位
+        /// Default:-1
+        /// Nullable:False
+        /// </summary>           
+        public string FWeightUnit { get; set; }
+    }
+}