qinqi 1 gadu atpakaļ
vecāks
revīzija
a4a821fdd2

+ 0 - 1
DK.Client/ReportModule/R08/F_RPT_080117.cs

@@ -328,6 +328,5 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 		}  
         #endregion
 
-      
     }
 }

+ 1 - 1
DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -6726,7 +6726,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
         private static string GetRPT030102SSQL(SUserInfo user, RPT030102_SE se, ref List<OracleParameter> parameters)
         {
             parameters.Add(new OracleParameter(":AccountID", OracleDbType.Int32, user.AccountID, ParameterDirection.Input));
-            //parameters.Add(new OracleParameter(":UserID", OracleDbType.Int32, user.UserID, ParameterDirection.Input));
+            //parameters.Add(new OracleParameter(":UserID", OracleDbType.Int32, user.UserID, ParameterDirection.Input)); 
             string b = se.TestMouldFlag == null ? "" : se.TestMouldFlag == "0" ? "AND( GDD.TESTMOULDFLAG = 0 AND(GDD.TESTFORMFLAG IN(0, 1) OR GDD.TESTFORMFLAG IS NULL))"
                : "AND( GDD.TESTFORMFLAG = 2 OR GDD.TESTMOULDFLAG = 1) ";
 

+ 3 - 3
DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -7859,9 +7859,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 		{
 			ServiceResultEntity sre = new ServiceResultEntity();
 			IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
-			string classes = (cre.Properties["classes"] == null || cre.Properties["classes"] == "" || cre.Properties["classes"] == string.Empty) ? "" : "AND fp.classestype = '" + cre.Properties["classes"] .ToString()+ "'";
-			string GOODSID = (cre.Properties["GOODSID"] == null || cre.Properties["GOODSID"] == "" || cre.Properties["GOODSID"] == string.Empty) ? "" : "AND fd.goodsid = '"+ cre.Properties["GOODSID"] .ToString().Trim()+ "'";
-			string configtype= (cre.Properties["configtype"] == null || cre.Properties["configtype"] == "" || cre.Properties["configtype"] == string.Empty) ? "" :"AND fp.configtype = '"+ cre.Properties["configtype"] .ToString()+ "' ";
+			string classes = (cre.Properties["classes"] == null || cre.Properties["classes"].ToString() == "" || cre.Properties["classes"].ToString() == string.Empty) ? "" : "AND fp.classestype = '" + cre.Properties["classes"] .ToString()+ "'";
+			string GOODSID = (cre.Properties["GOODSID"] == null || cre.Properties["GOODSID"].ToString() == "" || cre.Properties["GOODSID"].ToString() == string.Empty) ? "" : "AND fd.goodsid = '"+ cre.Properties["GOODSID"] .ToString().Trim()+ "'";
+			string configtype= (cre.Properties["configtype"] == null || cre.Properties["configtype"].ToString() == "" || cre.Properties["configtype"].ToString() == string.Empty) ? "" :"AND fp.configtype = '"+ cre.Properties["configtype"] .ToString()+ "' ";
 			try
 			{
 				string strSql = " SELECT " +

+ 2 - 2
IBOSS.PRD/F_SYS_0202.cs

@@ -858,8 +858,8 @@ namespace Dongke.IBOSS.PRD.Client
 									//QC检验分析汇总表
 									this.ShowInDockPanel(F_RPT_080116.Instance);
 									break;
-                                // LSY 20240617 QC检验计划分析明细表
-                                case "070422":
+                                // LSY 20240617 QC检验计划分析明细表 
+                                case "070430":
                                     //QC检验分析汇总表
                                     this.ShowInDockPanel(F_RPT_080117.Instance);
                                     break;

+ 1 - 1
WCF.Service/WCF.Services/SystemModuleService.cs

@@ -2745,7 +2745,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                                 () => SystemModuleLogic.huizhong(SUserInfo, cre));
                         return result;
                     }else
-                    //QC检验计划分析明细汇总表
+                    //QC检验计划分析明细汇总表 
                     if ("mingxi" == cre.Name)
                     {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,