半检完成初始通过

DK.Basics/BaseResources/Constant.cs

@@ -631,7 +631,7 @@ namespace Dongke.IBOSS.PRD.Basics.BaseResources
             /// <summary>
             /// 10：丢失
             /// </summary>
-            LostGoods = 10,
+            LostGoods = 10
         }
 
         #endregion 系统表

DK.Client/PMModule/F_PM_3202.cs

@@ -1447,9 +1447,9 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                             break;
                         }
                     }
-                    if (Convert.ToInt32(this.TableProductionData.Rows[i]["GoodsLevelTypeID"]) != (int)Constant.GoodsLevelType.Quality) //正品
+                    if (Convert.ToInt32(this.TableProductionData.Rows[i]["GoodsLevelTypeID"]) != (int)Constant.GoodsLevelType.NoDefects) //良品 xuwei modify 2019-12-13
                     {
-                        // 不是正品
+                        // 不是良品
                         if (this.DSTable.Tables[productionDataEntity.Barcode].Rows.Count == Constant.INT_IS_ZERO)
                         {
                             isError = true;
@@ -1654,7 +1654,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                     else if (ErrorCount == -Constant.INT_IS_TWO)
                     {
                         // 提示信息
-                        MessageBox.Show(Messages.MSG_PM_W004,
+                        MessageBox.Show("非良品必须输入缺陷！",
                             this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
                         return;
                     }
@@ -1893,27 +1893,27 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                 }));
                 if (dsProductionDataByID != null && dsProductionDataByID.Tables[0].Rows.Count > Constant.INT_IS_ZERO)
                 {
-                    #region wangx 2016-10-10  校验是否可以成检登记改判
-                    if (_settingvaluedays > 0)
-                    {
-                        ServiceResultEntity resultEntity = (ServiceResultEntity)DoAsync(new BaseAsyncMethod(() =>
-                        {
-                            return PMModuleProxy.Service.BarcodeAllowCancel(
-                                Convert.ToDateTime(dsProductionDataByID.Tables[0].Rows[0]["createtime"]),
-                                _settingvaluedays, Constant.SettingType.S_PM_009.ToString());
-                        }));
-                        if (Convert.ToInt32(resultEntity.Result) < 0)
-                        {
-                            MessageBox.Show(resultEntity.Message,
-                                       this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                            this.txtBarCode.Text = "";
-                            this.btnSave.Visible = false;
-                        }
-                    }
+                    #region wangx 2016-10-10  校验是否可以成检登记改判 xuwei modify 2019-12-13 半检中取消判定
+                    //if (_settingvaluedays > 0)
+                    //{
+                    //    ServiceResultEntity resultEntity = (ServiceResultEntity)DoAsync(new BaseAsyncMethod(() =>
+                    //    {
+                    //        return PMModuleProxy.Service.BarcodeAllowCancel(
+                    //            Convert.ToDateTime(dsProductionDataByID.Tables[0].Rows[0]["createtime"]),
+                    //            _settingvaluedays, Constant.SettingType.S_PM_009.ToString());
+                    //    }));
+                    //    if (Convert.ToInt32(resultEntity.Result) < 0)
+                    //    {
+                    //        MessageBox.Show(resultEntity.Message,
+                    //                   this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    //        this.txtBarCode.Text = "";
+                    //        this.btnSave.Visible = false;
+                    //    }
+                    //}
                     #endregion  wangx 2016-10-10  end
 
-                    #region 如果是次品，回收后不允许编辑
-                    if (Convert.ToInt32(dsProductionDataByID.Tables[0].Rows[0]["GoodsLevelTypeID"]) == 7)//次品
+                    #region 如果是废品，不允许编辑 xuwei modify 2019-12-13
+                    if (Convert.ToInt32(dsProductionDataByID.Tables[0].Rows[0]["GoodsLevelTypeID"]) == 3)//废品
                     {
                         int recyclingflag = (int)DoAsync(new BaseAsyncMethod(() =>
                         {
@@ -1935,7 +1935,6 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                         return PMModuleProxy.Service.GetSpecialRepairflagByBarcode(dsProductionDataByID.Tables[0].Rows[0]["BarCode"].ToString());
                     }));
 
-
                     // 产品数据
                     DataRow drNew = TableProductionData.NewRow();
                     drNew["ProductionDataID"] = this._productiondataid;
@@ -2269,7 +2268,8 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                             {
                                 DataTable dt = this._dsGoodsLevel.Tables[0].Copy();
                                 DataView dv = dt.DefaultView;
-                                dv.RowFilter = "GoodsLevelTypeID>=" + goodsLevelTypeID;
+                                //xuwei modify 2019-12-13 不限制 产品分级
+                                //dv.RowFilter = "GoodsLevelTypeID>=" + goodsLevelTypeID;
                                 DataGridViewComboBoxCell dgcbc = (DataGridViewComboBoxCell)dgvProductionData.Rows[i].Cells[3];
                                 //xuwei modify 2019-12-12
                                 //dgcbc.DisplayMember = "DefectFlagName";
@@ -2795,7 +2795,8 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                 this.dgvProductionData.Rows[this.dgvProductionData.CurrentCell.RowIndex].Cells["ReworkProcedureID"].Value = DBNull.Value;
                 this.dgvProductionData.Rows[this.dgvProductionData.CurrentCell.RowIndex].Cells["ReworkProcedureCode"].Value = string.Empty;
                 this.dgvProductionData.Rows[this.dgvProductionData.CurrentCell.RowIndex].Cells["ReworkProcedureName"].Value = string.Empty;
-                if (GoodsLevelTypeID == (int)Constant.GoodsLevelType.Quality) //正品
+                //xuwei modify 2019-12-13
+                if (GoodsLevelTypeID == (int)Constant.GoodsLevelType.NoDefects) //良品
                 {
                     this.dgvProductionData.Rows[this.dgvProductionData.CurrentCell.RowIndex].Cells["ReworkProcedureID"].ReadOnly = true;
                     try
@@ -2813,7 +2814,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                         throw ex;
                     }
                 }
-                else if (GoodsLevelTypeID == (int)Constant.GoodsLevelType.Quality) //次品 或者正品
+                else if (GoodsLevelTypeID == (int)Constant.GoodsLevelType.NoDefects) //次品 或者正品
                 {
                     this.dgvProductionData.Rows[this.dgvProductionData.CurrentCell.RowIndex].Cells["ReworkProcedureID"].ReadOnly = true;
                 }

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

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

WCF.Service/WCF.WebHosting/Properties/PublishProfiles/xuwei-mes.pubxml

@@ -12,7 +12,7 @@
     <SiteUrlToLaunchAfterPublish />
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <ExcludeApp_Data>False</ExcludeApp_Data>
-    <publishUrl>\\192.168.0.237\d$\xuwell\mes.xuwell.cn\wwwroot</publishUrl>
+    <publishUrl>\\192.168.0.237\e$\xuwell\mes.xuwell.cn\wwwroot</publishUrl>
     <DeleteExistingFiles>False</DeleteExistingFiles>
   </PropertyGroup>
 </Project>