回收后等级回正

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -27009,6 +27009,11 @@ updateuserid=:updateuserid where barcode=:barcode";
                     #endregion 属性赋值
                     productionData.SpecialRepairflag = 0;
                     string OutSpecialRepairflag = "0";// 没有什么特殊的，同干补保存生产数据共用同一个方法
+
+                    // 回收等级回正
+                    productionData.GoodsLevelTypeID = 4;
+                    productionData.GoodsLevelID = 4;
+
                     errMsg = AddDryRepairProductionData(oracleTrConn, accountDate, productionData, sUserInfo, out OutSpecialRepairflag);
                     if (!string.IsNullOrEmpty(errMsg))
                     {
@@ -27256,21 +27261,35 @@ updateuserid=:updateuserid where barcode=:barcode";
                     #endregion 数据处理
 
                     #region 二级品回收
-                    if (procedure.ProcedureName.Contains("二级品回收"))
-                    {
-                        string sqlUpdateGdd = @"
-                        UPDATE TP_PM_GROUTINGDAILYDETAIL
-                           SET SECONDRECOVERYFLAG = '1',
-                               UPDATEUSERID       = :UPDATEUSERID
-                         WHERE BARCODE = :BARCODE ";
+                    //if (procedure.ProcedureName.Contains("二级品回收"))
+                    //{
+                    //    string sqlUpdateGdd = @"
+                    //    UPDATE TP_PM_GROUTINGDAILYDETAIL
+                    //       SET SECONDRECOVERYFLAG = '1',
+                    //           UPDATEUSERID       = :UPDATEUSERID
+                    //     WHERE BARCODE = :BARCODE ";
 
-                        OracleParameter[] paras = new OracleParameter[]
-                        {
-                            new OracleParameter(":UPDATEUSERID", OracleDbType.Int32, workUserID,ParameterDirection.Input),
-                            new OracleParameter(":BARCODE", OracleDbType.Varchar2, barcode,ParameterDirection.Input)
-                        };
-                        oracleTrConn.ExecuteNonQuery(sqlUpdateGdd, paras);
-                    }
+                    //    OracleParameter[] paras = new OracleParameter[]
+                    //    {
+                    //        new OracleParameter(":UPDATEUSERID", OracleDbType.Int32, workUserID,ParameterDirection.Input),
+                    //        new OracleParameter(":BARCODE", OracleDbType.Varchar2, barcode,ParameterDirection.Input)
+                    //    };
+                    //    oracleTrConn.ExecuteNonQuery(sqlUpdateGdd, paras);
+                    //}
+                    #endregion
+
+                    #region 回收后等级回正
+                    string sqlUpdateGoodsLevel = @"
+                    UPDATE TP_PM_INPRODUCTION
+                        SET GOODSLEVELID = 4,
+                            GOODSLEVELTYPEID = 4
+                        WHERE BARCODE = :BARCODE";
+
+                    OracleParameter[] parasUpdateGoodsLevel = new OracleParameter[]
+                    {
+                        new OracleParameter(":BARCODE", OracleDbType.Varchar2, barcode, ParameterDirection.Input),
+                    };
+                    oracleTrConn.ExecuteNonQuery(sqlUpdateGoodsLevel, parasUpdateGoodsLevel); 
                     #endregion
                 }
                 logoName = logoName_Temp;

DK.Service/PMModuleLogic/PMModuleLogicPartial.cs

@@ -1975,11 +1975,11 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 								dr["DefectFlagID"] = Convert.ToInt32(dataTable.Tables[0].Rows[0]["goodsleveltypeid"]);
 								pdid = Convert.ToInt32(dataTable.Tables[0].Rows[0]["PRODUCTIONDATAID"]);
 
-								// 判断当前条码在最近一次检验后，是否走过冷补
+								// 判断当前条码在最近一次检验后，是否走过冷补或回收
 								string sqlCheckLengBu = @"
 								SELECT 1
 								  FROM TP_PM_PRODUCTIONDATA P
-								 WHERE P.PROCEDUREID = 135
+								 WHERE P.PROCEDUREID IN (135, 80)
 								   AND P.BARCODE = :BARCODE
 								   AND P.PRODUCTIONDATAID > :PID ";