修复撤销成型报损bug

DK.Service/PMModuleService/PMModuleLogic.cs

@@ -6406,7 +6406,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                         FROM
 	                        TP_PM_GROUTINGDAILYDETAIL 
                         WHERE
-	                        SCRAPFLAG = '0'
+	                        SCRAPFLAG = '1'
 	                        AND VALUEFLAG = '1'
 	                        AND BARCODE = :in_BarCode
                     ";
@@ -6439,17 +6439,16 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                                 "      ,BackOutUserID   = :in_BackOutUserID\n" +
                                 "      ,BackOutUserCode = :in_BackOutUserCode\n" +
                                 " WHERE SCRAPPRODUCTID = :in_ScrapProductID";
+                    paras = new OracleParameter[] {
+                                new OracleParameter(":in_ScrapProductID",OracleDbType.NVarchar2, returnTable.Rows[0]["SCRAPPRODUCTID"].ToString(), ParameterDirection.Input),
+                                new OracleParameter(":in_BackOutFlag",OracleDbType.Int32, Constant.INT_IS_ONE, ParameterDirection.Input),
+                                new OracleParameter(":in_BackOutTime",OracleDbType.Date, DateTime.Now, ParameterDirection.Input),
+                                new OracleParameter(":in_BackOutUserID",OracleDbType.Int32, userInfo.UserID, ParameterDirection.Input),
+                                new OracleParameter(":in_BackOutUserCode",OracleDbType.NVarchar2, userInfo.UserCode , ParameterDirection.Input),
+                    };
+                    returnRow += oracleTrConn.ExecuteNonQuery(sqlString, paras);
                 }
 
-                paras = new OracleParameter[] {
-                            new OracleParameter(":in_ScrapProductID",OracleDbType.NVarchar2, returnTable.Rows[0]["SCRAPPRODUCTID"].ToString(), ParameterDirection.Input),
-                            new OracleParameter(":in_BackOutFlag",OracleDbType.Int32, Constant.INT_IS_ONE, ParameterDirection.Input),
-                            new OracleParameter(":in_BackOutTime",OracleDbType.Date, DateTime.Now, ParameterDirection.Input),
-                            new OracleParameter(":in_BackOutUserID",OracleDbType.Int32, userInfo.UserID, ParameterDirection.Input),
-                            new OracleParameter(":in_BackOutUserCode",OracleDbType.NVarchar2, userInfo.UserCode , ParameterDirection.Input),
-                };
-                returnRow += oracleTrConn.ExecuteNonQuery(sqlString, paras);
-
                 sqlString = "UPDATE TP_PM_GroutingDailyDetail\n" +
                             "   SET ScrapFlag = :in_ScrapFlag\n" +
                             "      ,SReasonID = NULL\n" +