PDACheckTime 不属于表

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -4419,14 +4419,25 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 {
                     if (ds.Tables[0].Rows[0]["KilnID"].ToString() != "") //表示以前有过窑炉相关信息
                     {
-                        productionData.KilnID = Convert.ToInt32(ds.Tables[0].Rows[0]["KilnID"]);
-                        productionData.KilnCode = ds.Tables[0].Rows[0]["KilnCode"].ToString();
-                        productionData.KilnName = ds.Tables[0].Rows[0]["KilnName"].ToString();
-                        productionData.KilnCarID = Convert.ToInt32(ds.Tables[0].Rows[0]["KilnCarID"]);
-                        productionData.KilnCarCode = ds.Tables[0].Rows[0]["KilnCarCode"].ToString();
-                        productionData.KilnCarName = ds.Tables[0].Rows[0]["KilnCarName"].ToString();
-                        productionData.KilnCarBatchNo = ds.Tables[0].Rows[0]["KilnCarBatchNo"].ToString();
-                        productionData.KilnCarPosition = Convert.ToInt32(ds.Tables[0].Rows[0]["KilnCarPosition"]);
+                        // 20251201 修正
+                        if (!String.IsNullOrEmpty(ds.Tables[0].Rows[0]["KilnID"] + ""))
+                        {
+                            productionData.KilnID = Convert.ToInt32(ds.Tables[0].Rows[0]["KilnID"]);
+                        }                        
+                        productionData.KilnCode = ds.Tables[0].Rows[0]["KilnCode"]+ "";
+                        productionData.KilnName = ds.Tables[0].Rows[0]["KilnName"] + "";                        
+                        if (!String.IsNullOrEmpty(ds.Tables[0].Rows[0]["KilnCarID"] + "" ))
+                        {
+                            productionData.KilnCarID = Convert.ToInt32(ds.Tables[0].Rows[0]["KilnCarID"]);
+                        }
+                        productionData.KilnCarCode = ds.Tables[0].Rows[0]["KilnCarCode"] + "";
+                        productionData.KilnCarName = ds.Tables[0].Rows[0]["KilnCarName"] + "";
+                        productionData.KilnCarBatchNo = ds.Tables[0].Rows[0]["KilnCarBatchNo"] + "";
+                        if (!String.IsNullOrEmpty(ds.Tables[0].Rows[0]["KilnCarPosition"] + ""))
+                        {
+                            productionData.KilnCarPosition = Convert.ToInt32(ds.Tables[0].Rows[0]["KilnCarPosition"]);
+                        }
+                        
                     }
                 }
             }
@@ -13985,7 +13996,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                     productionData.UserCode = barcodeRow["UserCode"].ToString();
                     productionData.UserName = barcodeRow["UserName"].ToString();
                     // 250930 复检的 所有的 包装入仓 的checktime 和 首检的一致
-                    if (procedure.ProcedureID == 15 && !string.IsNullOrEmpty(barcodeRow["PDACheckTime"].ToString())  )
+                    if (procedure.ProcedureID == 15 && barcodeTable.Columns.Contains("PDACheckTime") && !string.IsNullOrEmpty(barcodeRow["PDACheckTime"].ToString())  )
                     { 
                         productionData.CheckTime = Convert.ToDateTime(barcodeRow["PDACheckTime"].ToString());
                     }