commit by yzf

FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs

@@ -251,7 +251,7 @@ namespace FactorySystemApi.Controllers
 
                     //创建 TFS_FTeamwork 
                     int teamId = BaseBll.InsertDataModel(inParam, "TFS_HalfMaterialFTeamwork");
-
+                    TFS_Material tFS_Material = BaseBll.GetTempModel<TFS_Material>(string.Format("FTestCode='{0}'", inParam["FNewTestCode"].ToString()));
                     List<TFS_Material> editMaterialList = MaterialTeamworkBll.UpdateFormula(inParam["FTestCode"].ToString(), inParam["FNewTestCode"].ToString(), teamId, factory);
                     ids = editMaterialList.Select(m => m.FID).Distinct().ToList();
 
@@ -269,28 +269,18 @@ namespace FactorySystemApi.Controllers
                                 TFS_HalfMaterialFTeamwork teamwork = BaseBll.GetTempModel<TFS_HalfMaterialFTeamwork>(teamId);
 
 
-                                //if (editMaterialList.Count() == 0) 
-                                //{
-                                //    MaterialTeamworkBll.CreateProductView(teamwork, null, user.FID);
-                                //}
+                                //TeamworkBll TeamworkBll = new TeamworkBll();
+                                //List<TFS_Material> materialList = TeamworkBll.CheckMaterialListByTest(teamwork.FNewTestCode, teamwork.FNewVersionCode);
+
                                 
-                                //if (editMaterialList.Count() == 0)
-                                //{
-                                //    //MaterialTeamworkBll.CreateProductView(teamwork, null, user.FID);
-                                //    TFS_Material material = editMaterialList.Find(s => s.FType == "20");//默认取第一个20的，没找到取第一个
-                                //    if (material == null) material = editMaterialList.FirstOrDefault();
-                                //    db.Updateable<TFS_HalfMaterialFTeamwork>(new { FMaterialHalfIDs = material.FID }).Where(s => s.FID == teamwork.FID).ExecuteCommand();
-                                //}
-                                //else
-                                //{
-                                //    //MaterialTeamworkBll.CreateProductView(teamwork, editMaterialList, user.FID);
-                                //}
 
+                                if (tFS_Material == null) 
+                                {
                                     //开始BOM下载
                                     int dow = DockGetBomData(teamwork.FID, user.FID);
                                     if (dow > 0)
                                     {
-                                    MaterialTeamworkBll.HasMaterialTestCode(teamwork);
+                                        //MaterialTeamworkBll.HasMaterialTestCode(teamwork);
                                         BaseBll.CreateTaskData2(teamwork.FID, user.FID, "1"); //新增物料分类事项
                                         BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程
                                     }
@@ -306,6 +296,22 @@ namespace FactorySystemApi.Controllers
                                         //BaseBll.CreateTaskData2(teamId, user.FID, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
                                         //BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialTask.物料分类, 1, 1);
                                     }
+                                }
+                                else
+                                {
+                                    if (editMaterialList.Count() == 0) 
+                                    {
+                                        BaseBll.DeleteDataById(teamId, "TFS_HalfMaterialFTeamwork", true);
+                                        apiResult.Error("未能找到物料");
+
+                                    }
+                                    else 
+                                    {
+                                        BaseBll.CreateTaskData2(teamwork.FID, user.FID, "1"); //新增物料分类事项
+                                        BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程
+                                    }
+                                }
+                              
 
                             }
                             else

FactorySystemBll/HalfMaterialTaskBll.cs

@@ -38,7 +38,7 @@ namespace FactorySystemBll
                 .WhereIF(tq.FUserID != null, a => (',' + a.FUserID + ',').Contains(',' + tq.FUserID + ','))
                 // 协同
                 .WhereIF(tq.FTeamID > 0, a => a.FTeamID == tq.FTeamID).OrderBy((a, b, c) => a.FID, OrderByType.Desc)
-                .Select<object>("a.*,b.FNewTestCode,b.FVersionCode,a.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,d.FName AS 'FUserName1'")
+                .Select<object>("a.*,b.FNewTestCode,b.FVersionCode,a.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,d.FName AS 'FUserName1',(case when b.FBomJson IS NULL then 0 when cast(b.FBomJson as nvarchar) = '' then 0 else 1 end) as FHasBomJson")
                 .ToPageList(tq.FPageIndex, tq.FPageSize, ref totalNumber);
         }
 

FactorySystemBll/HalfMaterialTeamworkBll.cs

@@ -601,8 +601,7 @@ namespace FactorySystemBll
             {
                 foreach (TFS_Material item in temps)
                 {
-                    //if (first.FIsNew || item.FIsNew)
-                    fids += item.FID + ",";//父级新则子一级全部都要、自己是新
+                    if (first.FIsNew || item.FIsNew)fids += item.FID + ",";//父级新则子一级全部都要、自己是新
                     dtoList.Add(new BomFormulaDto() { mId = item.FID, isNew = item.FIsNew, childs = GetBomFormulaChild(item, formulaList, out string nextIds) });
                     if (!string.IsNullOrEmpty(nextIds)) fids += nextIds + ",";
                 }