提交代码

2023-11-24 18:29:30 +08:00
parent 00db9731bf
commit 3aeb7e47de
12 changed files with 541 additions and 27 deletions
@@ -484,7 +484,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                        if (wpqList != null)
                        {
                            Model.HJGL_WeldJoint newJot = WeldJointService.GetWeldJointByWeldJointId(jot.WeldJointId);
-                            Model.WPQ_WPQList wps = BLL.WPQListServiceService.GetWPQById(wpqList.First().WPQId);
+                            Model.WPQ_WPQList wps = new Model.WPQ_WPQList();
+                            var a = wpqList.FirstOrDefault(x => x.WeldingMethodId == "feb1234c-a538-476f-99ac-7b3ab15997c1");  //优先匹配GTAW+SMAW的焊评
+                            if (a == null)
+                            {
+                                wps = BLL.WPQListServiceService.GetWPQById(wpqList.First().WPQId);
+                            }
+                            else
+                            {
+                                wps = BLL.WPQListServiceService.GetWPQById(a.WPQId);
+                            }

                            newJot.WPQId = wps.WPQId;
                            newJot.WeldJointId = jot.WeldJointId;