1

DK.Service/PMModuleLogic/PMModuleLogicPartial.cs

@@ -1886,61 +1886,83 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 
 							ds = oracleConn.GetSqlResultToDs(sqlString, paras);
 
-							string sqlString2 = @"SELECT pi.isrefire,pi.kilncarbatchno FROM tp_pm_inproduction pi
-                                    where pi.Barcode= :barcode";
-
+							// 取最新的窑炉批次号
+							string sqlString2 = @"
+							SELECT KILNCARBATCHNO
+							  FROM TP_PM_PRODUCTIONDATA
+							 WHERE KILNCARBATCHNO IS NOT NULL
+							   AND BARCODE = :barcode
+							 ORDER BY CREATETIME DESC";
 							
-							DataTable dtIsRefire = oracleConn.GetSqlResultToDt(sqlString2, paras);
-
-							if (dtIsRefire.Rows.Count == 0)
-							{
-								sqlString2 = @"SELECT pi.isrefire,pi.kilncarbatchno FROM TP_PM_SCRAPPRODUCT pi
-                                    where pi.Barcode= :barcode";
-
-								dtIsRefire = oracleConn.GetSqlResultToDt(sqlString2, paras);
-							}
-
-							string isrefire = "0";
-							if (dtIsRefire.Rows.Count > 0)
-                            {
-								isrefire = dtIsRefire.Rows[0]["isrefire"] + "";
-							}
-
-							DataSet dataTable = new DataSet();
-							if (isrefire.Equals("0"))
+							object kilncarbatchno = oracleConn.GetSqlResultToObj(sqlString2, paras);
+
+							// 取当前批次号下最新的检验类型的生产数据
+							sqlString2 = @"
+							SELECT PI.*
+							  FROM TP_PM_PRODUCTIONDATAIN PI
+							 WHERE PI.MODELTYPE IN (-1, -4, -5)
+							   AND PI.VALUEFLAG = '1'
+							   AND PI.ISREFIRE = '6'
+							   AND PI.BARCODE = :BARCODE
+							   AND PI.KILNCARBATCHNO = :KILNCARBATCHNO
+							 ORDER BY PI.CREATETIME DESC ";
+
+							paras = new OracleParameter[]
 							{
-								sqlString2 = @"SELECT pi.* FROM TP_PM_ProductionDataIn pi
-                                    where pi.Barcode= :barcode
-                                    and pi.MODELTYPE IN (-1, -4, -5)
-                                    and pi.ValueFlag = '1'
-                                    and pi.isrefire = '0' 
-                                    order by pi.CREATETIME desc";
-
-								paras = new OracleParameter[]{
-									new OracleParameter(":barcode",barcode),
-								};
-
-								dataTable = oracleConn.GetSqlResultToDs(sqlString2, paras);
-							}
-							else
-							{
-								string kilncarbatchno = dtIsRefire.Rows[0]["kilncarbatchno"] + "";
-
-								sqlString2 = @"SELECT pi.* FROM TP_PM_ProductionDataIn pi
-                                    where pi.Barcode= :barcode
-                                    and pi.kilncarbatchno= :kilncarbatchno
-                                    and pi.MODELTYPE IN (-1, -4, -5)
-                                    and pi.ValueFlag = '1'
-                                    and pi.isrefire = '6' 
-                                    order by pi.CREATETIME desc";
-
-								paras = new OracleParameter[]{
-									new OracleParameter(":barcode", barcode),
-									new OracleParameter(":kilncarbatchno", kilncarbatchno),
-								};
-
-								dataTable = oracleConn.GetSqlResultToDs(sqlString2, paras);
-							}
+								new OracleParameter(":BARCODE", barcode),
+								new OracleParameter(":KILNCARBATCHNO", kilncarbatchno),
+							};
+							DataSet dataTable = oracleConn.GetSqlResultToDs(sqlString2, paras);
+
+							//if (dtIsRefire.Rows.Count == 0)
+							//{
+							//	sqlString2 = @"SELECT pi.isrefire,pi.kilncarbatchno FROM TP_PM_SCRAPPRODUCT pi
+       //                             where pi.Barcode= :barcode";
+
+							//	dtIsRefire = oracleConn.GetSqlResultToDt(sqlString2, paras);
+							//}
+
+							//string isrefire = "0";
+							//if (dtIsRefire.Rows.Count > 0)
+       //                     {
+							//	isrefire = dtIsRefire.Rows[0]["isrefire"] + "";
+							//}
+
+							//DataSet dataTable = new DataSet();
+							//if (isrefire.Equals("0"))
+							//{
+							//	sqlString2 = @"SELECT pi.* FROM TP_PM_ProductionDataIn pi
+       //                             where pi.Barcode= :barcode
+       //                             and pi.MODELTYPE IN (-1, -4, -5)
+       //                             and pi.ValueFlag = '1'
+       //                             and pi.isrefire = '0' 
+       //                             order by pi.CREATETIME desc";
+
+							//	paras = new OracleParameter[]{
+							//		new OracleParameter(":barcode",barcode),
+							//	};
+
+							//	dataTable = oracleConn.GetSqlResultToDs(sqlString2, paras);
+							//}
+							//else
+							//{
+							//	string kilncarbatchno = dtIsRefire.Rows[0]["kilncarbatchno"] + "";
+
+							//	sqlString2 = @"SELECT pi.* FROM TP_PM_ProductionDataIn pi
+       //                             where pi.Barcode= :barcode
+       //                             and pi.kilncarbatchno= :kilncarbatchno
+       //                             and pi.MODELTYPE IN (-1, -4, -5)
+       //                             and pi.ValueFlag = '1'
+       //                             and pi.isrefire = '6' 
+       //                             order by pi.CREATETIME desc";
+
+							//	paras = new OracleParameter[]{
+							//		new OracleParameter(":barcode", barcode),
+							//		new OracleParameter(":kilncarbatchno", kilncarbatchno),
+							//	};
+
+							//	dataTable = oracleConn.GetSqlResultToDs(sqlString2, paras);
+							//}
 
 							
 							//缺陷