diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo index a586558..d850f42 100644 Binary files a/.vs/ICSSoft.FromERP/v16/.suo and b/.vs/ICSSoft.FromERP/v16/.suo differ diff --git a/ICSSoft.FromERP/IcsMo_Rhtyon.cs b/ICSSoft.FromERP/IcsMo_Rhtyon.cs index d7d5706..7d4ab75 100644 --- a/ICSSoft.FromERP/IcsMo_Rhtyon.cs +++ b/ICSSoft.FromERP/IcsMo_Rhtyon.cs @@ -161,7 +161,6 @@ else Convert(varchar(10),a.ActualCompleteDate,120 ) end as ActualCompleteDate values.Add("WHCode", "a.WHCode");//仓库 values.Add("MoPlanStartDate", "a.StartDate");//开工日 values.Add("MoPlanEndDate", "a.DueDate");//完工日 - values.Add("MOMemo", "a.MOMemo");//生产订单状态 values.Add("MoUser", "a.CreatePerson");//生产订单状态 values.Add("MODOWNDATE", "a.CreateDateTime");//生产订单状态 diff --git a/ICSSoft.FromERP/IcsSBom_Rhtyon.cs b/ICSSoft.FromERP/IcsSBom_Rhtyon.cs index f5e6610..28c7e63 100644 --- a/ICSSoft.FromERP/IcsSBom_Rhtyon.cs +++ b/ICSSoft.FromERP/IcsSBom_Rhtyon.cs @@ -94,7 +94,7 @@ left join {1}.dbo.UBF_Sys_ExtEnumValue e2 on e1.ID=e2.ExtEnumType and e2.evalue= left join {1}.dbo.UBF_Sys_ExtEnumValue_Trl e3 on e2.id=e3.ID and e3.SysMLFlag='zh-CN' left join {1}.dbo.Base_UOM_Trl u1 on a.IssueUOM=u1.id and u1.SysMLFlag='zh-CN' where 1=1 and IsEffective=1 and A.ModifiedOn>=@LastTime AND I.id={0} and A.ComponentType=0 ---and A1.AlternateType=0 +and A1.AlternateType=0 and A1.bomtype=0 IF NOT EXISTS(SELECT * FROM #TempBOM)