From 57df7731ac78ff139e6aca860decb05b3a0e7e98 Mon Sep 17 00:00:00 2001 From: xusc Date: Wed, 7 Aug 2024 14:10:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81bom=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9,=E5=8C=BA=E5=88=86U9=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E7=94=9F=E4=BA=A7=E7=9B=AE=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/ICSSoft.FromERP/v16/.suo | Bin 300544 -> 281088 bytes ICSSoft.FromERP/IcsSBom.cs | 110 +---------------------------------- ICSSoft.Test/Program.cs | 2 +- 3 files changed, 3 insertions(+), 109 deletions(-) diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo index 6bd0dacbf9431af9f0925f57a6ed83ef09f6b503..29cb8c0ce0f1fa32bf65a59095a88121881898b6 100644 GIT binary patch delta 12983 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 F{u{~MmuCO~ diff --git a/ICSSoft.FromERP/IcsSBom.cs b/ICSSoft.FromERP/IcsSBom.cs index 9aadcea..5e078ec 100644 --- a/ICSSoft.FromERP/IcsSBom.cs +++ b/ICSSoft.FromERP/IcsSBom.cs @@ -81,7 +81,7 @@ left join {1}.dbo.[CBO_ItemMaster_Trl] as A5 on (A5.SysMlFlag = 'zh-CN') and (A3 left join {1}.dbo.[CBO_Project] as A6 on (A.[CompProject] = A6.[ID]) LEFT JOIN {1}.dbo.[Base_Organization] AS I ON ( A1.[Org] = I.[ID] ) LEFT JOIN {1}.dbo.[Base_Organization_Trl] AS J ON ( I.[ID] = J.[ID] AND J.SysMLFlag='zh-CN') -where 1=1 and IsEffective=1 and A.ModifiedOn>=@LastTime AND I.id={0} and A.ComponentType=0 +where 1=1 and A1.AlternateType=0 and IsEffective=1 and A.ModifiedOn>=@LastTime AND I.id={0} and A.ComponentType=0 IF NOT EXISTS(SELECT * FROM #TempBOM) RETURN"; @@ -147,7 +147,7 @@ left join IcsMainCategoryCode d on c.ItemMainCategoryCode=d.ItemMainCategoryCode sql += " DROP TABLE #TempBOM " + "DROP TABLE #tableICSSBOM"; sql = string.Format(sql, TenantId, erpName, ErpId); - // return; + //return; ICSHelper.ExecuteDate(conStr, sql); #endregion } @@ -159,112 +159,6 @@ left join IcsMainCategoryCode d on c.ItemMainCategoryCode=d.ItemMainCategoryCode } -// public void Execute_bak20201201() -// { -// try -// { -// string conStr = ICSHelper.GetConnectString(); -// string Namespace = this.GetType().Namespace; -// string Class = this.GetType().Name; -// #region SQL -// string sql = @" SELECT g.cInvDefine1,--存货自定义项1 -// a.Version,--Version 版本号 -// a.VersionDesc,--VersionDesc 版本说明 -// a.VersionEffDate,--VersionEffDate 版本生效日 -// a.VersionEndDate,--VersionEndDate 版本失效日 -// c.InvCode as cInvCode ,--存货编码 -// f.InvCode as SubcInvCode ,--存货编码 -// e.WIPType, --WIPType WIP属性(1入库/2工序/3领料/4虚拟) -// d.SortSeq, --SortSeq 序号 -// d.BaseQtyN, --AuxBaseQtyN 辅助基本用量 -// d.BaseQtyD, --BaseQtyD 基本用量-分母 -// d.ByproductFlag, --ByproductFlag 是否联副产品 -// d.ProductType, --ProductType 产出类型(1:空/2:联产品/3:副产品) -// d.CompScrap, --CompScrap 子件损耗率 -// a.CreateDate,a.CreateUser,a.ModifyDate,a.ModifyUser,a.cCurrentAuditor,--当前审批人 -// a.RelsTime as cAuditDate, --审核时间 -// i.ReplaceFlag,--是否替换料 -// i.OpComponentId,-- 子件Id -// i.Sequence ReplaceSequence,--替代序号 -// K.InvCode as ReplaceInvCode ,--替代料编码 -// i.Factor ReplaceFactor,--替代比例 -// i.EffBegDate ReplaceEffBegDate,--生效日期 -// i.EffEndDate ReplaceEffEndDate,--失效日期 -// ISNULL(a.ModifyDate, a.CreateDate) AS MTIME -// into #TempBOM -// FROM {1}.dbo.bom_bom a -- BOM资料 -// INNER JOIN {1}.dbo.bom_parent b on a.BomId = b.BomId --BOM母件资料 -// INNER JOIN {1}.dbo.bas_part c on b.ParentId = c.PartId --物料表 -// INNER JOIN {1}.dbo.bom_opcomponent d on a.BomId=d.BomId --BOM子件资料 -// INNER JOIN {1}.dbo.bas_part f on d.ComponentId = f.PartId -// INNER JOIN {1}.dbo.bom_opcomponentopt e ON d.OptionsId=e.OptionsId -- 子件选项资料 -// left JOIN {1}.dbo.bom_opcomponentsub i ON d.OpComponentId =i.OpComponentId --子件替代料 -// left join {1}.dbo.inventory g on c.InvCode=g.cInvCode --存货档案 -// LEFT JOIN {1}.dbo.bas_part K ON K.PartId=i.PartId -// -// WHERE ISNULL(a.ModifyDate, a.CreateDate)>=@LastTime -// IF NOT EXISTS(SELECT * FROM #TempBOM) -// RETURN"; - - -// sql = ICSHelper.Time(Namespace, Class, TenantId, sql, "#TempBOM"); -// sql += "\r\n"; -// sql += @"--删除数据 -// DELETE ICSBOM WHERE cInvCode NOT IN (SELECT InvCode FROM {1}.dbo.bas_part) "; -// Dictionary values = new Dictionary(); -// values.Add("Version", "a.Version"); -// values.Add("VersionDesc", "a.VersionDesc"); -// values.Add("VersionEffDate", "a.VersionEffDate"); -// values.Add("VersionEndDate", "a.VersionEndDate"); -// values.Add("cInvCode", "a.cInvCode"); -// values.Add("SubcInvCode", "a.SubcInvCode"); -// values.Add("WIPType", "a.WIPType"); -// values.Add("SortSeq", "a.SortSeq"); -// values.Add("BaseQtyN", "a.BaseQtyN"); -// values.Add("BaseQtyD", "a.BaseQtyD"); -// values.Add("ByproductFlag", "a.ByproductFlag"); -// values.Add("ProductType", "a.ProductType"); -// values.Add("CompScrap", "a.CompScrap"); -// values.Add("CreateDate", "a.CreateDate"); -// values.Add("CreateUser", "a.CreateUser"); -// values.Add("ModifyDate", "a.ModifyDate"); -// values.Add("ModifyUser", "a.ModifyUser"); -// values.Add("cCurrentAuditor", "a.cCurrentAuditor"); -// values.Add("cAuditDate", "a.cAuditDate"); -// values.Add("ReplaceFlag", "a.ReplaceFlag"); -// values.Add("OpComponentId", "a.OpComponentId"); -// values.Add("ReplaceSequence", "a.ReplaceSequence"); -// values.Add("ReplaceInvCode", "a.ReplaceInvCode"); -// values.Add("ReplaceFactor", "a.ReplaceFactor"); -// values.Add("ReplaceEffBegDate", "a.ReplaceEffBegDate"); -// values.Add("ReplaceEffEndDate", "a.ReplaceEffEndDate"); -// values.Add("MTIME", "a.MTIME"); - -// //更新存在数据 -// sql += ICSHelper.UpdateSQL("b", values) -// + @" #TempBOM a -// INNER JOIN ICSBOM b ON a.cInvCode=b.cInvCode "; - -// values.Add("MUSER", "'" + ConstWorkPoint.Muser + "'"); -// values.Add("MUSERName", "'" + ConstWorkPoint.Musername + "'"); -// values.Add("TenantId", "'" + TenantId + "'"); -// sql += "\r\n"; -// //插入新增数据 -// sql += ICSHelper.InsertSQL("ICSBOM", values) -// + @" #TempBOM a -// LEFT JOIN ICSBOM b ON a.cInvCode=b.cInvCode -// WHERE b.cInvCode IS NULL -// "; -// sql += "DROP TABLE #TempBOM"; -// sql = string.Format(sql, ICSHelper.GetConfigString()["ERPDB"]); -// ICSHelper.ExecuteDate(conStr, sql); -// #endregion -// } -// catch (Exception ex) -// { -// log.Error(ex.ToString()); -// } -// } } } diff --git a/ICSSoft.Test/Program.cs b/ICSSoft.Test/Program.cs index 08b3f02..d523b48 100644 --- a/ICSSoft.Test/Program.cs +++ b/ICSSoft.Test/Program.cs @@ -13,7 +13,7 @@ namespace ICSSoft.Test //ICSVendor test = new ICSVendor(); //test.Execute(); - SyncVendor_WeiMas test = new SyncVendor_WeiMas(); + IcsSBom test = new IcsSBom(); test.Execute();