diff --git a/插件库/Lskj.Control/Model/MyControl.cs b/插件库/Lskj.Control/Model/MyControl.cs index 33166cf..caf3b9f 100644 --- a/插件库/Lskj.Control/Model/MyControl.cs +++ b/插件库/Lskj.Control/Model/MyControl.cs @@ -3012,6 +3012,7 @@ namespace Lskj.Control.Model if (!isUpload) { MessageUtil.Show($"自动上传失败\r\n{rtnMsg}"); + return false; } else { @@ -3022,6 +3023,7 @@ namespace Lskj.Control.Model else { MessageUtil.Show($"登录失败,自动上传失败"); + return false; } } } @@ -4578,7 +4580,7 @@ namespace Lskj.Control.Model ControlModel productidmodle = this.ControlModels.Where(n => n.LabelText.Equals("物料编码")).FirstOrDefault(); ControlModel Vermodle = this.ControlModels.Where(n => n.LabelText.Equals("改前版次")).FirstOrDefault(); ControlModel fileidmodle = this.ControlModels.Where(n => n.LabelText.Equals("原文件ID")).FirstOrDefault(); - if (modle != null && productidmodle!=null) + if (modle != null && productidmodle != null) { string updatename = labelRemarkEdit.EditText; BaseUserControl baseControl = FindControl(modle.FieldName); @@ -4588,7 +4590,7 @@ namespace Lskj.Control.Model DataRow dataRow = BaseImpl.GetDataRowResult($"EXEC dbo.p_GetMaxVersionByFileName N'{updatename}'"); if (dataRow != null) { - baseControl.EditText = dataRow["sname"] +""; + baseControl.EditText = dataRow["sname"] + ""; VerControl.EditText = dataRow["Ver"] + ""; fileidControl.EditText = dataRow["fileid"] + ""; string IsLatest=dataRow["IsLatest"] + ""; @@ -5955,4 +5957,30 @@ namespace Lskj.Control.Model LabelDateEdit dateEdit = controlObj as LabelDateEdit; value = dateEdit.TextEdit.EditValue == null ? dateEdit.EditText : dateEdit.TextEdit.DateTime.ToString("yyyy-MM-dd"); } - else if \ No newline at end of file + else if (controlObj is LabelCheckEdit) + { + LabelCheckEdit checkEdit = controlObj as LabelCheckEdit; + value = checkEdit.EditText; + } + else if (controlObj is LabelComboxEdit) + { + LabelComboxEdit autoEdit = controlObj as LabelComboxEdit; + value = autoEdit.EditValue; + } + else if (controlObj is LabelTextEdit) + { + LabelTextEdit textIntEdit = controlObj as LabelTextEdit; + if (textIntEdit != null) value = string.IsNullOrEmpty(textIntEdit.EditText) ? "0" : textIntEdit.EditText; + } + + defaultValue = defaultValue.Replace(item, value); + } + + } + } + return defaultValue; + } + + + } +} \ No newline at end of file