From a68210003e80bee37efdd2a13082971c26fc3e2c Mon Sep 17 00:00:00 2001 From: xuli Date: Thu, 31 Oct 2024 17:50:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E9=B8=BF=E5=9F=BA-=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=90=8C=E6=AD=A5FromU8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/ICSSoft.FromERP/v14/.suo | Bin 258048 -> 258048 bytes ICSSoft.FromERP/ICSMoFromU8_XinHJ.cs | 213 +++++++++++++++++++++++++ ICSSoft.FromERP/ICSSoft.FromERP.csproj | 1 + 3 files changed, 214 insertions(+) create mode 100644 ICSSoft.FromERP/ICSMoFromU8_XinHJ.cs diff --git a/.vs/ICSSoft.FromERP/v14/.suo b/.vs/ICSSoft.FromERP/v14/.suo index a8549eae55835bc5abde7fd81f7456e63e550d3d..ba85d59a15a8b21a1dbafa33a076473ab4e66b7c 100644 GIT binary patch delta 8904 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 diff --git a/ICSSoft.FromERP/ICSMoFromU8_XinHJ.cs b/ICSSoft.FromERP/ICSMoFromU8_XinHJ.cs new file mode 100644 index 0000000..296b0e3 --- /dev/null +++ b/ICSSoft.FromERP/ICSMoFromU8_XinHJ.cs @@ -0,0 +1,213 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using Quartz; + + +namespace ICSSoft.FromERP +{ + /// + /// 工单(来源U8) -新鸿基 + /// + public class ICSMoFromU8_XinHJ : IJob + { + private static object key = new object(); + private static log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + public void Execute(IJobExecutionContext context) + { + try + { + lock (key) + { + log.Info("开始……………………………………………………………………"); + Execute(); + log.Info("结束……………………………………………………………………"); + } + } + catch (Exception ex) + { + log.Error(ex.ToString()); + } + } + + public void Execute() + { + try + { + string conStr = ICSHelper.GetConnectString(); + string Namespace = this.GetType().Namespace; + //string Class = this.GetType().Name; + DataTable dt = ICSHelper.GetERPDB(conStr); + + string erpNames = ICSHelper.GetConfigString()["Workpoint_ERPDB"]; + List DBS = erpNames.Split(',').ToList(); + List ListDB = new List(); + foreach (string DB in DBS) + { + if (DB.Split('|') != null && DB.Split('|').Count() > 1) + { + WorkpointERPDBLink wd = new WorkpointERPDBLink(); + wd.Workpoint = DB.Split('|')[0]; + wd.ERPDB = DB.Split('|')[1]; + ListDB.Add(wd); + } + } + + foreach (DataRow dr in dt.Rows) + { + // string erpName = ICSHelper.GetConfigString()["ERPDB"]; + string TenantId = dr["TenantId"].ToString();//mes 组织 + string TenantCode = dr["TenantCode"].ToString(); + string ErpId = dr["ErpID"].ToString(); //erpID + string Class = this.GetType().Name + TenantCode; + + WorkpointERPDBLink dblink = ListDB.FindLast(a => a.Workpoint == TenantCode); + if (dblink == null) + { + return; + } + string erpName = dblink.ERPDB; + + //erpName = string.Format(erpName, TenantId); + #region SQL + string sql = @" + + + select CAST(b.MoDId as VARCHAR(50)) as ID, + a.MoCode as MOCODE, + b.SortSeq as Sequence, + b.InvCode as InvCode, + b.Qty as Quantity, + a.CreateUser as CreatePerson, + a.CreateTime as CreateDateTime, + isnull(b.AuxQty,0) as Amount, + isnull(b.QualifiedInQty,0) as RCVQuantity, + b.MDeptCode as DepCode, + b.WhCode as WHCode, + case when b.CloseUser is not null then 'mostatus_initial' else 'mostatus_close' end as MOStatus, + b.Remark as MOMemo, + case when b.CloseUser is not null then '3' else '2' end as ERPStatus, + c.StartDate as StartDate, + c.DueDate as DueDate, + a.MoId as MOID, + b.MoDId as MODetailID, + + CASE WHEN ISNULL(a.ModifyTime, a.CreateTime)> +ISNULL(b.CloseTime,ISNULL(b.RelsTime,ISNULL(a.ModifyTime, a.CreateTime))) +THEN ISNULL(a.ModifyTime, a.CreateTime) +ELSE ISNULL(b.CloseTime,ISNULL(b.RelsTime,ISNULL(a.ModifyTime, a.CreateTime))) END as MTIME, + isnull(b.CostItemCode,'') ProjectCode,isnull(b.MoLotCode,'') cBatch,'' version ,'' brand, + (case WHEN inv.bFree1=1 THEN isnull(b.Free1,'') ELSE '' END) as cFree1, + (case WHEN inv.bFree2=1 THEN isnull(b.Free2,'') ELSE '' END) as cFree2, + (case WHEN inv.bFree3=1 THEN isnull(b.Free3,'') ELSE '' END) as cFree3, + (case WHEN inv.bFree4=1 THEN isnull(b.Free4,'') ELSE '' END) as cFree4, + (case WHEN inv.bFree5=1 THEN isnull(b.Free5,'') ELSE '' END) as cFree5, + (case WHEN inv.bFree6=1 THEN isnull(b.Free6,'') ELSE '' END) as cFree6, + (case WHEN inv.bFree7=1 THEN isnull(b.Free7,'') ELSE '' END) as cFree7, + (case WHEN inv.bFree8=1 THEN isnull(b.Free8,'') ELSE '' END) as cFree8, + (case WHEN inv.bFree9=1 THEN isnull(b.Free9,'') ELSE '' END) as cFree9, + (case WHEN inv.bFree10=1 THEN isnull(b.Free10,'') ELSE '' END) as cFree10, + CAST('' AS NVARCHAR(500)) as Colspan, + b.MoLotCode 生产批号,b.Free1 零件版本,b.Free2 图纸版本 + + INTO #TempMO + FROM {1}.dbo.mom_order a + INNER JOIN {1}.dbo.mom_orderdetail b ON a.MoId = b.MoId + INNER JOIN {1}.dbo.mom_morder c ON b.MoDId = c.MoDId + LEFT JOIN {1}.dbo.Inventory inv ON b.InvCode = inv.cInvCode + LEFT JOIN {1}.dbo.Customer cus ON b.CustCode = cus.cCusCode + LEFT JOIN {1}.dbo.SO_SODetails so ON b.OrderDId = so.iSOsID + + where ISNULL (b.RelsUser,'') <> '' + and CASE WHEN ISNULL(a.ModifyTime, a.CreateTime)>ISNULL(b.CloseTime,ISNULL(b.RelsTime,ISNULL(a.ModifyTime, a.CreateTime))) THEN ISNULL(a.ModifyTime, a.CreateTime) ELSE ISNULL(b.CloseTime,ISNULL(b.RelsTime,ISNULL(a.ModifyTime, a.CreateTime))) END>=@LastTime + + IF NOT EXISTS(SELECT * FROM #TempMO) + begin + DROP TABLE #TempMO + RETURN + + end"; + sql = string.Format(sql, ErpId, erpName); + sql = ICSHelper.Time(Namespace, Class, TenantId, sql, "#TempMO"); + Dictionary value = new Dictionary(); + + + sql += @"--删除数据 + + SELECT a.ID INTO #tableICSMO + FROM ICSMO a With(NoLock) + LEFT JOIN {1}.dbo.[mom_order] b With(NoLock) ON a.Mocode=b.MoCode + left JOIN {1}.dbo.mom_orderdetail b2 ON b.MoId = b2.MoId AND A.MoSeq=B2.SortSeq + WHERE a.TenantId='{0}' and B2.SortSeq IS NULL + + DELETE FROM ICSMO + WHERE TenantId='{0}' and ID IN ( SELECT ID from #tableICSMO ) + "; + Dictionary values = new Dictionary(); + values.Add("MoCode", "a.MOCODE");//工单号 + values.Add("MoSeq", "a.Sequence");//工单行号 + values.Add("ItemCode", "a.InvCode");//物料代码 + values.Add("MoPlanQty", "a.Quantity");//数量 + values.Add("Amount", "a.Amount"); + values.Add("DepCode", "a.DepCode"); + values.Add("SegCode", "a.DepCode"); + 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");//生产订单状态 + values.Add("MOID", "a.MoId");//生产订单状态 + values.Add("MODetailID", "a.MODetailID");//生产订单状态 + values.Add("LastModifierUserId", "'" + ConstWorkPoint.Muser + "'"); + values.Add("LastModifierUserName", "'" + ConstWorkPoint.Musername + "'"); + values.Add("LastModificationTime", "a.Mtime");//操作时间 + values.Add("Defaultl", "a.生产批号");//完工日 + values.Add("Default2", "a.零件版本");//完工日 + values.Add("Default3", "a.图纸版本");//完工日 + + //更新存在数据 + sql += ICSHelper.UpdateSQL("b", values) + + @" #TempMO a + INNER JOIN ICSMO b ON a.Mocode=b.Mocode AND A.Sequence=B.MoSeq + WHERE b.TenantId='{0}' "; + + // values.Add("ID", "NEWID()"); + values.Add("MoType", "'normal'");//辅机数量 + values.Add("MOVER", "'1'");//辅机数量 + values.Add("ProjectCode", "a.ProjectCode");//辅机数量 + + values.Add("MOINPUTQTY", "0");//辅机数量 + values.Add("MOSCRAPQTY", "0");//辅机数量 + values.Add("MOACTQTY", "0");//辅机数量 + values.Add("CollectModel", "'SS'");//辅机数量 + values.Add("CollectType", "'collecttype_one'");//辅机数量 + values.Add("MoBom", "'1'");//辅机数量 + values.Add("CreationTime", "a.MTime");//操作人 + values.Add("CreatorUserId", "'" + ConstWorkPoint.Muser + "'");//操作人 + values.Add("CreatorUserName", "'" + ConstWorkPoint.Musername + "'");//操作人名称 + values.Add("TenantId", "'" + TenantId + "'");//站点 + values.Add("MOSTATUS", "a.MOStatus");//生产订单状态 + //插入新增数据 + sql += ICSHelper.InsertSQL("ICSMO", values) + + @" #TempMO a + LEFT JOIN ICSMO b on a.Mocode=b.Mocode AND A.Sequence=B.MoSeq and b.TenantId='{0}' + WHERE 1=1 and b.MoCode is null "; + sql += "DROP TABLE #TempMO"; + sql += " DROP TABLE #tableICSMO "; + sql = string.Format(sql, TenantId, erpName, ErpId); + //return; + ICSHelper.ExecuteDate(conStr, sql); + #endregion + } + } + catch (Exception ex) + { + log.Error(ex.ToString()); + } + } + } +} diff --git a/ICSSoft.FromERP/ICSSoft.FromERP.csproj b/ICSSoft.FromERP/ICSSoft.FromERP.csproj index 5fe1025..06b9c9a 100644 --- a/ICSSoft.FromERP/ICSSoft.FromERP.csproj +++ b/ICSSoft.FromERP/ICSSoft.FromERP.csproj @@ -107,6 +107,7 @@ + From 8c472f09796ef3619494d6c84ee5161e4c9f72c3 Mon Sep 17 00:00:00 2001 From: xuli Date: Fri, 1 Nov 2024 10:35:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/ICSSoft.FromERP/v14/.suo | Bin 258048 -> 247296 bytes ICSSoft.FromERP/ICSMoFromU8_XinHJ.cs | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.vs/ICSSoft.FromERP/v14/.suo b/.vs/ICSSoft.FromERP/v14/.suo index ba85d59a15a8b21a1dbafa33a076473ab4e66b7c..1e8149b8bdb3c23da1b9a692f74edba7320cbaf0 100644 GIT binary patch delta 6891 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 CYa3Po delta 7383 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 yg7aRGnI8Nv>i* Date: Fri, 1 Nov 2024 10:36:37 +0800 Subject: [PATCH 3/4] 1 --- .vs/ICSSoft.FromERP/v14/.suo | Bin 247296 -> 238080 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.vs/ICSSoft.FromERP/v14/.suo b/.vs/ICSSoft.FromERP/v14/.suo index 1e8149b8bdb3c23da1b9a692f74edba7320cbaf0..eff92ed7a067539c59cddf77fe65e8b2a8cded19 100644 GIT binary patch delta 2046 zcmaKte^69a6vy8=@9m0+>+;+9p$n~|fQXvY43@5nBjzt8HBwUn%_&1S1V_o-N0~87 z4!m33Muk7#G!Kw8;3-edAM1}vvoX@Ac29Bki3vGW)ak}CxonM?It^u$N)(iOE#Vm`)t0F`qYcG z$Rb7(vxy{PFp|Kl40P+VB8;L;T4)HV*K!};<_1Z~fm-WS{kJ!tjb&e#lcWuL92CK78hr8^S z?Oj&bu*K|ZP@uxA2(i3r9sd@qxKAT3FeoR1nutM!Fn7rxNDS$Xi9>{VLPQ~+SU*lY zQ9FZ%a#2nzkw`=lF+?}ZS0bONYIN`gs!gF>(dRt*VeCs~sIO0Caq2|cokFZ7CKFGR z+(!FCa#8oFNbpGccOfd#EPP~>+u0hjdh#uA+4Y%2UX;hv9jG;f`yWO zPb!TuoxNEa+W%`BVl=JJu*p@=R(Q*r(l$7;5zOKjw%YWisAmN=6>kLRZ3XN@u%+%cUIO%A2Xe~H$(MY)Hg(FK^aOl zz3=9%pk#203HtbvqO5e_1}(ETOvI9DEo=(e(PHmN=6pp2SlGN9kCkrIW2DnRMy4jk zvrm#@%!!pJLECv7USW53`k;*!?ef`vpw0oTv*!1Qvpi3CpGJ32C(F8OSA@Jw&Ik%D zCcA`~AhCkFvG&)=T@7qc-9i%RKU%iX?xR|keCw<5rfb!Ou*)p^*(ckl(ZRzM^Zs=^ z>IQ1RxlGrdwto6S)b}geeZ^GHc7cA_u3y2XlZxF`?sq}cIS8^qfgaGW#%qb`0d$UJ zCwR#^7-1GBmVw?CU<3jhc2GDBfI_P<1j@h&f@C8MkQZb@xmBJ9UN9mkD~dum9kQ)# z57bUI+*E|KMMf!jqm2=u7`5Osk}2~XIGR%ckEm5Tfe?+kpknL;yOBjU8wYdmMc85O zxB>-WcoB_j)V8q`;`pQvNVit5$6a7uItm(a&4+7@VybEbY*sO5B&a;L4wv(I1BdVf zdvF-{*P)+R)L<;{{1qMH;@zevPg*A}AS+bMNadb-T*xEpG12nZqaV0`FREPKiynTd z9z%H6K1|`)8t5aX0kbT1AF5EJHX!sbkn*Y11Sy4A_#u?XG@^UJFh!C=ANIb?+xO%6 z8nqFDmsser{5R2${MK=rupgthu+2<9(M*m;JyQB=Po~v0hup5hH2J<;~0Y6 z?8Gqoh2Kgo`<`lY9EA8alCv*}{{i~u=N*ybctW=rT4NvhJ|-ZSqo^3mM+Tp)9XRuNY>S86w|>>p zyzo8X7q8;z%7e0>`wz*U%0t3AEPIR(g2sK#;U+ zom*XJbI-Wz6w%DSW7}<2VtLkW9kz~nZ2fb(GuN%2R(o7~+`3vfY-wj@-_3&<^>jV! z_BcPjKlk46e&2V$_vOCuv9$2^i96=r(W%jB#sRL6jEn%$@PHaX17HIw$;dw#45J8s zC{45K<)3Sd-a?PTK=^giu4~6{;Mm7lkI+Jb`1~Ra1JwX9G?EUKS^OAjG>d_+1ZoAE z3-|;;R`TYl%YnHMPzbmeFbj|k(32iMA5YYfK|Z&OSs8-W#V{}rPzq=QlmNa7CIQrS>z9t|Rs+ogECaLwCIHynt3dAp=l~#&EK+Ia$b4X`MwR!0 zAvSo4bf(Ng9pu@R1?UlSCFMIjbCa}cs}9ylEL*AW>w8~h+1d&#!=z2O8I_Q$c$tm^ zISW7^X+{Mk#8v4sK$@P=42{pOn++0kX%*0RKq}x)KrMjn&K|a6EXhn}Ngf6yC;49> z=K#(D?gmT)m;h@5B*B!POU)b2z*|7i zlPmn>LNkng(IGHHV^14-cuLk&K|>eI^q7*RjXf!#V~J)w3q1hlA0CyxK+8aOkIIce z>jCQl-vSiE7+b?0MqdP75b#4l0MH2IUS(hG-RzuEWtyI9iuZ zFW9*0bow67Z~T1Anw}pmZOlD3Jk!|y{PdT}jm_Ys^@NkO!(}GC4EF3=Z@SzKY1JJMW497)N#up$+8ft}fI| zT6(&4yTN&OeB`Jtcn_c)?8GbS+U~maZ-ZhD-~m7l;6X$-_FA=Uyg);q>#dGH zr(;$2dx-evD#M>(vT5q~qlb8P$G(qH^oSOYtnU?G8{-dOL-gHMoIB<|adbiq4UC}Z zo4Jw0e2hPS4Mnf%qGz$JMSOo6%E3yG0iB;kQ3?tvAwAlT&hJw@OnTVJ7qa68e7&?K{%+&rG zn`qF*S(T;3s1M0jgh_a6F4;E|UYLn`rScj&jARj(pD9B>p$Gbrk#0GSOv>PORJ=g0 z#5{es0Xr2L+VCITS&1J6LJOxIc_dg^KBYd{M7|VTMLC8P3U| zp&t(6v*;APJcRers>65|I?njrDu0^syKqB*ob+4K8*$07$sed|+E~A_sj)>;r@h7o zo)*2q;A~%0puS;!N5|%h5?h(aW+@k3lCxA0MO%sBDwQmPMRHioV!7lgDYJBTydF2H zRZXhK{t#D9YzTld)U>fJd7~5YF}}IBsZpJLjwyOdybS@LH{@Rr(|t{Kes#%gUo-gO zb@-g3=#>PsU-SxMz0V;?lEW*Q9immTneC#(DR#!=e7Y;>^=Y~f#^Sb;HzSl1bqTgl_yiVZi{bpBfoyBRf`+UjM>m|wQvYG{- zwbsF`TLqWRX$R|)8Pe*kv%0+Ir1^H6T@-y{onZG_B-I;ltoIT zSRaA%%LRCDFM%`zB&IrEWpIX7^r^#mf&La*tIE{-DXz$5zqRV48(_bs?8@Ous%c{y z7+lg+0VVql2}~}hd-`w=y=NHD;cpgIdpkz0K^Go)2KY*5?~AHGBR%15VuR|$2Kh!P z^$5GkFtk zSW43BZ)nNcnnKQDw$Q*!I4d*Z5-{wp$*$R+TN{T#zYqd0ZEA%0ma+mX*WV&*RauR* zAz@TE@IBz;h5H{GRo0Z`+$PH6{zOpulM|UtG^?c1+q&N^Wv+ez#Jx~E;M)JS1DYTo zOTb9kXd5kqHk$BzT|7gkFP)Ko`wVij#zvp~6i>~3Fe!)Ze#*{9Ey$-UzhdK^c+0vK z%uf%U{TZH!lK7kIqbuPCFnR#{Wb*vKTKJcD@O0L~S%XV-{*}z@x#U7yHoC!r&v$cn zse=Z1lo|idVt&(8!?-XW-_#dl_nUr+{cn>GPhmGxjZGWo!eqmqCsvgq62$5cl;8sz$Ly1QS?WY)g9pmsQZ`L-A#ZQh;VMW z`2#~>>Ys=46gs$@%TccG;ud2X?&ZRA2gj3v)-0N}hijnjUe2wA_i%1B>6QJdi+^*+ k88_8#eeF_z_2Y<6>fq+wc8RB!W@PFv;xd&-JGd?A-wy<3J^%m! From fe34dd7037961bd15e6e80d3edcddbe817a68674 Mon Sep 17 00:00:00 2001 From: xuli Date: Fri, 1 Nov 2024 11:31:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E9=B8=BF=E5=9F=BA=20=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=96=99=E5=8F=B7FromU8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ICSSoft.FromERP/ICSInventoryFromU8_XinHJ.cs | 179 ++++++++++++++++++++ ICSSoft.FromERP/ICSSoft.FromERP.csproj | 1 + 2 files changed, 180 insertions(+) create mode 100644 ICSSoft.FromERP/ICSInventoryFromU8_XinHJ.cs diff --git a/ICSSoft.FromERP/ICSInventoryFromU8_XinHJ.cs b/ICSSoft.FromERP/ICSInventoryFromU8_XinHJ.cs new file mode 100644 index 0000000..cab38f7 --- /dev/null +++ b/ICSSoft.FromERP/ICSInventoryFromU8_XinHJ.cs @@ -0,0 +1,179 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Quartz; + +using System.Data; +using System.Net.NetworkInformation; + +namespace ICSSoft.FromERP +{ + /// + /// 物料档案(来源U8) + /// + public class ICSInventoryFromU8_XinHJ : IJob + { + private static object key = new object(); + private static log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + public void Execute(IJobExecutionContext context) + { + try + { + lock (key) + { + log.Info("开始……………………………………………………………………"); + Execute(); + log.Info("结束……………………………………………………………………"); + } + } + catch (Exception ex) + { + log.Error(ex.ToString()); + } + } + + public void Execute() + { + try + { + //string conERPStr = ICSHelper.GetERPConnectString(); + string conStr = ICSHelper.GetConnectString(); + string Namespace = this.GetType().Namespace; + //string Class = this.GetType().Name; + string erpNames = ICSHelper.GetConfigString()["Workpoint_ERPDB"]; + List DBS = erpNames.Split(',').ToList(); + List ListDB = new List(); + foreach (string DB in DBS) + { + if (DB.Split('|') != null && DB.Split('|').Count() > 1) + { + WorkpointERPDBLink wd = new WorkpointERPDBLink(); + wd.Workpoint = DB.Split('|')[0]; + wd.ERPDB = DB.Split('|')[1]; + ListDB.Add(wd); + } + } + DataTable dt = ICSHelper.GetERPDB(conStr); + foreach (DataRow dr in dt.Rows) + { + + string TenantId = dr["TenantId"].ToString(); + string TenantCode = dr["TenantCode"].ToString(); + string ErpId = dr["ErpID"].ToString(); //erpID + string Class = this.GetType().Name + TenantCode; + + WorkpointERPDBLink dblink= ListDB.FindLast(a => a.Workpoint == TenantCode); + if (dblink == null) + { + return; + } + string erpName = dblink.ERPDB; + //erpName = string.Format(erpName, TenantId); + + #region SQL + string sql = @" + + select NEWID() AS ID, + a.cInvCode AS ItemCode, + CASE WHEN A.bSelf ='1' THEN '1' WHEN A.bPurchase='1' THEN '1' when a.bProxyForeign='1' THEN '2' + else '' end ItemFormAttribute, + dbo.GetReplaceStr(cInvName) AS ItemName, + a.cEngineerFigNo ItemDrawingNo, + '' ItemDesc, + dbo.GetReplaceStr(isnull(cInvAddCode,'')+'|'+isnull(cInvStd,'')) AS ItemStd, + a.cInvAddCode INVPARSETYPE, + c.cComUnitName AS ItemUnit, + a.cInvCCode ItemMainCategoryCode, + b.cInvCName ClassName, + ISNULL(c.iChangRate,0) as ItemRate, + ISNULL(a.iMassDate,'') as EffectiveDays, + ISNULL(CONVERT(NVARCHAR(50),a.dModifyDate,21),'') MTime, + (case when isnull(a.fOutExcess,0)=0 then 0 else (case when isnull(a.fOutExcess,0)>5 then 3 else 2 end) end) 备料超额类型, + isnull(a.fOutExcess,0) 备料超额值 + + INTO #TempINV + FROM {1}.dbo.Inventory a with(nolock) + LEFT JOIN {1}.dbo.InventoryClass b with(nolock) ON a.cInvCCode = b.cInvCCode + LEFT JOIN {1}.dbo.ComputationUnit c with(nolock) ON a.cComUnitCode = c.cComunitCode + WHERE a.dEDate IS NULL AND a.dModifyDate>=@LastTime + ORDER BY cInvCode + + + IF NOT EXISTS(SELECT * FROM #TempINV) + RETURN"; + sql = string.Format(sql, ErpId, erpName); + sql = ICSHelper.Time(Namespace, Class, TenantId, sql, "#TempINV"); + + sql += @"--删除数据 + + SELECT a.ItemCode INTO #tableICSINVENTORY + FROM ICSINVENTORY a With(NoLock) + LEFT JOIN {1}.dbo.[Inventory] b With(NoLock) ON a.ItemCode=b.cInvCode + WHERE b.cInvCode is null + and a.TenantId='{0}' + + + DELETE ICSINVENTORY + WHERE TenantId='{0}' and ItemCode IN ( SELECT ItemCode from #tableICSINVENTORY) "; + Dictionary values = new Dictionary(); + values.Add("ItemCode", "a.ItemCode");//物料编号 + values.Add("ItemName", "a.ItemName");//物料名称 + values.Add("ItemDesc", "a.ItemDesc");//物料描述 + values.Add("ItemStd", "a.ItemStd");//规格型号 + values.Add("ItemAttribute", "a.ItemFormAttribute");//产品属性(0：采购，1：自制，2：委外，3虚拟） + values.Add("ItemAddCode", "a.INVPARSETYPE"); //产品代码(U8存货代码 ) + values.Add("ItemUnit", "a.ItemUnit");//主计量单位 + values.Add("ItemMainCategoryCode", "a.ItemMainCategoryCode");//大类编码 + values.Add("ItemRate", "a.ItemRate"); + values.Add("InvVersion", "''"); + values.Add("InvBrand", "''"); + values.Add("InvIQC", "0");//是否IQC检验 + values.Add("InvFQC", "0");//是否FQC检验 + values.Add("EffectiveEnable", "0");// + values.Add("EffectiveDays", "a.EffectiveDays");// + values.Add("BatchEnable", "1");// + values.Add("LotEnable", "0");// + values.Add("PrintEnable", "0");// + values.Add("OverType", "a.备料超额类型");//超领类型（1：比例，2：数量，3：不管控） + values.Add("OverValue", "a.备料超额值"); + values.Add("LastModificationTime", "a.Mtime");//操作时间 + values.Add("ItemType", "'itemtype_finishedproduct'"); + values.Add("ItemContype", "'item_control_lot'"); + values.Add("ItemControlType", "'item_control_lot'"); + values.Add("ItemDrawingNo", "b.ItemDrawingNo");//产品图号 + + + //更新存在数据 + sql += ICSHelper.UpdateSQL("b", values) + + @" #TempINV a + INNER JOIN ICSINVENTORY b ON a.ItemCode=b.ItemCode + left join IcsMainCategoryCode d on b.ItemMainCategoryCode=d.ItemMainCategoryCode and b.TenantId=d.TenantId + WHERE b.TenantId='" + TenantId + "' "; + + values.Add("CreationTime", "a.MTime");//操作人 + values.Add("CreatorUserId", "'" + ConstWorkPoint.Muser + "'");//操作人 + values.Add("CreatorUserName", "'" + ConstWorkPoint.Musername + "'");//操作人名称 + values.Add("TenantId", "'" + TenantId + "'");//站点 + //插入新增数据 + sql += ICSHelper.InsertSQL("ICSINVENTORY", values) + + @" #TempINV a + LEFT JOIN ICSINVENTORY b ON a.ItemCode=b.ItemCode and b.TenantId='{0}' + left join IcsMainCategoryCode d on b.ItemMainCategoryCode=d.ItemMainCategoryCode and b.TenantId=d.TenantId + WHERE 1=1 and b.ItemCode is null + "; + sql += " DROP TABLE #TempINV " + + " DROP TABLE #tableICSINVENTORY "; + sql = string.Format(sql, TenantId, erpName, ErpId); + + ICSHelper.ExecuteDate(conStr, sql); + #endregion + } + } + catch (Exception ex) + { + log.Error(ex.ToString()); + } + } + } +} diff --git a/ICSSoft.FromERP/ICSSoft.FromERP.csproj b/ICSSoft.FromERP/ICSSoft.FromERP.csproj index 06b9c9a..6c37c4e 100644 --- a/ICSSoft.FromERP/ICSSoft.FromERP.csproj +++ b/ICSSoft.FromERP/ICSSoft.FromERP.csproj @@ -99,6 +99,7 @@ +