From 542460ed22e3d702d35505ad98f89ebb9335a807 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Wed, 19 Apr 2023 00:27:27 +0800
Subject: [PATCH] commit by yzf

---
 .../Controllers/ViewController.cs             |  5 ++++
 FactorySystemBll/HalfMaterialTaskBll.cs       | 23 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/FactorySystemApi/Controllers/ViewController.cs b/FactorySystemApi/Controllers/ViewController.cs
index 2f7a20d..f0be068 100644
--- a/FactorySystemApi/Controllers/ViewController.cs
+++ b/FactorySystemApi/Controllers/ViewController.cs
@@ -255,10 +255,13 @@ namespace FactorySystemApi.Controllers
                             HalfMaterialTeamworkBll TeamworkBll = new HalfMaterialTeamworkBll();
                             TeamworkBll.CreateMaterialTask(hasNewView, teamwork, user.FID);
                         }
+                        HalfMaterialTaskBll halfMaterialTaskBll = new HalfMaterialTaskBll();
+                        halfMaterialTaskBll.CloseHalfMaterialTask(teamId, user.FID, (int)Constant.HalfMaterialProcessType.物料分类);
                         BaseBll.CreateTaskData2(teamId, user.FID, "2");
 
                         BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialProcessType.物料分类, 3, 2);
                         BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialProcessType.物料编辑, 2, 1);
+                        
                     }
                 }
             }, apiResult, Request);
@@ -291,6 +294,8 @@ namespace FactorySystemApi.Controllers
                         TFS_HalfMaterialFTeamwork teamwork = BaseBll.GetTempModel<TFS_HalfMaterialFTeamwork>(teamId);
 
                         BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialProcessType.物料编辑, 2, 2);
+                        HalfMaterialTaskBll halfMaterialTaskBll= new HalfMaterialTaskBll();
+                        halfMaterialTaskBll.CloseHalfMaterialTask(teamId, user.FID, (int)Constant.HalfMaterialProcessType.物料编辑);
                     }
                 }
             }, apiResult, Request);
diff --git a/FactorySystemBll/HalfMaterialTaskBll.cs b/FactorySystemBll/HalfMaterialTaskBll.cs
index 08e19a8..b2b6c8f 100644
--- a/FactorySystemBll/HalfMaterialTaskBll.cs
+++ b/FactorySystemBll/HalfMaterialTaskBll.cs
@@ -40,5 +40,28 @@ namespace FactorySystemBll
                 .Select<object>("a.*,b.FNewTestCode,d.FVersionCode,d.FType as 'FormulaType',b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,2)as int)as FViewType")
                 .ToPageList(tq.FPageIndex, tq.FPageSize, ref totalNumber);
         }
+
+
+
+        public int CloseHalfMaterialTask(int teamId, int userId, int type)
+        {
+            SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
+            List<TFS_HalfMaterialTask> taskList = db.Queryable<TFS_HalfMaterialTask>().Where(s => s.FType == type && s.FTeamID == teamId && s.FState == 1).ToList();
+            int result = 0;
+
+            if (taskList != null && taskList.Count > 0)
+            {
+                TFS_HalfMaterialTask fmt = taskList[0];
+
+                fmt.FCanEdit = 2;
+                fmt.FState = 2;
+                fmt.FEditUser = userId;
+                fmt.FEditDate = DateTime.Now;
+
+                result = db.Updateable(fmt).IgnoreColumns(true).WhereColumns("FID").ExecuteCommand();
+            }
+
+            return result;
+        }
     }
 }