20260418 热处理

2026-04-18 16:48:37 +08:00
parent 01ba82ba06
commit bf76ee4136
17 changed files with 413 additions and 160 deletions
@@ -349,7 +349,24 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                        }
                    }
                }
-            }
+                if (!string.IsNullOrEmpty(weld.SteelType) && weld.SteelType == "FeⅢ无保护气体")
+                {
+                    if (!string.IsNullOrEmpty(this.hdUsingMan1.Text.Trim()))
+                    {
+                        var qualifiedProject = BLL.HJGL_WelderQualifiedProjectService.GetWelderQualifiedProjectByWedId(this.hdUsingMan1.Text.Trim());
+                        if (qualifiedProject.Count > 0)
+                        {
+                            //当材质类型为FeⅢ并且资质后面三个数中间的为11时可领用FeⅢ无保护气体焊丝
+                            qualifiedProject = qualifiedProject.Where(e => e.MaterialType.Contains("FeⅢ") && e.QualifiedProjectCode.Contains("/11/")).ToList();
+                            if (qualifiedProject.Count == 0)
+                            {
+                                Alert.ShowInTop("无FeⅢ无保护气体资质，不可领用！", MessageBoxIcon.Warning);
+                                return;
+                            }
+                        }
+                    }
+                }
+            }           

            Model.Weld_UsingPlan usingPlan = new Model.Weld_UsingPlan();
            usingPlan.UnitStoreId = this.drpUnitStore.SelectedValue;
@@ -578,13 +595,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
            {
                Alert.ShowInTop("请选择焊材库！", MessageBoxIcon.Warning);
                return;
-            }
-            if (string.IsNullOrEmpty(this.hdUsingMan1.Text.Trim()))
-            {
-                Alert.ShowInTop("请选择领料人！", MessageBoxIcon.Warning);
-                return;
-            }
-            string window = String.Format("ShowPlanWeld.aspx?projectId={0}&unitStoreId={1}&wed_Id={2}", drpProjectId.SelectedValue, this.drpUnitStore.SelectedValue, hdUsingMan1.Text.Trim(), "编辑 - ");
+            }           
+            string window = String.Format("ShowPlanWeld.aspx?projectId={0}&unitStoreId={1}", drpProjectId.SelectedValue, this.drpUnitStore.SelectedValue, "编辑 - ");
            PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdWeldId.ClientID) + Window1.GetShowReference(window));
        }