From 56e9cab16e32923722e7e8ddbfca58306087839a Mon Sep 17 00:00:00 2001 From: xusc Date: Tue, 5 Nov 2024 11:07:54 +0800 Subject: [PATCH] ... --- .vs/ICSSoft.FromERP/v16/.suo | Bin 306688 -> 341504 bytes ICSSoft.FromERP/App.config | 8 ++++---- ICSSoft.FromERP/IcsMo_Rhtyon.cs | 6 +++++- ICSSoft.FromERP/SyncMoHour_Rhyton.cs | 4 ++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo index ba40920726ce65915a0aac58cff8b45ac564eb2f..e8055990ecb92684350d75273d89c89b974377bf 100644 GIT binary patch delta 13348 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 - - + + @@ -37,9 +37,9 @@ - + - + diff --git a/ICSSoft.FromERP/IcsMo_Rhtyon.cs b/ICSSoft.FromERP/IcsMo_Rhtyon.cs index 5803563..c5df4f7 100644 --- a/ICSSoft.FromERP/IcsMo_Rhtyon.cs +++ b/ICSSoft.FromERP/IcsMo_Rhtyon.cs @@ -66,6 +66,7 @@ namespace ICSSoft.FromERP case when A.DocState=2 then 'mostatus_initial' when A.DocState=3 then 'mostatus_close' else 'mostatus_initial' end as MOStatus, + case when A.DocState=2 then '开工' when A.DocState=3 then '关闭' else '开工' end as DocState, A2.Description as MOMemo, '2' as ERPStatus, A.StartDate as StartDate, @@ -101,6 +102,7 @@ and b1.code not like 'K10%' ,A4.Name as MoDocType ,case when a.ActualCompleteDate is null then '' else Convert(varchar(10),a.ActualCompleteDate,120 ) end as ActualCompleteDate +,a.IsFIClose INTO #TempMO from {1}.dbo.MO_MO as A With(NoLock) left join {1}.dbo.[MO_MOMemo] as A1 With(NoLock) on (A.[ID] = A1.[MO]) @@ -168,7 +170,9 @@ else Convert(varchar(10),a.ActualCompleteDate,120 ) end as ActualCompleteDate values.Add("CusItemCode", "a.EATTRIBUTE2"); values.Add("CusName", "a.EATTRIBUTE3"); values.Add("DocType", "a.MoDocType"); - // values.Add("Default3", "a.ActualCompleteDate"); + values.Add("Default3", "a.ActualCompleteDate"); + values.Add("Default5", "a.DocState"); + values.Add("Default6", "a.IsFIClose"); //更新存在数据 sql += ICSHelper.UpdateSQL("b", values) diff --git a/ICSSoft.FromERP/SyncMoHour_Rhyton.cs b/ICSSoft.FromERP/SyncMoHour_Rhyton.cs index 5fbf261..07c5822 100644 --- a/ICSSoft.FromERP/SyncMoHour_Rhyton.cs +++ b/ICSSoft.FromERP/SyncMoHour_Rhyton.cs @@ -127,6 +127,8 @@ left join IcsItem2Route h with(nolock) on b.ItemCode=h.ItemCode and d.RouteCod left join IcsItemRoute2Op h1 with(nolock) on h.ItemCode=h1.ItemCode and h.RouteCode=h1.RouteCode and e.OpCode=h1.OpCode and h.TenantId=h1.TenantId left join IcsMoHourData h2 with(nolock) on a.mocode=h2.mocode and e.OpCode=h2.OpCode where 1=1 +and a.MoStatus='mostatus_close' +and a.Default6='0' and a.TenantId='{0}' and e.OpControl='10000000' and (h2.id is null) @@ -149,6 +151,7 @@ order by a.MoCode, a.OpSeq asc ,ManualTime ,MachiningTotalTime ,ResQty +,HourDiff ,Status ,TenantId ,CreationTime @@ -167,6 +170,7 @@ a.MoCode ,a.ManualTime ,(a.PTime+cast( a.ManualTime as decimal(18,6) )) ,a.ResQty +,(a.PTime+cast( a.ManualTime as decimal(18,6) )-a.TotalTime) ,a.Status ,a.TenantId ,a.MTIME