1

2025-12-15 11:04:54 +08:00
parent 0e3dd2a750
commit 3a0c06a638
12 changed files with 126 additions and 27 deletions
@@ -338,6 +338,26 @@ namespace FineUIPro.Web.HJGL.WeldingManage
        /// <param name="e"></param>
        protected void btnSave_Click(object sender, EventArgs e)
        {
+            #region 焊丝焊条牌号不能为空
+            JArray mergedData = Grid1.GetMergedData();
+            foreach (JObject mergedRow in mergedData)
+            {
+                string status = mergedRow.Value<string>("status");
+                JObject values = mergedRow.Value<JObject>("values");
+                var weldMat = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
+                if (weldMat == null)
+                {
+                    ShowNotify("焊条牌号不能为空！", MessageBoxIcon.Warning);
+                    return;
+                }
+                var weldSilk = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault();
+                if (weldSilk == null)
+                {
+                    ShowNotify("焊丝牌号不能为空！", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+            #endregion
            string eventArg = string.Empty;
            List<Model.HJGL_SpRpWeldReportItem> GetWeldReportItem = this.CollectGridJointInfo();
            bool isAllD = true;   //不合格口是否全为D类口（即焊口号包含D的焊口）