本烧和重烧可能一起走成检交接节点，需要挨个识别

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -63,20 +63,20 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
             oracleTrConn.IgnoreCase = false;
             try
             {
-                //xuwei add 2022-05-23 自动识别 成检交接 9 重烧成检交接 15
-                if(procedureID == 9 || procedureID == 15)
-                {
-                    string result = oracleTrConn.GetSqlResultToObj(@"
-                        SELECT T.ISREFIRE
-                        FROM   TP_PM_INPRODUCTION T
-                        WHERE  T.BARCODE = :BARCODE
-                    ", 
-                        new OracleParameter[] {
-                            new OracleParameter(":BARCODE",barcodeTable.Rows[0]["Barcode"].ToString()),
-                        }
-                     ).ToString();
-                    if (result == "6") procedureID = 15; else procedureID = 9;
-                }
+                //xuwei add 2022-05-23 自动识别 成检交接 9 重烧成检交接 15 （挪到AddNormalWorkPiece中 G:628）
+                //if(procedureID == 9 || procedureID == 15)
+                //{
+                //    string result = oracleTrConn.GetSqlResultToObj(@"
+                //        SELECT T.ISREFIRE
+                //        FROM   TP_PM_INPRODUCTION T
+                //        WHERE  T.BARCODE = :BARCODE
+                //    ", 
+                //        new OracleParameter[] {
+                //            new OracleParameter(":BARCODE",barcodeTable.Rows[0]["Barcode"].ToString()),
+                //        }
+                //     ).ToString();
+                //    if (result == "6") procedureID = 15; else procedureID = 9;
+                //}
                 //xuwei end 
 
                 DataSet dsReturnSinglePoint = null;
@@ -624,6 +624,28 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                     {
                         throw new Exception("传入的条码号为空");
                     }
+
+                    //fubin add 2022-05-27 自动识别 成检交接 9 重烧成检交接 15 
+                    //本烧和重烧可能一起走成检交接节点，需要挨个识别
+                    int tempProcedureID = procedure.ProcedureID;
+                    if (tempProcedureID == 9 || tempProcedureID == 15)
+                    {
+                        string result = oracleTrConn.GetSqlResultToObj(@"
+                            SELECT T.ISREFIRE
+                            FROM   TP_PM_INPRODUCTION T
+                            WHERE  T.BARCODE = :BARCODE ",
+                            new OracleParameter[] {
+                            new OracleParameter(":BARCODE", barcode),
+                        }).ToString();
+                        if (result == "6") tempProcedureID = 15; else tempProcedureID = 9;
+                    }
+                    // 如果目标工序变了，替换掉目标工序
+                    if (tempProcedureID != procedure.ProcedureID)
+                    {
+                        procedure = GetProcedurByID(oracleTrConn, tempProcedureID);
+                    }
+                    //fubin end 
+
                     // 生产工号
                     int workUserID = Convert.ToInt32(barcodeRow["UserID"]);
                     // 生产工号