From ad6938e16f951e75fe332aed04c79c8dde10d6ff Mon Sep 17 00:00:00 2001
From: leo <10200039@qq.com>
Date: Wed, 17 May 2023 22:14:07 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8D=8F=E5=90=8C=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E4=B8=8B=E8=BD=BDBOM=E7=9A=84=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=9A=E6=94=B9=E4=B8=BA=E7=94=A8=E9=80=89=E6=8B=A9=E7=9A=84?=
 =?UTF-8?q?=E8=AF=95=E9=AA=8C=E5=8F=B7=E5=88=A4=E6=96=AD=202.=E5=8D=8F?=
 =?UTF-8?q?=E5=90=8C=E6=98=AF=E5=90=A6=E6=9C=89BomJson=E7=9A=84=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E4=BC=A0=E5=88=B0=E5=89=8D=E7=AB=AF=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=85=8D=E6=96=B9=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FactorySystemApi/Controllers/TeamworkController.cs | 3 ++-
 FactorySystemBll/TaskBll.cs                        | 2 +-
 FactorySystemModel/ResponseModel/TaskRow.cs        | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/FactorySystemApi/Controllers/TeamworkController.cs b/FactorySystemApi/Controllers/TeamworkController.cs
index c5dd327..c12eb63 100644
--- a/FactorySystemApi/Controllers/TeamworkController.cs
+++ b/FactorySystemApi/Controllers/TeamworkController.cs
@@ -139,7 +139,8 @@ namespace FactorySystemApi.Controllers
                             //直接走下一步
                             if (state.ToString().Contains("1")) {
                                 TFS_FTeamwork teamwork = BaseBll.GetTempModel<TFS_FTeamwork>(teamId);
-                                List<TFS_Material> materialList = TeamworkBll.CheckMaterialListByTest(teamwork.FTestCode, teamwork.FVersionCode);
+                                //List<TFS_Material> materialList = TeamworkBll.CheckMaterialListByTest(teamwork.FTestCode, teamwork.FVersionCode);
+                                List<TFS_Material> materialList = TeamworkBll.CheckMaterialListByTest(teamwork.FFormulaTestCode, teamwork.FVersionCode);
                                 if (materialList.Count == 0) {
                                     TeamworkBll.CreateProductView(teamwork, null, user.FID);
                                     //开始BOM下载
diff --git a/FactorySystemBll/TaskBll.cs b/FactorySystemBll/TaskBll.cs
index f344032..1e007bc 100644
--- a/FactorySystemBll/TaskBll.cs
+++ b/FactorySystemBll/TaskBll.cs
@@ -37,7 +37,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<TaskRow>("a.*,b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,2)as int)as FViewType")
+                .Select<TaskRow>("a.*,b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,2)as int)as FViewType,(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);
         }
 
diff --git a/FactorySystemModel/ResponseModel/TaskRow.cs b/FactorySystemModel/ResponseModel/TaskRow.cs
index c1cd99b..703cefd 100644
--- a/FactorySystemModel/ResponseModel/TaskRow.cs
+++ b/FactorySystemModel/ResponseModel/TaskRow.cs
@@ -44,11 +44,14 @@ namespace FactorySystemModel.ResponseModel
         /// </summary>           
         public string FUserName { get; set; }
 
-
         /// <summary>
         /// Desc:半成品号
         /// </summary>      
         public string FMaterialHalfIDs { get; set; }
 
+        /// <summary>
+        /// Desc:是否有FHasBomJson
+        /// </summary>      
+        public int FHasBomJson { get; set; }
     }
 }
\ No newline at end of file