产成品交接裸瓷交接汇总及明细过滤掉已经撤销的

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -19943,6 +19943,7 @@ GROUP BY
                 //    sqlString = sqlString + " AND f.TemporarilyFlag = :TemporarilyFlag ";
                 //    parameters.Add(new OracleParameter(":TemporarilyFlag", OracleDbType.Char, cre.Properties["TemporarilyFlag"], ParameterDirection.Input));
                 //}
+                sqlString += " AND not exists(SELECT * FROM tp_pm_lcfhundo u WHERE  u.groutingdailydetailid =f.groutingdailydetailid and u.lcfhbatchno = f.lcfhbatchno  ) ";
                 sqlString += "  group by grouping sets(( l.logoname, g.goodscode, g.goodsmodel, gdd.materialcode,gdd.materialremark,gdd.logoid,gdd.goodsid,f.LCfhusercode),( l.logoname,gdd.logoid,f.LCfhusercode),(f.LCfhusercode),())";
 
                 DataTable data = conn.GetSqlResultToDt(sqlString, parameters.ToArray());
@@ -20103,7 +20104,7 @@ GROUP BY
                 sqlString = sqlString + "  AND G.BarCode = :BarCode ";
                 parameters.Add(new OracleParameter(":BarCode", OracleDbType.NVarchar2, cre.Properties["BarCode"], ParameterDirection.Input));
             }
-
+            sqlString += " AND not exists(SELECT * FROM tp_pm_lcfhundo u WHERE  u.groutingdailydetailid =f.groutingdailydetailid and u.lcfhbatchno = f.lcfhbatchno  ) ";
             return sqlString;
         }