From d164970400e52db5168158db5aa61d6696972906 Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 30 May 2023 21:40:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=B7=AF=E7=BA=BF?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E5=A2=9E=E5=8A=A0=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E7=89=A9=E6=96=99=E6=8F=8F=E8=BF=B0=E7=9A=84=E9=99=90?= =?UTF-8?q?=E5=88=B6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/MaterialTeamworkController.cs | 173 +++++++++--------- 1 file changed, 91 insertions(+), 82 deletions(-) diff --git a/FactorySystemApi/Controllers/MaterialTeamworkController.cs b/FactorySystemApi/Controllers/MaterialTeamworkController.cs index bbec648..6f428fe 100644 --- a/FactorySystemApi/Controllers/MaterialTeamworkController.cs +++ b/FactorySystemApi/Controllers/MaterialTeamworkController.cs @@ -66,109 +66,118 @@ namespace FactorySystemApi.Controllers string materialName = inParam["FMaterialName"].ToString(); - inParam.TryGetValue("FState", out object state); - if (null == state) - { - inParam["FState"] = state = 1; - } + TFS_Material existMaterial = BaseBll.GetTempModel("FName='" + materialName + "'"); - if (inParam.ContainsKey("FAddUser")) + if (existMaterial != null) { - inParam["FAddUser"] = user.FID; + result.Add("TaskId", -8); } else { - inParam.Add("FAddUser", user.FID); - } + inParam.TryGetValue("FState", out object state); + if (null == state) + { + inParam["FState"] = state = 1; + } - if (inParam.ContainsKey("FAddDate")) - { - inParam["FAddDate"] = DateTime.Now; - } - else - { - inParam.Add("FAddDate", DateTime.Now); - } + if (inParam.ContainsKey("FAddUser")) + { + inParam["FAddUser"] = user.FID; + } + else + { + inParam.Add("FAddUser", user.FID); + } - if (inParam.ContainsKey("FEditUser")) - { - inParam["FEditUser"] = user.FID; - } - else - { - inParam.Add("FEditUser", user.FID); - } + if (inParam.ContainsKey("FAddDate")) + { + inParam["FAddDate"] = DateTime.Now; + } + else + { + inParam.Add("FAddDate", DateTime.Now); + } - if (inParam.ContainsKey("FEditDate")) - { - inParam["FEditDate"] = 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("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(factory.FFactoryID); - inParam.Add("FProdFactoryID", prodFactory.FID); - inParam.Add("FProdFactoryCode", prodFactory.FCode); - } - else - { - inParam.Add("FProdFactoryID", factory.FID); - inParam.Add("FProdFactoryCode", factory.FCode); - } + if (inParam.ContainsKey("FEditDate")) + { + inParam["FEditDate"] = DateTime.Now; + } + else + { + inParam.Add("FEditDate", DateTime.Now); + } - inParam.Add("FTeamworkType", 1); - - // 获取具备相应权限的用户 - List users = MaterialTaskBll.GetTaskUsers(0, "10", factory.FID); + 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(factory.FFactoryID); + inParam.Add("FProdFactoryID", prodFactory.FID); + inParam.Add("FProdFactoryCode", prodFactory.FCode); + } + else + { + inParam.Add("FProdFactoryID", factory.FID); + inParam.Add("FProdFactoryCode", factory.FCode); + } - // 如果没有获取到用户，则不创建路线、任务、物料和视图 - if (users != null && users.Count > 0) - { - int teamId = BaseBll.InsertDataModel(inParam, "TFS_FMaterialTeamwork"); - result.Add("TeamId", teamId); + inParam.Add("FTeamworkType", 1); + + // 获取具备相应权限的用户 + List users = MaterialTaskBll.GetTaskUsers(0, "10", factory.FID); - if (teamId > 0) + // 如果没有获取到用户，则不创建路线、任务、物料和视图 + if (users != null && users.Count > 0) { - inParam.Add("FID", teamId); + int teamId = BaseBll.InsertDataModel(inParam, "TFS_FMaterialTeamwork"); + result.Add("TeamId", teamId); - if (state.ToString().Contains("1")) + if (teamId > 0) { - TFS_FMaterialTeamwork teamwork = BaseBll.GetTempModel(teamId); + inParam.Add("FID", teamId); - // 创建物料和物料视图 - Dictionary materialInfo = CreateMaterialData(inParam, factory, teamwork); - - if (materialInfo.ContainsKey("FMaterialCode") && !string.IsNullOrEmpty(materialInfo["FMaterialCode"].ToString())) + if (state.ToString().Contains("1")) { - teamwork.FMaterialCode = materialInfo["FMaterialCode"].ToString(); - MaterialTeamworkBll.UpdateMaterialTeamwork(teamwork); - } + TFS_FMaterialTeamwork teamwork = BaseBll.GetTempModel(teamId); - foreach (string key in materialInfo.Keys) - { - result.Add(key, materialInfo[key]); - } + // 创建物料和物料视图 + Dictionary materialInfo = CreateMaterialData(inParam, factory, teamwork); + + if (materialInfo.ContainsKey("FMaterialCode") && !string.IsNullOrEmpty(materialInfo["FMaterialCode"].ToString())) + { + teamwork.FMaterialCode = materialInfo["FMaterialCode"].ToString(); + MaterialTeamworkBll.UpdateMaterialTeamwork(teamwork); + } + + foreach (string key in materialInfo.Keys) + { + result.Add(key, materialInfo[key]); + } - // 创建物料分类任务 - int taskId = MaterialTaskBll.CreateMaterialTask(teamId, 1, user.FID, 0, factory.FID, users); - result.Add("TaskId", taskId); + // 创建物料分类任务 + int taskId = MaterialTaskBll.CreateMaterialTask(teamId, 1, user.FID, 0, factory.FID, users); + result.Add("TaskId", taskId); + } } } - } - else - { - result.Add("TaskId", -9); + else + { + result.Add("TaskId", -9); + } } apiResult.Data = result; From dd87d33da1326e7452b4f50308180e449638c1fc Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 31 May 2023 15:35:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=8F=E5=90=8C?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=A1=AE=E8=AE=A4=E8=B7=AF=E7=BA=BF=E7=9A=84?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FactorySystemBll/TaskBll.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FactorySystemBll/TaskBll.cs b/FactorySystemBll/TaskBll.cs index 8e68a29..0a40691 100644 --- a/FactorySystemBll/TaskBll.cs +++ b/FactorySystemBll/TaskBll.cs @@ -124,7 +124,7 @@ namespace FactorySystemBll public int SureTeamWork(int teamId) { return AppSettingsHelper.GetSqlSugar().Ado.ExecuteCommand(string.Format(@" - if(select count(1) from TFS_Task where FTeamID={0} and FState!=2)=0 + if(select count(1) from TFS_Task where FTeamID={0} and FState!=2 and FType!=13)=0 begin update TFS_Task set FCanEdit=2 where FCanEdit!=2 and FTeamID={0}; update TFS_Task set FState=2,FFinishDate=getdate() where FState!=2 and FTeamID={0};