半检初测通过缺少细节判定

DK.Client/PMModule/F_PM_3202.cs

@@ -1404,8 +1404,11 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                     productionDataEntity.UserID = UserID;// Convert.ToInt32(this.TableProductionData.Rows[i]["UserID"]);
                     productionDataEntity.UserCode = UserCode;// this.TableProductionData.Rows[i]["UserCode"].ToString();
                     productionDataEntity.UserName = UserName;// this.TableProductionData.Rows[i]["UserName"].ToString(); ;
-                    productionDataEntity.DefectFlag = Convert.ToInt32(this.TableProductionData.Rows[i]["GoodsLevelTypeID"]) == 4 ? 1 : 2;
+                    //1没缺陷 2有缺陷
+                    productionDataEntity.DefectFlag = Convert.ToInt32(this.TableProductionData.Rows[i]["GoodsLevelTypeID"]) == 1 ? 1 : 2;
+                    //xuwei modify 2019-12-12
                     productionDataEntity.GoodsLevelID = Convert.ToInt32(this.TableProductionData.Rows[i]["DefectFlagID"]);
+
                     productionDataEntity.GoodsLevelTypeID = Convert.ToInt32(this.TableProductionData.Rows[i]["GoodsLevelTypeID"]);
                     productionDataEntity.Remarks = this.TableProductionData.Rows[i]["Remarks"].ToString();
                     if (this.TableProductionData.Rows[i]["LogoID"].ToString() != "")
@@ -2778,7 +2781,10 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 
             DataTable dtDefectFlag = this.DefectFlag.DataSource as DataTable;//获取缺陷数据源
             int GoodsLevelTypeID = -1;
-            DataRow[] dr = dtDefectFlag.Select("DefectFlagID=" + GoodsLevelID);
+            //xuwei modify 2019-12-12
+            //DataRow[] dr = dtDefectFlag.Select("DefectFlagID=" + GoodsLevelID);
+            DataRow[] dr = dtDefectFlag.Select("GoodsLevelID=" + GoodsLevelID);
+
             if (dr.Length > Constant.INT_IS_ZERO)
             {
                 GoodsLevelTypeID = Convert.ToInt32(dr[0]["GoodsLevelTypeID"]);

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -6480,6 +6480,12 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                     errMsg = AddFinishCheckPDA(oracleTrConn, procedure, productionDataEntitys, sUserInfo);
                 }
                 #endregion
+                #region 半检 xuwei add 2019-12-12
+                else if (procedure.ModelType == (int)Constant.ProcedureModelType.SemiQualityStatistics)
+                {
+                    errMsg = AddFinishCheckPDA(oracleTrConn, procedure, productionDataEntitys, sUserInfo);
+                }
+                #endregion
                 #region 入窑前检验
                 else if (procedure.ModelType == (int)Constant.ProcedureModelType.IntoKilnCheck)
                 {