提交代码

2023-11-29 18:02:03 +08:00
parent a8799ec7bb
commit d7ae172c39
17 changed files with 1188 additions and 14 deletions
@@ -876,7 +876,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
            {
                SaveData(false);
            }
-            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/WeldJoint&menuId={1}", WeldJointId, BLL.Const.HJGL_WeldJointMenuId)));
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/WeldJoint&menuId={1}", WeldJointId, BLL.Const.HJGL_JotTwoDesignMenuId)));
        }
    }
 }
@@ -231,7 +231,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
            {
                var weldJointIds = (from x in list
                                    where x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
-                           && x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/
+                           && x.WeldingDailyId == null 
                                    select x).ToList();
                weldJointIds = weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.OrderByDescending(x => x.TaskDate).First()).ToList();
                task = weldJointIds;