同步

ICSSoft.FromERP/ICSSoft.FromERP/ICSOOPick.cs

@@ -61,16 +61,16 @@ namespace ICSSoft.FromERP
                                         a.iWIPtype as SupplyType,
                                         ISNULL(c.dVerifyTime,ISNULL(c.dModifyTime, c.dCreateTime)) AS MTIME,
                                           ''  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
+                                (case WHEN d.bFree1=1 THEN a.cFree1 ELSE '' END) as cFree1,
+                                (case WHEN d.bFree2=1 THEN a.cFree2 ELSE '' END) as cFree2,
+                                (case WHEN d.bFree3=1 THEN a.cFree3 ELSE '' END) as cFree3,
+                                (case WHEN d.bFree4=1 THEN a.cFree4 ELSE '' END) as cFree4,
+                                (case WHEN d.bFree5=1 THEN a.cFree5 ELSE '' END) as cFree5,
+                                (case WHEN d.bFree6=1 THEN a.cFree6 ELSE '' END) as cFree6,
+                                (case WHEN d.bFree7=1 THEN a.cFree7 ELSE '' END) as cFree7,
+                                (case WHEN d.bFree8=1 THEN a.cFree8 ELSE '' END) as cFree8,
+                                (case WHEN d.bFree9=1 THEN a.cFree9 ELSE '' END) as cFree9,
+                                (case WHEN d.bFree10=1 THEN a.cFree10 ELSE '' END) as cFree10,CAST('' AS NVARCHAR(500)) as Colspan
                                       ,  '{0}' as WorkPoint       
                                         INTO #TempBOM
                                         FROM {1}.dbo.OM_MOMaterials a 

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 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
+                                (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
                                       ,  '{0}' as WorkPoint       
                                 INTO #TempPOWW
                                         FROM {1}.dbo.OM_MODetails b