diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo index ea1bc33..5ac85cf 100644 Binary files a/.vs/ICSSoft.FromERP/v16/.suo and b/.vs/ICSSoft.FromERP/v16/.suo differ diff --git a/ICSSoft.FromERP/App.config b/ICSSoft.FromERP/App.config index edb105e..2b3d9c1 100644 --- a/ICSSoft.FromERP/App.config +++ b/ICSSoft.FromERP/App.config @@ -2,7 +2,8 @@ - + + @@ -18,7 +19,8 @@ - + + diff --git a/ICSSoft.FromERP/IcsMo_Rhtyon.cs b/ICSSoft.FromERP/IcsMo_Rhtyon.cs index 421f108..8d5d74c 100644 --- a/ICSSoft.FromERP/IcsMo_Rhtyon.cs +++ b/ICSSoft.FromERP/IcsMo_Rhtyon.cs @@ -63,7 +63,9 @@ namespace ICSSoft.FromERP 0 as RCVQuantity, A13.Code as DepCode, A22.Code as WHCode, - 'mostatus_initial' as MOStatus, + case when A.DocState=2 then 'mostatus_initial' + when A.DocState=3 then 'mostatus_close' + else 'mostatus_initial' end as MOStatus, A2.Description as MOMemo, '2' as ERPStatus, A.StartDate as StartDate, @@ -170,7 +172,7 @@ else Convert(varchar(10),a.ActualCompleteDate,120 ) end as ActualCompleteDate values.Add("LastModifierUserId", "'" + ConstWorkPoint.Muser + "'"); values.Add("LastModifierUserName", "'" + ConstWorkPoint.Musername + "'"); values.Add("LastModificationTime", "a.Mtime");//操作时间 - //values.Add("Default1", "a.EATTRIBUTE1"); + values.Add("Default1", "a.EATTRIBUTE1"); //values.Add("Default2", "a.NeedType"); values.Add("DocType", "a.MoDocType"); // values.Add("Default3", "a.ActualCompleteDate"); diff --git a/ICSSoft.FromERP/SyncCas_Jinyang.cs b/ICSSoft.FromERP/SyncCas_Jinyang.cs index d6bcd90..554ce03 100644 --- a/ICSSoft.FromERP/SyncCas_Jinyang.cs +++ b/ICSSoft.FromERP/SyncCas_Jinyang.cs @@ -67,6 +67,8 @@ DROP TABLE #tempSyncCas_Jinyang select * ,a.CreateTime as MTime into #tempSyncCas_Jinyang from [ICSDomeAmb] a with( nolock) where a.CreateTime>@LastTime +and free1 <>'15' and Free2 not like '%e%' and free1<>'0' + and LotNO <>'' select a.* diff --git a/ICSSoft.Test/Program.cs b/ICSSoft.Test/Program.cs index 1913a4a..09b8fbd 100644 --- a/ICSSoft.Test/Program.cs +++ b/ICSSoft.Test/Program.cs @@ -13,7 +13,7 @@ namespace ICSSoft.Test //ICSVendor test = new ICSVendor(); //test.Execute(); - IcsMainCategoryCode_Rhtyon test = new IcsMainCategoryCode_Rhtyon(); + IcsMo_Rhtyon test = new IcsMo_Rhtyon(); test.Execute(); // var ss= ICSHelper.ApiSign("sj_w_id", "70FF7F01C5899A5ACAAD4ECB7FA5B3C5", 1724650261);