From f9376f1a2d684aa6691f262479b63f448578211f Mon Sep 17 00:00:00 2001 From: xusc Date: Fri, 22 Nov 2024 10:33:40 +0800 Subject: [PATCH] .. --- .vs/ICSSoft.FromERP/v16/.suo | Bin 343040 -> 355328 bytes ICSSoft.FromERP/App.config | 4 ++-- ICSSoft.FromERP/SyncMoHour_Rhyton.cs | 9 ++++++--- ICSSoft.Test/Program.cs | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo index 7b19cb15b68dbff7a7f872494c2793d8e8f4ccdc..913e09483f83527dc0a7a294838db255aec9c2d4 100644 GIT binary patch delta 9336 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 delta 10858 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 - - + + 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);