质量登记产品分级为正品或者副品时 直接走完结束工序

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -6553,7 +6553,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 #region 成品检验
                 else if (procedure.ModelType == (int)Constant.ProcedureModelType.QualityStatistics)
                 {
-                    errMsg = AddFinishCheckPDA(oracleTrConn, procedure, productionDataEntitys, sUserInfo);
+                    errMsg = AddFinishCheckPDA(oracleTrConn, procedure, productionDataEntitys, sUserInfo);            
                 }
                 #endregion
                 #region 半检 与成检相同处理 xuwei add 2019-12-12 
@@ -6573,6 +6573,24 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 {
                     oracleTrConn.Commit();
                 }
+                if (procedure.ModelType == (int)Constant.ProcedureModelType.QualityStatistics)
+                {
+                    #region 2023/02/20 质量登记产品分级为正品或者副品时 直接走完结束工序
+                    DataTable dtProductionData = DataConvert.ObjectConvertToTable<ProductionDataEntity>(productionDataEntitys);
+                    if (!dtProductionData.Columns.Contains("IsPDA"))
+                    {
+                        dtProductionData.Columns.Add("IsPDA");
+                    }
+                    foreach (ProductionDataEntity productionData in productionDataEntitys)
+                    {
+                        if (productionData.GoodsLevelTypeID == 4 || productionData.GoodsLevelTypeID == 5)
+                        {
+                            ProcedureEntity procedureInfo = null;
+                            DataTable dt = AddWorkPiece(15, dtProductionData, sUserInfo, out procedureInfo);
+                        }
+                    }
+                    #endregion
+                }
             }
             catch (Exception ex)
             {
@@ -10100,6 +10118,24 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 {
                     oracleTrConn.Commit();
                 }
+                if (procedure.ModelType == (int)Constant.ProcedureModelType.QualityStatistics)
+                {
+                    #region 2023/02/20 质量登记产品分级为正品或者副品时 直接走完结束工序
+                    DataTable dtProductionData = DataConvert.ObjectConvertToTable<ProductionDataEntity>(productionDataEntitys);
+                    if (!dtProductionData.Columns.Contains("IsPDA"))
+                    {
+                        dtProductionData.Columns.Add("IsPDA");
+                    }
+                    foreach (ProductionDataEntity productionData in productionDataEntitys)
+                    {
+                        if (productionData.GoodsLevelTypeID == 4 || productionData.GoodsLevelTypeID == 5)
+                        {
+                            ProcedureEntity procedureInfo = null;
+                            DataTable dt = AddWorkPiece(15, dtProductionData, sUserInfo, out procedureInfo);
+                        }
+                    }
+                    #endregion
+                }
             }
             catch (Exception ex)
             {

DK.Service/PMModuleLogic/PMModuleLogicPartial.cs

@@ -3006,16 +3006,13 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 					new OracleParameter("out_errMsg_Status",OracleDbType.Varchar2,50,"",ParameterDirection.Output),
 				};
 				oracleConn.ExecStoredProcedure("PRO_PM_CheckBarcode", paras);
-
 				dr[Constant.BarCodeResultTableColumns.out_errMsg.ToString()]
 					= paras[2].Value.ToString() == "null" ? "" : paras[2].Value.ToString().Replace("\\n\\r", "\n\r");
-
 				int missFlag = 0;
 				if (paras[7].Value != null && paras[7].Value.ToString() == "1")
 				{
 					missFlag = AddBarCodeMissing(oracleConn, barcode, procedureID, sUserInfo);
 				}
-
 				dr[Constant.BarCodeResultTableColumns.out_goodsID.ToString()] = paras[3].Value.ToString() == "null" ? 0 : paras[3].Value;
 				dr[Constant.BarCodeResultTableColumns.out_goodsCode.ToString()] = paras[4].Value.ToString() == "null" ? "" : paras[4].Value;
 				dr[Constant.BarCodeResultTableColumns.out_goodsName.ToString()] = paras[5].Value.ToString() == "null" ? "" : paras[5].Value;