高压模具不判断是否报工

DK.Client/PCModule/F_PC_0103_1.cs

@@ -985,14 +985,18 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 					this.txtBarcode.Focus();
 					this.txtBarcode.SelectAll();
 					return;
-				} 
-				if (string.IsNullOrWhiteSpace(item["mouldPlan"].ToString()) || Convert.ToInt32(item["mouldPlan"].ToString()) == 0 )
+				}
+				if (!string.IsNullOrWhiteSpace(item["MouldTypeName"].ToString()) && item["MouldTypeName"].ToString() != "高压")
 				{
-					MessageBox.Show("此模具未报工，不能添加到成型线。", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
-					this.txtBarcode.Focus();
-					this.txtBarcode.SelectAll();
-					return;
+					if (string.IsNullOrWhiteSpace(item["mouldPlan"].ToString()) || Convert.ToInt32(item["mouldPlan"].ToString()) == 0)
+					{
+						MessageBox.Show("此模具未报工，不能添加到成型线。", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+						this.txtBarcode.Focus();
+						this.txtBarcode.SelectAll();
+						return;
+					}
 				}
+				
 				//DataRow r = dtInfo.NewRow();
 				//r["GroutingMouldCode"] = gMouldCode;
 				//r["MouldSource"] = "1";

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -9499,13 +9499,16 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                                             return actionResult;
                                         }
                                     }
-                                    if (string.IsNullOrWhiteSpace(sre.Data.Tables[0].Rows[0]["mouldPlan"].ToString()) || Convert.ToInt32(sre.Data.Tables[0].Rows[0]["mouldPlan"].ToString()) == 0)
+                                    if (!string.IsNullOrWhiteSpace(sre.Data.Tables[0].Rows[0]["MouldTypeName"].ToString()) && sre.Data.Tables[0].Rows[0]["MouldTypeName"].ToString() != "高压")
                                     { 
-                                        actionResult.Status = (int)Constant.PDAResult.Fail;
-                                        actionResult.Result = -3;
-                                        actionResult.Message =
-                                            "此模具未报工，不能添加到成型线";
-                                        return actionResult;
+                                        if (string.IsNullOrWhiteSpace(sre.Data.Tables[0].Rows[0]["mouldPlan"].ToString()) || Convert.ToInt32(sre.Data.Tables[0].Rows[0]["mouldPlan"].ToString()) == 0)
+                                        { 
+                                            actionResult.Status = (int)Constant.PDAResult.Fail;
+                                            actionResult.Result = -3;
+                                            actionResult.Message =
+                                                "此模具未报工，不能添加到成型线";
+                                            return actionResult;
+                                        }
                                     }
                                     actionResult.Status = (int)Constant.PDAResult.Success;
                                     actionResult.Result = JsonHelper.ToJson(sre.Data.Tables[0]);