From 3e0cb9d2d945120a106f7a507d0b715df74558d0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-G2TH1JI\\vivian" Date: Thu, 2 Jun 2022 14:00:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E5=A4=96=E4=B8=8A=E6=96=99=E8=87=AA?= =?UTF-8?q?=E7=94=B1=E9=A1=B9=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ICSSoft.FromERP/ICSSoft.FromERP/ICSOOPick.cs | 22 +++++++++---------- .../ICSSoft.FromERP/ICSOutsourcingOrder.cs | 20 ++++++++--------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ICSSoft.FromERP/ICSSoft.FromERP/ICSOOPick.cs b/ICSSoft.FromERP/ICSSoft.FromERP/ICSOOPick.cs index 4c09c8b..d6758b9 100644 --- a/ICSSoft.FromERP/ICSSoft.FromERP/ICSOOPick.cs +++ b/ICSSoft.FromERP/ICSSoft.FromERP/ICSOOPick.cs @@ -60,17 +60,17 @@ namespace ICSSoft.FromERP a.cWhCode AS WHCode, a.iWIPtype as SupplyType, ISNULL(c.dVerifyTime,ISNULL(c.dModifyTime, c.dCreateTime)) AS MTIME, - '' ProjectCode,'' cBatch,'' version ,'' brand, - (case WHEN d.bFree1=1 THEN b.cFree1 ELSE '' END) as cFree1, - (case WHEN d.bFree2=1 THEN b.cFree2 ELSE '' END) as cFree2, - (case WHEN d.bFree3=1 THEN b.cFree3 ELSE '' END) as cFree3, - (case WHEN d.bFree4=1 THEN b.cFree4 ELSE '' END) as cFree4, - (case WHEN d.bFree5=1 THEN b.cFree5 ELSE '' END) as cFree5, - (case WHEN d.bFree6=1 THEN b.cFree6 ELSE '' END) as cFree6, - (case WHEN d.bFree7=1 THEN b.cFree7 ELSE '' END) as cFree7, - (case WHEN d.bFree8=1 THEN b.cFree8 ELSE '' END) as cFree8, - (case WHEN d.bFree9=1 THEN b.cFree9 ELSE '' END) as cFree9, - (case WHEN d.bFree10=1 THEN b.cFree10 ELSE '' END) as cFree10,CAST('' AS NVARCHAR(500)) as Colspan + '' ProjectCode,isnull(a.cBatch,'') cBatch,'' version ,'' brand, + (case WHEN a.cFree1=1 THEN b.cFree1 ELSE '' END) as cFree1, + (case WHEN a.cFree2=1 THEN b.cFree2 ELSE '' END) as cFree2, + (case WHEN a.cFree3=1 THEN b.cFree3 ELSE '' END) as cFree3, + (case WHEN a.cFree4=1 THEN b.cFree4 ELSE '' END) as cFree4, + (case WHEN a.cFree5=1 THEN b.cFree5 ELSE '' END) as cFree5, + (case WHEN a.cFree6=1 THEN b.cFree6 ELSE '' END) as cFree6, + (case WHEN a.cFree7=1 THEN b.cFree7 ELSE '' END) as cFree7, + (case WHEN a.cFree8=1 THEN b.cFree8 ELSE '' END) as cFree8, + (case WHEN a.cFree9=1 THEN b.cFree9 ELSE '' END) as cFree9, + (case WHEN a.cFree10=1 THEN b.cFree10 ELSE '' END) as cFree10,CAST('' AS NVARCHAR(500)) as Colspan , '{0}' as WorkPoint INTO #TempBOM FROM {1}.dbo.OM_MOMaterials a diff --git a/ICSSoft.FromERP/ICSSoft.FromERP/ICSOutsourcingOrder.cs b/ICSSoft.FromERP/ICSSoft.FromERP/ICSOutsourcingOrder.cs index 55bd4e0..2197e5a 100644 --- a/ICSSoft.FromERP/ICSSoft.FromERP/ICSOutsourcingOrder.cs +++ b/ICSSoft.FromERP/ICSSoft.FromERP/ICSOutsourcingOrder.cs @@ -86,16 +86,16 @@ namespace ICSSoft.FromERP c.dVerifyDate AS DateTime2, CASE WHEN b.dbCloseTime IS NULL THEN '' ELSE '关闭' END AS ISUrgent, isnull(b.cItemCode,'') ProjectCode,'' cBatch,'' version ,'' brand, - (case WHEN d.bFree1=1 THEN b.cFree1 ELSE '' END) as cFree1, - (case WHEN d.bFree2=1 THEN b.cFree2 ELSE '' END) as cFree2, - (case WHEN d.bFree3=1 THEN b.cFree3 ELSE '' END) as cFree3, - (case WHEN d.bFree4=1 THEN b.cFree4 ELSE '' END) as cFree4, - (case WHEN d.bFree5=1 THEN b.cFree5 ELSE '' END) as cFree5, - (case WHEN d.bFree6=1 THEN b.cFree6 ELSE '' END) as cFree6, - (case WHEN d.bFree7=1 THEN b.cFree7 ELSE '' END) as cFree7, - (case WHEN d.bFree8=1 THEN b.cFree8 ELSE '' END) as cFree8, - (case WHEN d.bFree9=1 THEN b.cFree9 ELSE '' END) as cFree9, - (case WHEN d.bFree10=1 THEN b.cFree10 ELSE '' END) as cFree10,CAST('' AS NVARCHAR(500)) as Colspan + (case WHEN b.cFree1=1 THEN b.cFree1 ELSE '' END) as cFree1, + (case WHEN b.cFree2=1 THEN b.cFree2 ELSE '' END) as cFree2, + (case WHEN b.cFree3=1 THEN b.cFree3 ELSE '' END) as cFree3, + (case WHEN b.cFree4=1 THEN b.cFree4 ELSE '' END) as cFree4, + (case WHEN b.cFree5=1 THEN b.cFree5 ELSE '' END) as cFree5, + (case WHEN b.cFree6=1 THEN b.cFree6 ELSE '' END) as cFree6, + (case WHEN b.cFree7=1 THEN b.cFree7 ELSE '' END) as cFree7, + (case WHEN b.cFree8=1 THEN b.cFree8 ELSE '' END) as cFree8, + (case WHEN b.cFree9=1 THEN b.cFree9 ELSE '' END) as cFree9, + (case WHEN b.cFree10=1 THEN b.cFree10 ELSE '' END) as cFree10,CAST('' AS NVARCHAR(500)) as Colspan , '{0}' as WorkPoint INTO #TempPOWW FROM {1}.dbo.OM_MODetails b