diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo index 7b19cb1..913e094 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 3c3da88..0330c59 100644 --- a/ICSSoft.FromERP/App.config +++ b/ICSSoft.FromERP/App.config @@ -39,8 +39,8 @@ - - + + diff --git a/ICSSoft.FromERP/SyncMoHour_Rhyton.cs b/ICSSoft.FromERP/SyncMoHour_Rhyton.cs index 22aafea..61a540b 100644 --- a/ICSSoft.FromERP/SyncMoHour_Rhyton.cs +++ b/ICSSoft.FromERP/SyncMoHour_Rhyton.cs @@ -69,7 +69,7 @@ DROP TABLE #tempSyncMoHour_Rhyton select a.* ,(a.PTime+cast( a.ManualTime as decimal(18,6) )) as MachiningTotalTime -,case when (a.EqpCalcType='1'and a.ResQty>0) then (a.PTime+cast( a.ManualTime as decimal(18,6) ))/a.ResQty +,case when (a.EqpCalcType='True'and a.ResQty>0) then (a.PTime+cast( a.ManualTime as decimal(18,6) ))/a.ResQty else 0 end as EqpTotalTime ,(a.PTime+cast( a.ManualTime as decimal(18,6) )-a.TotalTime) as HourDiff into #tempSyncMoHour_Rhyton @@ -146,7 +146,7 @@ and a.MoStatus='mostatus_close' and a.Default6='0' and a.TenantId='{0}' and e.OpControl='10000000' -and (h2.Status='No' or h2.Id is null ) +and (h2.AlterTime is null or h2.Id is null ) ) a where 1=1 ) a @@ -209,10 +209,13 @@ set STime=a.STime ,EqpTotalTime=a.EqpTotalTime ,ResQty=a.ResQty ,HourDiff=a.HourDiff +,LastModificationTime=GETDATE() +,LastModifierUserId='job' +,LastModifierUserName='job' from #tempSyncMoHour_Rhyton a join IcsMoHourData b on a.MoCode=b.MoCode and a.OpCode=b.OpCode where 1=1 - and b.Status='No' + and b.AlterTime is null diff --git a/ICSSoft.Test/Program.cs b/ICSSoft.Test/Program.cs index ebff87e..20172ab 100644 --- a/ICSSoft.Test/Program.cs +++ b/ICSSoft.Test/Program.cs @@ -13,7 +13,7 @@ namespace ICSSoft.Test //ICSVendor test = new ICSVendor(); //test.Execute(); - SyncItem_WeiMas test = new SyncItem_WeiMas(); + SyncMoHour_Rhyton test = new SyncMoHour_Rhyton(); test.Execute(); // var ss= ICSHelper.ApiSign("sj_w_id", "70FF7F01C5899A5ACAAD4ECB7FA5B3C5", 1724650261);