修改废弃产品记录UpdateScrapProduct方法

DK.Service/PDAModuleLogic/PDAModuleLogic.cs

@@ -2337,20 +2337,24 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 }
                 else
                 {
-                    object result = DBNull.Value;
-                    string strSql1 = "select FUN_CMN_GetAccountDate(:accountId) From DUAL";
-                    Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
-                    {
-                        new Oracle.ManagedDataAccess.Client.OracleParameter(":accountId",userInfo.AccountID)
-                    };
-                    object strResult = oracleTrConn.GetSqlResultToObj(strSql1, paras1);
-                    if (strResult == null || strResult == DBNull.Value)
-                    {
-                        // 服务器时间错误
-                        throw new Exception("SystemDateTimeError");
-                    }
-                    result = Convert.ToDateTime(strResult);
-                    sbSql.Append(string.Format(" ,AuditDate=to_date('{0}','yyyy-mm-dd hh24:mi:ss'),Auditor={1}", result.ToString().Replace("/", "-"), userInfo.UserID));
+                    //2021年12月6日10:58:08 by fy modify 取系统时间
+
+                    //object result = DBNull.Value;
+                    //string strSql1 = "select FUN_CMN_GetAccountDate(:accountId) From DUAL";
+                    //Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
+                    //{
+                    //    new Oracle.ManagedDataAccess.Client.OracleParameter(":accountId",userInfo.AccountID)
+                    //};
+                    //object strResult = oracleTrConn.GetSqlResultToObj(strSql1, paras1);
+                    //if (strResult == null || strResult == DBNull.Value)
+                    //{
+                    //    // 服务器时间错误
+                    //    throw new Exception("SystemDateTimeError");
+                    //}
+                    //result = Convert.ToDateTime(strResult);
+                    //sbSql.Append(string.Format(" ,AuditDate=to_date('{0}','yyyy-mm-dd hh24:mi:ss'),Auditor={1}", result.ToString().Replace("/", "-"), userInfo.UserID));
+
+                    sbSql.Append(string.Format(" ,AuditDate=sysdate,Auditor={0},accountdate=trunc(sysdate)", userInfo.UserID));
                 }
                 sbSql.Append(" where ScrapProductID=:ScrapProductID");
                 OracleParameter[] Paras = new OracleParameter[] {

DK.Service/PMModuleLogic/PMModuleLogicDALPartial.cs

@@ -1887,20 +1887,23 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 				}
 				else
 				{
-					object result = DBNull.Value;
-					string strSql1 = "select FUN_CMN_GetAccountDate(:accountId) From DUAL";
-					Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
-					{
-						new Oracle.ManagedDataAccess.Client.OracleParameter(":accountId",userInfo.AccountID)
-					};
-					object strResult = oracleTrConn.GetSqlResultToObj(strSql1, paras1);
-					if (strResult == null || strResult == DBNull.Value)
-					{
-						// 服务器时间错误
-						throw new Exception("SystemDateTimeError");
-					}
-					result = Convert.ToDateTime(strResult);
-					sbSql.Append(string.Format(" ,AuditDate=to_date('{0}','yyyy-mm-dd hh24:mi:ss'),Auditor={1}", result.ToString().Replace("/", "-"), userInfo.UserID));
+					//2021年12月6日10:58:08 by fy modify 取系统时间
+
+					//object result = DBNull.Value;
+					//string strSql1 = "select FUN_CMN_GetAccountDate(:accountId) From DUAL";
+					//Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
+					//{
+					//	new Oracle.ManagedDataAccess.Client.OracleParameter(":accountId",userInfo.AccountID)
+					//};
+					//object strResult = oracleTrConn.GetSqlResultToObj(strSql1, paras1);
+					//if (strResult == null || strResult == DBNull.Value)
+					//{
+					//	// 服务器时间错误
+					//	throw new Exception("SystemDateTimeError");
+					//}
+					//result = Convert.ToDateTime(strResult);
+					//sbSql.Append(string.Format(" ,AuditDate=to_date('{0}','yyyy-mm-dd hh24:mi:ss'),Auditor={1}", result.ToString().Replace("/", "-"), userInfo.UserID));
+					sbSql.Append(string.Format(" ,AuditDate=sysdate,Auditor={0},AccountDate=trunc(sysdate)", userInfo.UserID));
 				}
 
 				sbSql.Append(" where ScrapProductID=:ScrapProductID");
@@ -2366,8 +2369,9 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 				sbSql.Append(" set AuditStatus=:AuditStatus,");
 				sbSql.Append(" Auditor=:Auditor,");
 				//sbSql.Append(" AuditDate=to_date(:AuditDate,'yyyy-MM-dd'),");
-                sbSql.Append(" AuditDate=:AuditDate,");
-                sbSql.Append(" AuditOpinion=:AuditOpinion,");
+				//sbSql.Append(" AuditDate=:AuditDate,");
+				sbSql.Append(" AuditDate=sysdate,");
+				sbSql.Append(" AuditOpinion=:AuditOpinion,");
 				sbSql.Append(" UpdateUserID=:UpdateUserID");
 				sbSql.Append(" where ScrapProductID=:ScrapProductID and OPTimeStamp=:OPTimeStamp");
 				OracleParameter[] RPParas = new OracleParameter[] {
@@ -2377,9 +2381,12 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 							spEntity.Auditor,ParameterDirection.Input),
 							//new OracleParameter(":AuditDate",OracleDbType.NVarchar2,
 							//Convert.ToDateTime(spEntity.AuditlDate).ToString("yyyy-MM-dd"),ParameterDirection.Input),
-                            new OracleParameter(":AuditDate",OracleDbType.Date,
-                            spEntity.AuditlDate,ParameterDirection.Input),
-                            new OracleParameter(":AuditOpinion",OracleDbType.NVarchar2,
+
+							//2021年12月6日10:45:35 by fy modify将审核时间修改为系统当前时间
+                            /*new OracleParameter(":AuditDate",OracleDbType.Date,
+                            spEntity.AuditlDate,ParameterDirection.Input),*/
+
+							new OracleParameter(":AuditOpinion",OracleDbType.NVarchar2,
 							spEntity.AuditOpinion,ParameterDirection.Input),
 							new OracleParameter(":UpdateUserID",OracleDbType.NVarchar2,
 							userInfo.UserID,ParameterDirection.Input),